=================================================================== RCS file: /cvs/mandoc/mdoc_validate.c,v retrieving revision 1.174 retrieving revision 1.179 diff -u -p -r1.174 -r1.179 --- mandoc/mdoc_validate.c 2011/08/16 12:23:51 1.174 +++ mandoc/mdoc_validate.c 2011/11/19 13:29:47 1.179 @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.174 2011/08/16 12:23:51 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.179 2011/11/19 13:29:47 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -545,12 +545,11 @@ check_text(struct mdoc *m, int ln, int pos, char *p) { char *cp; - cp = p; - for (cp = p; NULL != (p = strchr(p, '\t')); p++) { - if (MDOC_LITERAL & m->flags) - continue; - mdoc_pmsg(m, ln, (int)(p - cp), MANDOCERR_BADTAB); - } + if (MDOC_LITERAL & m->flags) + return; + + for (cp = p; NULL != (p = strchr(p, '\t')); p++) + mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB); } static int @@ -703,7 +702,7 @@ pre_bl(PRE_ARGS) if (LIST_column == lt) { n->norm->Bl.ncols = n->args->argv[i].sz; - n->norm->Bl.cols = (const char **) + n->norm->Bl.cols = (void *) n->args->argv[i].value; } } @@ -1521,7 +1520,7 @@ post_bl_head(POST_ARGS) ((size_t)mdoc->last->nchild * sizeof(char *)); mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; - mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value; + mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; for (i = 0, nn = mdoc->last->child; nn; i++) { np->args->argv[j].value[i] = nn->string; @@ -1693,6 +1692,14 @@ post_rs(POST_ARGS) mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD); mdoc_node_delete(mdoc, nn); } + + /* + * Nothing to sort if only invalid nodes were found + * inside the `Rs' body. + */ + + if (NULL == mdoc->last->child) + return(1); /* * The full `Rs' block needs special handling to order the