=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.27 retrieving revision 1.31 diff -u -p -r1.27 -r1.31 --- mandoc/Attic/action.c 2009/02/28 21:50:01 1.27 +++ mandoc/Attic/action.c 2009/03/06 14:13:47 1.31 @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.27 2009/02/28 21:50:01 kristaps Exp $ */ +/* $Id: action.c,v 1.31 2009/03/06 14:13:47 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,7 +16,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include +#include #include #include #include @@ -36,14 +39,16 @@ struct actions { /* Per-macro action routines. */ +static int post_ar(struct mdoc *); static int post_bl(struct mdoc *); static int post_bl_width(struct mdoc *); static int post_bl_tagwidth(struct mdoc *); -static int post_sh(struct mdoc *); -static int post_os(struct mdoc *); -static int post_dt(struct mdoc *); static int post_dd(struct mdoc *); +static int post_dt(struct mdoc *); static int post_nm(struct mdoc *); +static int post_os(struct mdoc *); +static int post_sh(struct mdoc *); +static int post_ex(struct mdoc *); static int post_prologue(struct mdoc *); @@ -66,13 +71,13 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* It */ { NULL }, /* Ad */ { NULL }, /* An */ - { NULL }, /* Ar */ + { post_ar }, /* Ar */ { NULL }, /* Cd */ { NULL }, /* Cm */ { NULL }, /* Dv */ { NULL }, /* Er */ { NULL }, /* Ev */ - { NULL }, /* Ex */ + { post_ex }, /* Ex */ { NULL }, /* Fa */ { NULL }, /* Fd */ { NULL }, /* Fl */ @@ -156,32 +161,49 @@ const struct actions mdoc_actions[MDOC_MAX] = { { NULL }, /* Hf */ { NULL }, /* Fr */ { NULL }, /* Ud */ + { NULL }, /* Lb */ }; static int -post_nm(struct mdoc *mdoc) +post_ex(struct mdoc *mdoc) { - char buf[64]; - assert(MDOC_ELEM == mdoc->last->type); - assert(MDOC_Nm == mdoc->last->tok); - /* - * The `Nm' macro sets the document's name when used the first - * time with an argument. Subsequent calls without a value will - * result in the name value being used. + * If `.Ex -std' is invoked without an argument, fill it in with + * our name (if it's been set). */ - if (mdoc->meta.name) + if (0 == mdoc->last->data.elem.argc) return(1); + if (mdoc->last->data.elem.argv[0].sz) + return(1); - if (xstrlcats(buf, mdoc->last->child, 64)) { - mdoc->meta.name = xstrdup(buf); + assert(mdoc->meta.name); + + mdoc_msg(mdoc, "writing %s argument: %s", + mdoc_argnames[MDOC_Std], mdoc->meta.name); + + mdoc->last->data.elem.argv[0].sz = 1; + mdoc->last->data.elem.argv[0].value = xcalloc(1, sizeof(char *)); + mdoc->last->data.elem.argv[0].value[0] = xstrdup(mdoc->meta.name); + return(1); +} + + +static int +post_nm(struct mdoc *mdoc) +{ + char buf[64]; + + if (mdoc->meta.name) return(1); - } - return(mdoc_err(mdoc, "macro parameters too long")); + (void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); + mdoc->meta.name = xstrdup(buf); + mdoc_msg(mdoc, "name: %s", mdoc->meta.name); + + return(1); } @@ -199,23 +221,23 @@ post_sh(struct mdoc *mdoc) if (MDOC_HEAD != mdoc->last->type) return(1); - if (xstrlcats(buf, mdoc->last->child, 64)) { - if (SEC_CUSTOM != (sec = mdoc_atosec(buf))) - mdoc->lastnamed = sec; - mdoc->lastsec = sec; - } else - return(mdoc_err(mdoc, "parameters too long")); + (void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); + if (SEC_CUSTOM != (sec = mdoc_atosec(buf))) + mdoc->lastnamed = sec; + + mdoc->lastsec = sec; + switch (mdoc->lastsec) { case (SEC_RETURN_VALUES): /* FALLTHROUGH */ case (SEC_ERRORS): switch (mdoc->meta.msec) { - case (MSEC_2): + case (2): /* FALLTHROUGH */ - case (MSEC_3): + case (3): /* FALLTHROUGH */ - case (MSEC_9): + case (9): break; default: return(mdoc_warn(mdoc, WARN_COMPAT, @@ -233,54 +255,100 @@ post_sh(struct mdoc *mdoc) static int post_dt(struct mdoc *mdoc) { - int i; - char *p; struct mdoc_node *n; + const char *cp; + char *ep; + long lval; - /* - * Prologue title must be parsed into document meta-data. + if (mdoc->meta.title) + free(mdoc->meta.title); + if (mdoc->meta.vol) + free(mdoc->meta.vol); + if (mdoc->meta.arch) + free(mdoc->meta.arch); + + mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL; + mdoc->meta.msec = 0; + + /* Handles: `.Dt' + * --> title = unknown, volume = local, msec = 0, arch = NULL */ - assert(MDOC_ELEM == mdoc->last->type); - assert(MDOC_Dt == mdoc->last->tok); + if (NULL == (n = mdoc->last->child)) { + mdoc->meta.title = xstrdup("unknown"); + mdoc->meta.vol = xstrdup("local"); + mdoc_msg(mdoc, "title: %s", mdoc->meta.title); + mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); + mdoc_msg(mdoc, "arch: "); + mdoc_msg(mdoc, "msec: "); + return(post_prologue(mdoc)); + } - assert(NULL == mdoc->meta.title); + /* Handles: `.Dt TITLE' + * --> title = TITLE, volume = local, msec = 0, arch = NULL + */ - /* LINTED */ - for (i = 0, n = mdoc->last->child; n; n = n->next, i++) { - assert(MDOC_TEXT == n->type); - p = n->data.text.string; + mdoc->meta.title = xstrdup(n->data.text.string); + mdoc_msg(mdoc, "title: %s", mdoc->meta.title); - switch (i) { - case (0): - mdoc->meta.title = xstrdup(p); - break; - case (1): - mdoc->meta.msec = mdoc_atomsec(p); - if (MSEC_DEFAULT != mdoc->meta.msec) - break; - return(mdoc_nerr(mdoc, n, - "invalid parameter syntax")); - case (2): - mdoc->meta.vol = mdoc_atovol(p); - if (VOL_DEFAULT != mdoc->meta.vol) - break; - mdoc->meta.arch = mdoc_atoarch(p); - if (ARCH_DEFAULT != mdoc->meta.arch) - break; - return(mdoc_nerr(mdoc, n, - "invalid parameter syntax")); - default: - return(mdoc_nerr(mdoc, n, - "too many parameters")); - } + if (NULL == (n = n->next)) { + mdoc->meta.vol = xstrdup("local"); + mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); + mdoc_msg(mdoc, "arch: "); + mdoc_msg(mdoc, "msec: %d", mdoc->meta.msec); + return(post_prologue(mdoc)); } - if (NULL == mdoc->meta.title) - mdoc->meta.title = xstrdup("UNTITLED"); + /* Handles: `.Dt TITLE SEC' + * --> title = TITLE, volume = SEC is msec ? + * format(msec) : SEC, + * msec = SEC is msec ? atoi(msec) : 0, + * arch = NULL + */ - mdoc_msg(mdoc, "title: %s", mdoc->meta.title); + if ((cp = mdoc_a2msec(n->data.text.string))) { + mdoc->meta.vol = xstrdup(cp); + errno = 0; + lval = strtol(n->data.text.string, &ep, 10); + if (n->data.text.string[0] != '\0' && *ep == '\0') + mdoc->meta.msec = (int)lval; + } else + mdoc->meta.vol = xstrdup(n->data.text.string); + if (NULL == (n = n->next)) { + mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); + mdoc_msg(mdoc, "arch: "); + mdoc_msg(mdoc, "msec: %d", mdoc->meta.msec); + return(post_prologue(mdoc)); + } + + /* Handles: `.Dt TITLE SEC VOL' + * --> title = TITLE, volume = VOL is vol ? + * format(VOL) : + * VOL is arch ? format(arch) : + * VOL + */ + + if ((cp = mdoc_a2vol(n->data.text.string))) { + free(mdoc->meta.vol); + mdoc->meta.vol = xstrdup(cp); + n = n->next; + } else { + cp = mdoc_a2arch(n->data.text.string); + if (NULL == cp) { + free(mdoc->meta.vol); + mdoc->meta.vol = xstrdup(n->data.text.string); + } else + mdoc->meta.arch = xstrdup(cp); + } + + mdoc_msg(mdoc, "volume: %s", mdoc->meta.vol); + mdoc_msg(mdoc, "arch: %s", mdoc->meta.arch ? + mdoc->meta.arch : ""); + mdoc_msg(mdoc, "msec: %d", mdoc->meta.msec); + + /* Ignore any subsequent parameters... */ + return(post_prologue(mdoc)); } @@ -289,22 +357,26 @@ static int post_os(struct mdoc *mdoc) { char buf[64]; + struct utsname utsname; - /* - * Prologue operating system must be parsed into document - * meta-data. - */ + if (mdoc->meta.os) + free(mdoc->meta.os); - assert(MDOC_ELEM == mdoc->last->type); - assert(MDOC_Os == mdoc->last->tok); - assert(NULL == mdoc->meta.os); + (void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); - if ( ! xstrlcats(buf, mdoc->last->child, 64)) - return(mdoc_err(mdoc, "macro parameters too long")); + if (0 == buf[0]) { + if (-1 == uname(&utsname)) + return(mdoc_err(mdoc, "utsname")); + (void)xstrlcpy(buf, utsname.sysname, sizeof(buf)); + (void)xstrlcat(buf, " ", sizeof(buf)); + (void)xstrlcat(buf, utsname.release, sizeof(buf)); + } - mdoc->meta.os = xstrdup(buf[0] ? buf : "LOCAL"); - mdoc->lastnamed = SEC_BODY; + mdoc->meta.os = xstrdup(buf); + mdoc_msg(mdoc, "system: %s", mdoc->meta.os); + mdoc->lastnamed = mdoc->lastsec = SEC_BODY; + return(post_prologue(mdoc)); } @@ -395,13 +467,9 @@ post_bl_width(struct mdoc *mdoc) * the macro's width as set in share/tmac/mdoc/doc-common. */ - if (xstrcmp(*p, "Ds")) { - if ( ! mdoc_warn(mdoc, WARN_COMPAT, - "%s argument deprecated", - mdoc_argnames[MDOC_Width])) - return(0); + if (xstrcmp(*p, "Ds")) width = 8; - } else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) + else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) return(1); else if (0 == (width = mdoc_macro2len(tok))) return(mdoc_warn(mdoc, WARN_SYNTAX, @@ -457,28 +525,39 @@ post_bl(struct mdoc *mdoc) static int -post_dd(struct mdoc *mdoc) +post_ar(struct mdoc *mdoc) { - char buf[64]; + struct mdoc_node *n; - /* - * Prologue date must be parsed into document meta-data. We - * accept multiple kinds of dates, described mostly in - * mdoc_atotime(). - */ + if (mdoc->last->child) + return(1); + + n = mdoc->last; - assert(MDOC_ELEM == mdoc->last->type); - assert(MDOC_Dd == mdoc->last->tok); + mdoc->next = MDOC_NEXT_CHILD; + mdoc_word_alloc(mdoc, mdoc->last->line, + mdoc->last->pos, "file"); + mdoc->next = MDOC_NEXT_SIBLING; + mdoc_word_alloc(mdoc, mdoc->last->line, + mdoc->last->pos, "..."); - assert(0 == mdoc->meta.date); + mdoc->last = n; + mdoc->next = MDOC_NEXT_SIBLING; + return(1); +} - if ( ! xstrlcats(buf, mdoc->last->child, 64)) - return(mdoc_err(mdoc, "macro parameters too long")); + +static int +post_dd(struct mdoc *mdoc) +{ + char buf[64]; + + (void)xstrlcpys(buf, mdoc->last->child, sizeof(buf)); + if (0 == (mdoc->meta.date = mdoc_atotime(buf))) - return(mdoc_err(mdoc, "invalid parameter syntax")); + return(mdoc_err(mdoc, "invalid date syntax")); mdoc_msg(mdoc, "date: %u", mdoc->meta.date); - return(post_prologue(mdoc)); }