=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.91 retrieving revision 1.96 diff -u -p -r1.91 -r1.96 --- mandoc/mdoc.c 2009/07/15 15:36:38 1.91 +++ mandoc/mdoc.c 2009/07/27 19:43:02 1.96 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.91 2009/07/15 15:36:38 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.96 2009/07/27 19:43:02 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -25,8 +25,6 @@ const char *const __mdoc_merrnames[MERRMAX] = { "trailing whitespace", /* ETAILWS */ - "empty last list column", /* ECOLEMPTY */ - "argument-like parameter", /* EARGVPARM */ "unexpected quoted parameter", /* EQUOTPARM */ "unterminated quoted parameter", /* EQUOTTERM */ "system: malloc error", /* EMALLOC */ @@ -117,7 +115,7 @@ const char *const __mdoc_macronames[MDOC_MAX] = { /* LINTED */ "Brc", "\%C", "Es", "En", /* LINTED */ - "Dx", "\%Q" + "Dx", "\%Q", "br", "sp" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -147,7 +145,11 @@ static int macrowarn(struct mdoc *, int, const char static int pstring(struct mdoc *, int, int, const char *, size_t); +#ifdef __linux__ +extern size_t strlcpy(char *, const char *, size_t); +#endif + const struct mdoc_node * mdoc_node(const struct mdoc *m) { @@ -655,10 +657,10 @@ static int macrowarn(struct mdoc *m, int ln, const char *buf) { if ( ! (MDOC_IGN_MACRO & m->pflags)) - return(mdoc_verr(m, ln, 1, + return(mdoc_verr(m, ln, 0, "unknown macro: %s%s", buf, strlen(buf) > 3 ? "..." : "")); - return(mdoc_vwarn(m, ln, 1, "unknown macro: %s%s", + return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s", buf, strlen(buf) > 3 ? "..." : "")); }