=================================================================== RCS file: /cvs/mandoc/man_validate.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -p -r1.71 -r1.72 --- mandoc/man_validate.c 2011/07/24 18:15:14 1.71 +++ mandoc/man_validate.c 2011/07/26 14:09:01 1.72 @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.71 2011/07/24 18:15:14 kristaps Exp $ */ +/* $Id: man_validate.c,v 1.72 2011/07/26 14:09:01 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -207,45 +207,15 @@ check_root(CHKARGS) } static void -check_text(CHKARGS) +check_text(CHKARGS) { - char *p, *pp, *cpp; - int pos; - size_t sz; + char *cp, *p; - p = n->string; - pos = n->pos + 1; - - while ('\0' != *p) { - sz = strcspn(p, "\t\\"); - - p += (int)sz; - pos += (int)sz; - - if ('\t' == *p) { - if ( ! (MAN_LITERAL & m->flags)) - man_pmsg(m, n->line, pos, MANDOCERR_BADTAB); - p++; - pos++; + cp = p = n->string; + for (cp = p; NULL != (p = strchr(p, '\t')); p++) { + if (MAN_LITERAL & m->flags) continue; - } else if ('\0' == *p) - break; - - pos++; - pp = ++p; - - if (ESCAPE_ERROR == mandoc_escape - ((const char **)&pp, NULL, NULL)) { - man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE); - break; - } - - cpp = p; - while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp))) - *cpp = '-'; - - pos += pp - p; - p = pp; + man_pmsg(m, n->line, (int)(p - cp), MANDOCERR_BADTAB); } }