Fixed \(bq.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 6cf7db0193b2202244e1cca03cb5597295e38b9b..afeadd13bbbd95bdd668405c95779a47cccda747 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.12 2009/06/18 10:53:58 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.16 2009/07/24 20:22:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,10 +18,13 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
 #include "libman.h"
+#include "libmandoc.h"
 
 #define        POSTARGS  struct man *m, const struct man_node *n
 
@@ -32,18 +35,22 @@ struct      man_valid {
 };
 
 static int       check_eq0(POSTARGS);
+static int       check_eq1(POSTARGS);
 static int       check_ge1(POSTARGS);
 static int       check_ge2(POSTARGS);
 static int       check_le1(POSTARGS);
 static int       check_le2(POSTARGS);
 static int       check_le5(POSTARGS);
+static int       check_root(POSTARGS);
+static int       check_sp(POSTARGS);
 static int       check_text(POSTARGS);
 
-static v_post    posts_le1[] = { check_le1, NULL };
-static v_post    posts_le2[] = { check_le2, NULL };
-static v_post    posts_ge1[] = { check_ge1, NULL };
 static v_post    posts_eq0[] = { check_eq0, NULL };
+static v_post    posts_ge1[] = { check_ge1, NULL };
 static v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };
+static v_post    posts_le1[] = { check_le1, NULL };
+static v_post    posts_le2[] = { check_le2, NULL };
+static v_post    posts_sp[] = { check_sp, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {
        { posts_eq0 }, /* br */
@@ -69,6 +76,7 @@ static        const struct man_valid man_valids[MAN_MAX] = {
        { NULL }, /* RI */
        { posts_eq0 }, /* na */
        { NULL }, /* i */
+       { posts_sp }, /* sp */
 };
 
 
@@ -85,7 +93,7 @@ man_valid_post(struct man *m)
        case (MAN_TEXT): 
                return(check_text(m, m->last));
        case (MAN_ROOT):
-               return(1);
+               return(check_root(m, m->last));
        default:
                break;
        }
@@ -100,16 +108,43 @@ man_valid_post(struct man *m)
 }
 
 
+static int
+check_root(POSTARGS) 
+{
+       
+       if (NULL == m->first->child)
+               return(man_nerr(m, n, WNODATA));
+       if (NULL == m->meta.title)
+               return(man_nerr(m, n, WNOTITLE));
+
+       return(1);
+}
+
+
 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)
@@ -133,9 +168,38 @@ check_##name(POSTARGS) \
 }
 
 INEQ_DEFINE(0, ==, eq0)
+INEQ_DEFINE(1, ==, eq1)
 INEQ_DEFINE(1, >=, ge1)
 INEQ_DEFINE(2, >=, ge2)
 INEQ_DEFINE(1, <=, le1)
 INEQ_DEFINE(2, <=, le2)
 INEQ_DEFINE(5, <=, le5)
 
+
+static int
+check_sp(POSTARGS)
+{
+       long             lval;
+       char            *ep, *buf;
+
+       if (NULL == m->last->child)
+               return(1);
+       else if ( ! check_eq1(m, n))
+               return(0);
+
+       assert(MAN_TEXT == m->last->child->type);
+       buf = m->last->child->string;
+       assert(buf);
+       
+       /* From OpenBSD's strtol(3). */
+       errno = 0;
+       lval = strtol(buf, &ep, 10);
+       if (buf[0] == '\0' || *ep != '\0')
+               return(man_nerr(m, m->last->child, WNUMFMT));
+
+       if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+                       (lval > INT_MAX || lval < 0))
+               return(man_nerr(m, m->last->child, WNUMFMT));
+
+       return(1);
+}