Remove asciisz from chars.in. It frees up a nice chunk of memory and at

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index d13e5e0419f0dc9968866a403b6f7f5d441bb6bb..0e0010dd87f1af19cea1788547188cc6ade1f57a 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,6 +1,6 @@
-/*     $Id: man_validate.c,v 1.41 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.47 2010/07/22 23:03:15 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -26,12 +26,13 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>

+#include <string.h>

 
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
 
 
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
 

-#define        CHKARGS   struct man *m, const struct man_node *n
+#define        CHKARGS   struct man *m, struct man_node *n

 
 typedef        int     (*v_check)(CHKARGS);
 
 
 typedef        int     (*v_check)(CHKARGS);
 


@@ -82,9 +83,9 @@ static        const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* I */
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */
        { NULL, NULL }, /* I */
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */

-       { NULL, posts_eq0 }, /* na */
+       { NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */

        { NULL, NULL }, /* i */
        { NULL, NULL }, /* i */

-       { NULL, posts_le1 }, /* sp */
+       { NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */

        { pres_bline, posts_eq0 }, /* nf */
        { pres_bline, posts_eq0 }, /* fi */
        { NULL, NULL }, /* r */
        { pres_bline, posts_eq0 }, /* nf */
        { pres_bline, posts_eq0 }, /* fi */
        { NULL, NULL }, /* r */


@@ -93,15 +94,16 @@ static      const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* DT */
        { NULL, NULL }, /* UC */
        { NULL, NULL }, /* PD */
        { NULL, NULL }, /* DT */
        { NULL, NULL }, /* UC */
        { NULL, NULL }, /* PD */

-       { NULL, posts_le1 }, /* Sp */
-       { pres_bline, posts_le1 }, /* Vb */
+       { NULL, posts_le1 }, /* Sp */ /* FIXME: should warn only. */
+       { pres_bline, posts_le1 }, /* Vb */ /* FIXME: should warn only. */

        { pres_bline, posts_eq0 }, /* Ve */
        { NULL, NULL }, /* AT */
        { pres_bline, posts_eq0 }, /* Ve */
        { NULL, NULL }, /* AT */

+       { NULL, NULL }, /* in */

 };
 
 
 int
 };
 
 
 int

-man_valid_pre(struct man *m, const struct man_node *n)
+man_valid_pre(struct man *m, struct man_node *n)

 {
        v_check         *cp;
 
 {
        v_check         *cp;
 


@@ -204,29 +206,39 @@ check_title(CHKARGS)
 static int
 check_text(CHKARGS) 
 {
 static int
 check_text(CHKARGS) 
 {

-       const char      *p;
+       char            *p;

        int              pos, c;
        int              pos, c;

-
-       assert(n->string);
+       size_t           sz;

 
        for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
 
        for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {

-               if ('\\' == *p) {
-                       c = mandoc_special(p);
-                       if (c) {
-                               p += c - 1;
-                               pos += c - 1;
-                               continue;
-                       }
+               sz = strcspn(p, "\t\\");
+               p += (int)sz;

 
 

-                       c = man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
-                       if ( ! (MAN_IGN_ESCAPE & m->pflags) && ! c)
-                               return(c);
+               if ('\0' == *p)
+                       break;
+
+               pos += (int)sz;
+
+               if ('\t' == *p) {
+                       if (MAN_LITERAL & m->flags)
+                               continue;
+                       if (man_pmsg(m, n->line, pos, MANDOCERR_BADTAB))
+                               continue;
+                       return(0);

                }
 
                }
 

-               if ('\t' == *p || isprint((u_char)*p)) 
+               /* Check the special character. */
+
+               c = mandoc_special(p);
+               if (c) {
+                       p += c - 1;
+                       pos += c - 1;

                        continue;
                        continue;

-               if ( ! man_pmsg(m, n->line, pos, MANDOCERR_BADCHAR))
-                       return(0);
+               }
+
+               c = man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
+               if ( ! (MAN_IGN_ESCAPE & m->pflags) && ! c)
+                       return(c);

        }
 
        return(1);
        }
 
        return(1);