When a man(7) document contains unreasonably large numbers for

[mandoc.git] / tbl_opts.c

diff --git a/tbl_opts.c b/tbl_opts.c
index ae4df4a28a00189b3e1f18821d3d66eca3ce8080..d5ad42f73e5e023042bada3404f66e66cdef5ee2 100644 (file)
--- a/tbl_opts.c
+++ b/tbl_opts.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_opts.c,v 1.13 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: tbl_opts.c,v 1.15 2014/11/26 17:51:55 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,9 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -182,7 +182,7 @@ again:      /*
         *
         * options      ::= option_list [:space:]* [;][\n]
         * option_list  ::= option option_tail
-        * option_tail  ::= [:space:]+ option_list |
+        * option_tail  ::= [,:space:]+ option_list |
         *              ::= epsilon
         * option       ::= [:alpha:]+ args
         * args         ::= [:space:]* [(] [:alpha:]+ [)]
@@ -213,7 +213,7 @@ again:      /*
 
        buf[i] = '\0';
 
-       while (isspace((unsigned char)p[*pos]))
+       while (isspace((unsigned char)p[*pos]) || p[*pos] == ',')
                (*pos)++;
 
        /*