From 4731011d94a8295f8bf499ee10709029a5ac9f4a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 4 Jul 2009 09:01:55 +0000 Subject: Moved escape validation into libmandoc.h/mandoc.c (common between libman/libmdoc1). libman supports MAN_IGN_ESCAPE (like MDOC_IGN_ESCAPE). All popular escapes now handled consistently. --- man_validate.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'man_validate.c') diff --git a/man_validate.c b/man_validate.c index e9a65510..183d31c5 100644 --- a/man_validate.c +++ b/man_validate.c @@ -22,6 +22,7 @@ #include #include "libman.h" +#include "libmandoc.h" #define POSTARGS struct man *m, const struct man_node *n @@ -118,12 +119,26 @@ static int check_text(POSTARGS) { const char *p; - int pos; + int pos, c; assert(n->string); for (p = n->string, pos = n->pos + 1; *p; p++, pos++) { - if ('\t' == *p || isprint((u_char)*p)) + if ('\\' == *p) { + c = mandoc_special(p); + if (c) { + p += c - 1; + pos += c - 1; + continue; + } + if ( ! (MAN_IGN_ESCAPE & m->pflags)) + return(man_perr(m, n->line, pos, WESCAPE)); + if ( ! man_pwarn(m, n->line, pos, WESCAPE)) + return(0); + continue; + } + + if ('\t' == *p || isprint((u_char)*p)) continue; if (MAN_IGN_CHARS & m->pflags) -- cgit