Some release notes (this isn't signalling an impending release; I just

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 11ed743580428d5e1086de8d2d2ec0c6bd3515c9..e36138c830978084b07ca3c02da3fd34d205e149 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.132 2011/04/13 09:57:41 kristaps Exp $ */
+/*     $Id: roff.c,v 1.138 2011/05/14 16:06:08 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,12 +20,9 @@
 #endif
 
 #include <assert.h>
-#include <errno.h>
 #include <ctype.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "mandoc.h"
 #include "libroff.h"
@@ -206,7 +203,6 @@ static      void             roffnode_push(struct roff *, enum rofft,
                                const char *, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(struct roff *, const char *, int *);
-static int              roff_parse_nat(const char *, unsigned int *);
 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
@@ -593,27 +589,6 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        return(t);
 }
 
-
-static int
-roff_parse_nat(const char *buf, unsigned int *res)
-{
-       char            *ep;
-       long             lval;
-
-       errno = 0;
-       lval = strtol(buf, &ep, 10);
-       if (buf[0] == '\0' || *ep != '\0')
-               return(0);
-       if ((errno == ERANGE && 
-                       (lval == LONG_MAX || lval == LONG_MIN)) ||
-                       (lval > INT_MAX || lval < 0))
-               return(0);
-
-       *res = (unsigned int)lval;
-       return(1);
-}
-
-
 /* ARGSUSED */
 static enum rofferr
 roff_cblock(ROFF_ARGS)
@@ -829,8 +804,7 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))
-               return(ROFF_IGN);
+       t = roff_parse(r, *bufp, &pos);
 
        /*
         * Macros other than block-end are only significant
@@ -1091,6 +1065,7 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
+       int              iv;
        struct reg      *rg;
 
        val = *bufp + pos;
@@ -1099,8 +1074,10 @@ roff_nr(ROFF_ARGS)
 
        if (0 == strcmp(key, "nS")) {
                rg[(int)REG_nS].set = 1;
-               if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))
-                       rg[(int)REG_nS].v.u = 0;
+               if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+                       rg[REG_nS].v.u = (unsigned)iv;
+               else
+                       rg[(int)REG_nS].v.u = 0u;
        }
 
        return(ROFF_IGN);