diff options
Diffstat (limited to 'macro.c')
| -rw-r--r-- | macro.c | 172 |
1 files changed, 165 insertions, 7 deletions
@@ -20,11 +20,15 @@ #include <ctype.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> #include "private.h" #define _CC(p) ((const char **)p) +static int xstrlcat(char *, const char *, size_t); +static int xstrlcpy(char *, const char *, size_t); +static int xstrcmp(const char *, const char *); static int append_text(struct mdoc *, int, int, int, char *[]); static int append_scoped(struct mdoc *, int, @@ -81,10 +85,25 @@ static int append_scoped(struct mdoc *mdoc, int tok, int pos, int sz, char *args[]) { + enum mdoc_sec sec; + + if (0 == sz) + return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); switch (tok) { /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ case (MDOC_Sh): + sec = mdoc_atosec((size_t)sz, _CC(args)); + if (SEC_CUSTOM != sec && sec < mdoc->sec_lastn) + if ( ! mdoc_warn(mdoc, tok, pos, WARN_SEC_OO)) + return(0); + + if (SEC_BODY == mdoc->sec_last && SEC_NAME != sec) + return(mdoc_err(mdoc, tok, pos, ERR_SEC_NAME)); + + if (SEC_CUSTOM != sec) + mdoc->sec_lastn = sec; + mdoc->sec_last = sec; break; case (MDOC_Ss): break; @@ -166,7 +185,7 @@ append_text(struct mdoc *mdoc, int tok, int -macro_text(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) +macro_text(MACRO_PROT_ARGS) { int lastarg, c, lasttok, lastpunct, j; char *args[MDOC_LINEARG_MAX], *p; @@ -175,6 +194,9 @@ macro_text(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) lastpunct = 0; j = 0; + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + again: lastarg = *pos; @@ -224,19 +246,131 @@ again: int -macro_scoped_implicit(struct mdoc *mdoc, - int tok, int ppos, int *pos, char *buf) +macro_prologue_dtitle(MACRO_PROT_ARGS) +{ + int c, lastarg, j; + char *args[MDOC_LINEARG_MAX]; + + if (SEC_PROLOGUE != mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE)); + if (0 == mdoc->meta.date) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO)); + if (mdoc->meta.title[0]) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP)); + + j = -1; + +again: + lastarg = *pos; + c = args_next(mdoc, tok, pos, buf, &args[++j]); + + if (0 == c) { + mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; /* FIXME */ + if (mdoc->meta.title) + return(1); + if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1)) + return(0); + (void)xstrlcpy(mdoc->meta.title, + "UNTITLED", META_TITLE_SZ); + return(1); + } else if (-1 == c) + return(0); + + if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn + (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) + return(0); + + if (0 == j) { + if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ)) + goto again; + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + + } else if (1 == j) { + mdoc->meta.msec = mdoc_atomsec(args[1]); + if (MSEC_DEFAULT != mdoc->meta.msec) + goto again; + return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGS)); + + } else if (2 == j) { + mdoc->meta.vol = mdoc_atovol(args[2]); + if (VOL_DEFAULT != mdoc->meta.vol) + goto again; + mdoc->meta.arch = mdoc_atoarch(args[2]); + if (ARCH_DEFAULT != mdoc->meta.arch) + goto again; + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + } + + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); +} + + +int +macro_prologue_ddate(MACRO_PROT_ARGS) +{ + int c, lastarg, j; + char *args[MDOC_LINEARG_MAX], date[64]; + + if (SEC_PROLOGUE != mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE)); + if (mdoc->meta.title[0]) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO)); + if (mdoc->meta.date) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP)); + + j = -1; + date[0] = 0; + +again: + + lastarg = *pos; + c = args_next(mdoc, tok, pos, buf, &args[++j]); + if (0 == c) { + if (mdoc->meta.date) + return(1); + mdoc->meta.date = mdoc_atotime(date); + if (mdoc->meta.date) + return(1); + return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGS)); + } else if (-1 == c) + return(0); + + if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn + (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) + return(0); + + if (0 == j) { + if (xstrcmp("$Mdocdate$", args[j])) { + mdoc->meta.date = time(NULL); + goto again; + } else if (xstrcmp("$Mdocdate:", args[j])) + goto again; + } else if (4 == j) + if ( ! xstrcmp("$", args[j])) + goto again; + + if ( ! xstrlcat(date, args[j], sizeof(date))) + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + if ( ! xstrlcat(date, " ", sizeof(date))) + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + + goto again; + /* NOTREACHED */ +} + + +int +macro_scoped_implicit(MACRO_PROT_ARGS) { int t, c, lastarg, j; char *args[MDOC_LINEARG_MAX]; struct mdoc_node *n; - /* - * Look for an implicit parent. - */ - assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + /* LINTED */ for (n = mdoc->last; n; n = n->parent) { if (MDOC_BLOCK != n->type) @@ -281,3 +415,27 @@ again: /* NOTREACHED */ } + + +static int +xstrcmp(const char *p1, const char *p2) +{ + + return(0 == strcmp(p1, p2)); +} + + +static int +xstrlcat(char *dst, const char *src, size_t sz) +{ + + return(strlcat(dst, src, sz) < sz); +} + + +static int +xstrlcpy(char *dst, const char *src, size_t sz) +{ + + return(strlcpy(dst, src, sz) < sz); +} |