=================================================================== RCS file: /cvs/mandoc/mdoc_validate.c,v retrieving revision 1.133 retrieving revision 1.146 diff -u -p -r1.133 -r1.146 --- mandoc/mdoc_validate.c 2010/11/30 14:27:37 1.133 +++ mandoc/mdoc_validate.c 2010/12/22 22:05:38 1.146 @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.133 2010/11/30 14:27:37 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.146 2010/12/22 22:05:38 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -41,8 +41,18 @@ #define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n #define POST_ARGS struct mdoc *mdoc +#define NORM_BUMP(dst, src) do { \ + (dst)->norm = (src)->norm; \ + ((dst)->norm->refcnt)++; \ + } while (/* CONSTCOND */ 0) +#define NORM_ALLOC(dst) do { \ + (dst)->norm = \ + mandoc_calloc(1, sizeof(struct mdoc_norm)); \ + (dst)->norm->refcnt = 1; \ + } while (/* CONSTCOND */ 0) + #define NUMSIZ 32 -#define DATESIZ 32 +#define DATESIZE 32 enum check_ineq { CHECK_LT, @@ -107,6 +117,7 @@ static int post_it(POST_ARGS); static int post_lb(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); +static int post_ignpar(POST_ARGS); static int post_prol(POST_ARGS); static int post_root(POST_ARGS); static int post_rs(POST_ARGS); @@ -150,9 +161,9 @@ static v_post posts_nm[] = { post_nm, NULL }; static v_post posts_notext[] = { ewarn_eq0, NULL }; static v_post posts_os[] = { post_os, post_prol, NULL }; static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; -static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; +static v_post posts_sh[] = { post_ignpar, herr_ge1, bwarn_ge1, post_sh, NULL }; static v_post posts_sp[] = { eerr_le1, NULL }; -static v_post posts_ss[] = { herr_ge1, NULL }; +static v_post posts_ss[] = { post_ignpar, herr_ge1, bwarn_ge1, NULL }; static v_post posts_st[] = { eerr_eq1, post_st, NULL }; static v_post posts_std[] = { post_std, NULL }; static v_post posts_text[] = { eerr_ge1, NULL }; @@ -169,7 +180,7 @@ static v_pre pres_dd[] = { pre_dd, NULL }; static v_pre pres_dt[] = { pre_dt, NULL }; static v_pre pres_er[] = { NULL, NULL }; static v_pre pres_fd[] = { NULL, NULL }; -static v_pre pres_it[] = { pre_it, NULL }; +static v_pre pres_it[] = { pre_it, pre_par, NULL }; static v_pre pres_os[] = { pre_os, NULL }; static v_pre pres_pp[] = { pre_par, NULL }; static v_pre pres_sh[] = { pre_sh, NULL }; @@ -210,7 +221,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_defaults }, /* Li */ { NULL, posts_nd }, /* Nd */ { NULL, posts_nm }, /* Nm */ - { NULL, posts_wline }, /* Op */ + { NULL, NULL }, /* Op */ { NULL, NULL }, /* Ot */ { NULL, posts_defaults }, /* Pa */ { pres_std, posts_std }, /* Rv */ @@ -231,18 +242,18 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_text }, /* %V */ { NULL, NULL }, /* Ac */ { NULL, NULL }, /* Ao */ - { NULL, posts_wline }, /* Aq */ + { NULL, NULL }, /* Aq */ { NULL, posts_at }, /* At */ { NULL, NULL }, /* Bc */ { NULL, posts_bf }, /* Bf */ { NULL, NULL }, /* Bo */ - { NULL, posts_wline }, /* Bq */ + { NULL, NULL }, /* Bq */ { NULL, NULL }, /* Bsx */ { NULL, NULL }, /* Bx */ { NULL, posts_bool }, /* Db */ { NULL, NULL }, /* Dc */ { NULL, NULL }, /* Do */ - { NULL, posts_wline }, /* Dq */ + { NULL, NULL }, /* Dq */ { NULL, NULL }, /* Ec */ { NULL, NULL }, /* Ef */ { NULL, NULL }, /* Em */ @@ -256,16 +267,16 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, NULL }, /* Pc */ { NULL, posts_text1 }, /* Pf */ { NULL, NULL }, /* Po */ - { NULL, posts_wline }, /* Pq */ + { NULL, NULL }, /* Pq */ { NULL, NULL }, /* Qc */ - { NULL, posts_wline }, /* Ql */ + { NULL, NULL }, /* Ql */ { NULL, NULL }, /* Qo */ - { NULL, posts_wline }, /* Qq */ + { NULL, NULL }, /* Qq */ { NULL, NULL }, /* Re */ { NULL, posts_rs }, /* Rs */ { NULL, NULL }, /* Sc */ { NULL, NULL }, /* So */ - { NULL, posts_wline }, /* Sq */ + { NULL, NULL }, /* Sq */ { NULL, posts_bool }, /* Sm */ { NULL, posts_text }, /* Sx */ { NULL, posts_text }, /* Sy */ @@ -287,7 +298,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_notext }, /* Lp */ { NULL, posts_text }, /* Lk */ { NULL, posts_defaults }, /* Mt */ - { NULL, posts_wline }, /* Brq */ + { NULL, NULL }, /* Brq */ { NULL, NULL }, /* Bro */ { NULL, NULL }, /* Brc */ { NULL, posts_text }, /* %C */ @@ -575,22 +586,18 @@ pre_display(PRE_ARGS) { struct mdoc_node *node; - /* Display elements (`Bd', `D1'...) cannot be nested. */ - if (MDOC_BLOCK != n->type) return(1); - /* LINTED */ for (node = mdoc->last->parent; node; node = node->parent) if (MDOC_BLOCK == node->type) if (MDOC_Bd == node->tok) break; - if (NULL == node) - return(1); + if (node) + mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP); - mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP); - return(0); + return(1); } @@ -612,20 +619,18 @@ pre_bl(PRE_ARGS) assert(np); assert(MDOC_BLOCK == np->type); assert(MDOC_Bl == np->tok); - assert(np->data.Bl); - n->data.Bl = np->data.Bl; + NORM_BUMP(n, np); return(1); } + NORM_ALLOC(n); + /* * First figure out which kind of list to use: bind ourselves to * the first mentioned list type and warn about any remaining * ones. If we find no list type, we default to LIST_item. */ - assert(NULL == n->data.Bl); - n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); - /* LINTED */ for (i = 0; n->args && i < (int)n->args->argc; i++) { lt = LIST__NONE; @@ -668,18 +673,18 @@ pre_bl(PRE_ARGS) break; /* Set list arguments. */ case (MDOC_Compact): - dup = n->data.Bl->comp; + dup = n->norm->d.Bl.comp; comp = 1; break; case (MDOC_Width): - dup = (NULL != n->data.Bl->width); + dup = (NULL != n->norm->d.Bl.width); width = n->args->argv[i].value[0]; break; case (MDOC_Offset): /* NB: this can be empty! */ if (n->args->argv[i].sz) { offs = n->args->argv[i].value[0]; - dup = (NULL != n->data.Bl->offs); + dup = (NULL != n->norm->d.Bl.offs); break; } mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); @@ -694,36 +699,36 @@ pre_bl(PRE_ARGS) mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); if (comp && ! dup) - n->data.Bl->comp = comp; + n->norm->d.Bl.comp = comp; if (offs && ! dup) - n->data.Bl->offs = offs; + n->norm->d.Bl.offs = offs; if (width && ! dup) - n->data.Bl->width = width; + n->norm->d.Bl.width = width; /* Check: multiple list types. */ - if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) + if (LIST__NONE != lt && n->norm->d.Bl.type != LIST__NONE) mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); /* Assign list type. */ - if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { - n->data.Bl->type = lt; + if (LIST__NONE != lt && n->norm->d.Bl.type == LIST__NONE) { + n->norm->d.Bl.type = lt; /* Set column information, too. */ if (LIST_column == lt) { - n->data.Bl->ncols = + n->norm->d.Bl.ncols = n->args->argv[i].sz; - n->data.Bl->cols = (const char **) + n->norm->d.Bl.cols = (const char **) n->args->argv[i].value; } } /* The list type should come first. */ - if (n->data.Bl->type == LIST__NONE) - if (n->data.Bl->width || - n->data.Bl->offs || - n->data.Bl->comp) + if (n->norm->d.Bl.type == LIST__NONE) + if (n->norm->d.Bl.width || + n->norm->d.Bl.offs || + n->norm->d.Bl.comp) mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); continue; @@ -731,9 +736,9 @@ pre_bl(PRE_ARGS) /* Allow lists to default to LIST_item. */ - if (LIST__NONE == n->data.Bl->type) { + if (LIST__NONE == n->norm->d.Bl.type) { mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); - n->data.Bl->type = LIST_item; + n->norm->d.Bl.type = LIST_item; } /* @@ -742,9 +747,9 @@ pre_bl(PRE_ARGS) * and must also be warned. */ - switch (n->data.Bl->type) { + switch (n->norm->d.Bl.type) { case (LIST_tag): - if (n->data.Bl->width) + if (n->norm->d.Bl.width) break; mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); break; @@ -757,9 +762,8 @@ pre_bl(PRE_ARGS) case (LIST_inset): /* FALLTHROUGH */ case (LIST_item): - if (NULL == n->data.Bl->width) - break; - mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG); + if (n->norm->d.Bl.width) + mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); break; default: break; @@ -787,13 +791,11 @@ pre_bd(PRE_ARGS) assert(np); assert(MDOC_BLOCK == np->type); assert(MDOC_Bd == np->tok); - assert(np->data.Bd); - n->data.Bd = np->data.Bd; + NORM_BUMP(n, np); return(1); } - assert(NULL == n->data.Bd); - n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); + NORM_ALLOC(n); /* LINTED */ for (i = 0; n->args && i < (int)n->args->argc; i++) { @@ -824,14 +826,14 @@ pre_bd(PRE_ARGS) /* NB: this can be empty! */ if (n->args->argv[i].sz) { offs = n->args->argv[i].value[0]; - dup = (NULL != n->data.Bd->offs); + dup = (NULL != n->norm->d.Bd.offs); break; } mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); break; case (MDOC_Compact): comp = 1; - dup = n->data.Bd->comp; + dup = n->norm->d.Bd.comp; break; default: abort(); @@ -846,24 +848,24 @@ pre_bd(PRE_ARGS) /* Make our auxiliary assignments. */ if (offs && ! dup) - n->data.Bd->offs = offs; + n->norm->d.Bd.offs = offs; if (comp && ! dup) - n->data.Bd->comp = comp; + n->norm->d.Bd.comp = comp; /* Check whether a type has already been assigned. */ - if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) + if (DISP__NONE != dt && n->norm->d.Bd.type != DISP__NONE) mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); /* Make our type assignment. */ - if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) - n->data.Bd->type = dt; + if (DISP__NONE != dt && n->norm->d.Bd.type == DISP__NONE) + n->norm->d.Bd.type = dt; } - if (DISP__NONE == n->data.Bd->type) { + if (DISP__NONE == n->norm->d.Bd.type) { mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); - n->data.Bd->type = DISP_ragged; + n->norm->d.Bd.type = DISP_ragged; } return(1); @@ -899,10 +901,6 @@ pre_it(PRE_ARGS) if (MDOC_BLOCK != n->type) return(1); - /* - * FIXME: this can probably be lifted if we make the It into - * something else on-the-fly? - */ return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); } @@ -912,6 +910,8 @@ pre_an(PRE_ARGS) { int i; + NORM_ALLOC(n); + if (NULL == n->args) return(1); @@ -920,9 +920,9 @@ pre_an(PRE_ARGS) n->args->argv[i].pos, MANDOCERR_IGNARGV); if (MDOC_Split == n->args->argv[0].arg) - n->data.An.auth = AUTH_split; + n->norm->d.An.auth = AUTH_split; else if (MDOC_Nosplit == n->args->argv[0].arg) - n->data.An.auth = AUTH_nosplit; + n->norm->d.An.auth = AUTH_nosplit; else abort(); @@ -1004,15 +1004,14 @@ post_bf(POST_ARGS) assert(np); assert(MDOC_HEAD == np->type); assert(MDOC_Bf == np->tok); - assert(np->data.Bf); - mdoc->last->data.Bf = np->data.Bf; + NORM_BUMP(mdoc->last, np); return(1); } np = mdoc->last; assert(MDOC_BLOCK == np->parent->type); assert(MDOC_Bf == np->parent->tok); - np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf)); + NORM_ALLOC(np); /* * Cannot have both argument and parameter. @@ -1032,11 +1031,11 @@ post_bf(POST_ARGS) if (np->parent->args) { arg = np->parent->args->argv[0].arg; if (MDOC_Emphasis == arg) - np->data.Bf->font = FONT_Em; + np->norm->d.Bf.font = FONT_Em; else if (MDOC_Literal == arg) - np->data.Bf->font = FONT_Li; + np->norm->d.Bf.font = FONT_Li; else if (MDOC_Symbolic == arg) - np->data.Bf->font = FONT_Sy; + np->norm->d.Bf.font = FONT_Sy; else abort(); return(1); @@ -1045,11 +1044,11 @@ post_bf(POST_ARGS) /* Extract parameter into data. */ if (0 == strcmp(np->child->string, "Em")) - np->data.Bf->font = FONT_Em; + np->norm->d.Bf.font = FONT_Em; else if (0 == strcmp(np->child->string, "Li")) - np->data.Bf->font = FONT_Li; + np->norm->d.Bf.font = FONT_Li; else if (0 == strcmp(np->child->string, "Sy")) - np->data.Bf->font = FONT_Sy; + np->norm->d.Bf.font = FONT_Sy; else mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); @@ -1158,7 +1157,7 @@ post_literal(POST_ARGS) */ if (MDOC_BODY == mdoc->last->type) - mdoc->last->flags &= ~MDOC_LITERAL; + mdoc->flags &= ~MDOC_LITERAL; return(1); } @@ -1255,14 +1254,14 @@ post_an(POST_ARGS) struct mdoc_node *np; np = mdoc->last; - if (AUTH__NONE != np->data.An.auth && np->child) + if (AUTH__NONE != np->norm->d.An.auth && np->child) return(eerr_eq0(mdoc)); /* * FIXME: make this ewarn and make sure that the front-ends * don't print the arguments. */ - if (AUTH__NONE != np->data.An.auth || np->child) + if (AUTH__NONE != np->norm->d.An.auth || np->child) return(1); mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); @@ -1282,8 +1281,7 @@ post_it(POST_ARGS) return(1); n = mdoc->last->parent->parent; - assert(n->data.Bl); - lt = n->data.Bl->type; + lt = n->norm->d.Bl.type; if (LIST__NONE == lt) { mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); @@ -1322,7 +1320,7 @@ post_it(POST_ARGS) mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); break; case (LIST_column): - cols = (int)n->data.Bl->ncols; + cols = (int)n->norm->d.Bl.ncols; assert(NULL == mdoc->last->head->child); @@ -1366,17 +1364,17 @@ post_bl_block(POST_ARGS) n = mdoc->last; - if (LIST_tag == n->data.Bl->type && - NULL == n->data.Bl->width) { + if (LIST_tag == n->norm->d.Bl.type && + NULL == n->norm->d.Bl.width) { if ( ! post_bl_block_tag(mdoc)) return(0); - } else if (NULL != n->data.Bl->width) { + } else if (NULL != n->norm->d.Bl.width) { if ( ! post_bl_block_width(mdoc)) return(0); } else return(1); - assert(n->data.Bl->width); + assert(n->norm->d.Bl.width); return(1); } @@ -1400,9 +1398,9 @@ post_bl_block_width(POST_ARGS) * the macro's width as set in share/tmac/mdoc/doc-common. */ - if (0 == strcmp(n->data.Bl->width, "Ds")) + if (0 == strcmp(n->norm->d.Bl.width, "Ds")) width = 6; - else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width))) + else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->d.Bl.width))) return(1); else if (0 == (width = mdoc_macro2len(tok))) { mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); @@ -1424,7 +1422,7 @@ post_bl_block_width(POST_ARGS) n->args->argv[i].value[0] = mandoc_strdup(buf); /* Set our width! */ - n->data.Bl->width = n->args->argv[i].value[0]; + n->norm->d.Bl.width = n->args->argv[i].value[0]; return(1); } @@ -1453,11 +1451,8 @@ post_bl_block_tag(POST_ARGS) assert(MDOC_BLOCK == nn->type); nn = nn->head->child; - if (nn == NULL) { - /* No -width for .Bl and first .It is emtpy */ - mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); + if (nn == NULL) break; - } if (MDOC_TEXT == nn->type) { sz = strlen(nn->string) + 1; @@ -1466,8 +1461,6 @@ post_bl_block_tag(POST_ARGS) if (0 != (ssz = mdoc_macro2len(nn->tok))) sz = ssz; - else - mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); break; } @@ -1495,7 +1488,7 @@ post_bl_block_tag(POST_ARGS) n->args->argv[i].value[0] = mandoc_strdup(buf); /* Set our width! */ - n->data.Bl->width = n->args->argv[i].value[0]; + n->norm->d.Bl.width = n->args->argv[i].value[0]; return(1); } @@ -1506,7 +1499,7 @@ post_bl_head(POST_ARGS) struct mdoc_node *np, *nn, *nnp; int i, j; - if (LIST_column != mdoc->last->data.Bl->type) + if (LIST_column != mdoc->last->norm->d.Bl.type) /* FIXME: this should be ERROR class... */ return(hwarn_eq0(mdoc)); @@ -1523,7 +1516,7 @@ post_bl_head(POST_ARGS) * lists, but I'll leave that for another day. */ - if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) { + if (mdoc->last->norm->d.Bl.ncols && mdoc->last->nchild) { mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); return(0); } else if (NULL == mdoc->last->child) @@ -1549,8 +1542,8 @@ post_bl_head(POST_ARGS) np->args->argv[j].value = mandoc_malloc ((size_t)mdoc->last->nchild * sizeof(char *)); - mdoc->last->data.Bl->ncols = np->args->argv[j].sz; - mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value; + mdoc->last->norm->d.Bl.ncols = np->args->argv[j].sz; + mdoc->last->norm->d.Bl.cols = (const char **)np->args->argv[j].value; for (i = 0, nn = mdoc->last->child; nn; i++) { np->args->argv[j].value[i] = nn->string; @@ -1577,21 +1570,22 @@ post_bl(POST_ARGS) return(post_bl_block(mdoc)); if (MDOC_BODY != mdoc->last->type) return(1); - if (NULL == mdoc->last->child) - return(1); - /* - * We only allow certain children of `Bl'. This is usually on - * `It', but apparently `Sm' occurs here and there, so we let - * that one through, too. - */ - - /* LINTED */ for (n = mdoc->last->child; n; n = n->next) { - if (MDOC_BLOCK == n->type && MDOC_It == n->tok) + switch (n->tok) { + case (MDOC_Lp): + /* FALLTHROUGH */ + case (MDOC_Pp): + mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); + /* FALLTHROUGH */ + case (MDOC_It): + /* FALLTHROUGH */ + case (MDOC_Sm): continue; - if (MDOC_Sm == n->tok) - continue; + default: + break; + } + mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); return(0); } @@ -1893,11 +1887,36 @@ post_sh_head(POST_ARGS) } static int +post_ignpar(POST_ARGS) +{ + struct mdoc_node *np; + + if (MDOC_BODY != mdoc->last->type) + return(1); + + if (NULL != (np = mdoc->last->child)) + if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { + mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); + mdoc_node_delete(mdoc, np); + } + + if (NULL != (np = mdoc->last->last)) + if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { + mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); + mdoc_node_delete(mdoc, np); + } + + return(1); +} + +static int pre_par(PRE_ARGS) { if (NULL == mdoc->last) return(1); + if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) + return(1); /* * Don't allow prior `Lp' or `Pp' prior to a paragraph-type @@ -1906,11 +1925,12 @@ pre_par(PRE_ARGS) if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) return(1); - - if (MDOC_Bl == n->tok && n->data.Bl->comp) + if (MDOC_Bl == n->tok && n->norm->d.Bl.comp) return(1); - if (MDOC_Bd == n->tok && n->data.Bd->comp) + if (MDOC_Bd == n->tok && n->norm->d.Bd.comp) return(1); + if (MDOC_It == n->tok && n->parent->norm->d.Bl.comp) + return(1); mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); mdoc_node_delete(mdoc, mdoc->last); @@ -1934,10 +1954,9 @@ pre_literal(PRE_ARGS) mdoc->flags |= MDOC_LITERAL; break; case (MDOC_Bd): - assert(n->data.Bd); - if (DISP_literal == n->data.Bd->type) + if (DISP_literal == n->norm->d.Bd.type) mdoc->flags |= MDOC_LITERAL; - if (DISP_unfilled == n->data.Bd->type) + if (DISP_unfilled == n->norm->d.Bd.type) mdoc->flags |= MDOC_LITERAL; break; default: @@ -1951,7 +1970,7 @@ pre_literal(PRE_ARGS) static int post_dd(POST_ARGS) { - char buf[DATESIZ]; + char buf[DATESIZE]; struct mdoc_node *n; n = mdoc->last; @@ -1961,7 +1980,7 @@ post_dd(POST_ARGS) return(1); } - if ( ! concat(mdoc, buf, n->child, DATESIZ)) + if ( ! concat(mdoc, buf, n->child, DATESIZE)) return(0); mdoc->meta.date = mandoc_a2time @@ -2134,14 +2153,17 @@ post_os(POST_ARGS) return(0); } #else /*!OSNAME */ - if (-1 == uname(&utsname)) - return(mdoc_nmsg(mdoc, n, MANDOCERR_UTSNAME)); + if (uname(&utsname)) { + mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); + mdoc->meta.os = mandoc_strdup("UNKNOWN"); + return(post_prol(mdoc)); + } if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) { mdoc_nmsg(mdoc, n, MANDOCERR_MEM); return(0); } - if (strlcat(buf, " ", 64) >= BUFSIZ) { + if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) { mdoc_nmsg(mdoc, n, MANDOCERR_MEM); return(0); }