Move roff.c's strtol into libmandoc.h for use by other parts of the code

(which will come).

diff --git a/libmandoc.h b/libmandoc.h
index eafcb2c6ae1dca13126fff1de7d1882220c83603..5f8379aff27bd06a0a207c96be39325bdd233a64 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.20 2011/04/19 16:38:48 kristaps Exp $ */
+/*     $Id: libmandoc.h,v 1.21 2011/05/14 16:06:09 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -79,6 +79,7 @@ char          *mandoc_normdate(struct mparse *, char *, int, int);
 int             mandoc_eos(const char *, size_t, int);
 int             mandoc_hyph(const char *, const char *);
 int             mandoc_getcontrol(const char *, int *);
+int             mandoc_strntou(const char *, size_t, int);
 
 void            mdoc_free(struct mdoc *);
 struct mdoc    *mdoc_alloc(struct regset *, struct mparse *);

diff --git a/mandoc.c b/mandoc.c
index c0ffa585b1db13e830cac6cbd73a1b8b24457525..249a0dea92aa389961aeeaac17be73b44ece63de 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.49 2011/04/30 10:18:24 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.50 2011/05/14 16:06:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -23,6 +23,8 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -686,3 +688,35 @@ mandoc_getcontrol(const char *cp, int *ppos)
        *ppos = pos;
        return(1);
 }
+
+/*
+ * Convert a string to a long that may not be <0.
+ * If the string is invalid, or is less than 0, return -1.
+ */
+int
+mandoc_strntou(const char *p, size_t sz, int base)
+{
+       char             buf[32];
+       char            *ep;
+       long             v;
+
+       if (sz > 31)
+               return(-1);
+
+       memcpy(buf, p, sz);
+       buf[sz] = '\0';
+
+       errno = 0;
+       v = strtol(buf, &ep, base);
+
+       if (buf[0] == '\0' || *ep != '\0')
+               return(-1);
+
+       if ((errno == ERANGE && 
+                       (v == LONG_MAX || v == LONG_MIN)) ||
+                       (v > INT_MAX || v < 0))
+               return(-1);
+
+       return((int)v);
+}
+

diff --git a/roff.c b/roff.c
index bb6123850d310ce8969b52708d06cb96a3ea7d79..e36138c830978084b07ca3c02da3fd34d205e149 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.137 2011/04/24 23:51:17 schwarze 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)
@@ -1090,6 +1065,7 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
+       int              iv;
        struct reg      *rg;
 
        val = *bufp + pos;
@@ -1098,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);