FreeBSD sys/types inclusion fixed.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 27b65e8dbe1b3d89aee0981df0fa1048fa7a7c69..ed90d873d601992c0d96d0995a890e6949e6c0e7 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.18 2009/08/18 11:46:44 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.27 2009/11/02 06:22:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -36,28 +36,27 @@ struct      man_valid {
 };
 
 static int       check_bline(CHKARGS);
-static int       check_eline(CHKARGS);
 static int       check_eq0(CHKARGS);
-static int       check_eq1(CHKARGS);
+static int       check_le1(CHKARGS);
 static int       check_ge2(CHKARGS);
 static int       check_le5(CHKARGS);
 static int       check_par(CHKARGS);
+static int       check_part(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);
-static int       check_sp(CHKARGS);
 static int       check_text(CHKARGS);
 
 static v_check   posts_eq0[] = { check_eq0, NULL };
 static v_check   posts_ge2_le5[] = { check_ge2, check_le5, NULL };
 static v_check   posts_par[] = { check_par, NULL };
+static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
-static v_check   posts_sp[] = { check_sp, NULL };
-static v_check   pres_eline[] = { check_eline, NULL };
+static v_check   posts_sp[] = { check_le1, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {
        { pres_bline, posts_eq0 }, /* br */
-       { pres_bline, posts_ge2_le5 }, /* TH */
+       { pres_bline, posts_ge2_le5 }, /* TH */ /* FIXME: make sure capitalised. */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
        { pres_bline, posts_par }, /* TP */
@@ -66,15 +65,15 @@ static      const struct man_valid man_valids[MAN_MAX] = {
        { pres_bline, posts_par }, /* P */
        { pres_bline, posts_par }, /* IP */
        { pres_bline, posts_par }, /* HP */
-       { pres_eline, NULL }, /* SM */
-       { pres_eline, NULL }, /* SB */
+       { NULL, NULL }, /* SM */
+       { NULL, NULL }, /* SB */
        { NULL, NULL }, /* BI */
        { NULL, NULL }, /* IB */
        { NULL, NULL }, /* BR */
        { NULL, NULL }, /* RB */
-       { pres_eline, NULL }, /* R */
-       { pres_eline, NULL }, /* B */
-       { pres_eline, NULL }, /* I */
+       { NULL, NULL }, /* R */
+       { NULL, NULL }, /* B */
+       { NULL, NULL }, /* I */
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */
        { pres_bline, posts_eq0 }, /* na */
@@ -83,6 +82,11 @@ static       const struct man_valid man_valids[MAN_MAX] = {
        { pres_bline, posts_eq0 }, /* nf */
        { pres_bline, posts_eq0 }, /* fi */
        { NULL, NULL }, /* r */
+       { NULL, NULL }, /* RE */
+       { NULL, posts_part }, /* RS */
+       { NULL, NULL }, /* DT */
+       { NULL, NULL }, /* UC */
+       { NULL, NULL }, /* PD */
 };
 
 
@@ -137,12 +141,13 @@ static int
 check_root(CHKARGS) 
 {
 
-       /* XXX - make this into a warning? */
        if (MAN_BLINE & m->flags)
-               return(man_nerr(m, n, WEXITSCOPE));
-       /* XXX - make this into a warning? */
+               return(man_nwarn(m, n, WEXITSCOPE));
        if (MAN_ELINE & m->flags)
-               return(man_nerr(m, n, WEXITSCOPE));
+               return(man_nwarn(m, n, WEXITSCOPE));
+
+       m->flags &= ~MAN_BLINE;
+       m->flags &= ~MAN_ELINE;
 
        if (NULL == m->first->child)
                return(man_nerr(m, n, WNODATA));
@@ -200,49 +205,29 @@ check_##name(CHKARGS) \
 }
 
 INEQ_DEFINE(0, ==, eq0)
-INEQ_DEFINE(1, ==, eq1)
+INEQ_DEFINE(1, <=, le1)
 INEQ_DEFINE(2, >=, ge2)
 INEQ_DEFINE(5, <=, le5)
 
 
 static int
-check_sp(CHKARGS)
+check_sec(CHKARGS)
 {
-       long             lval;
-       char            *ep, *buf;
-
-       if (NULL == n->child)
-               return(1);
-       else if ( ! check_eq1(m, n))
-               return(0);
-
-       assert(MAN_TEXT == n->child->type);
-       buf = n->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, n->child, WNUMFMT));
-
-       if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
-                       (lval > INT_MAX || lval < 0))
-               return(man_nerr(m, n->child, WNUMFMT));
 
+       if (MAN_BODY == n->type && 0 == n->nchild)
+               return(man_nwarn(m, n, WBODYARGS));
+       if (MAN_HEAD == n->type && 0 == n->nchild)
+               return(man_nerr(m, n, WHEADARGS));
        return(1);
 }
 
 
 static int
-check_sec(CHKARGS)
+check_part(CHKARGS)
 {
 
        if (MAN_BODY == n->type && 0 == n->nchild)
                return(man_nwarn(m, n, WBODYARGS));
-       if (MAN_HEAD == n->type && 0 == n->nchild)
-               return(man_nerr(m, n, WHEADARGS));
        return(1);
 }
 
@@ -285,24 +270,13 @@ check_par(CHKARGS)
 }
 
 
-static int
-check_eline(CHKARGS)
-{
-
-       if (MAN_ELINE & m->flags)
-               return(man_nerr(m, n, WLNSCOPE));
-       return(1);
-}
-
-
 static int
 check_bline(CHKARGS)
 {
 
+       assert( ! (MAN_ELINE & m->flags));
        if (MAN_BLINE & m->flags)
                return(man_nerr(m, n, WLNSCOPE));
-       if (MAN_ELINE & m->flags)
-               return(man_nerr(m, n, WLNSCOPE));
        return(1);
 }