Removed static limitation of buffer size.

diff --git a/mmain.c b/mmain.c
index 952393e059820e53b8e5a25d39a3d454e5752eb9..2c5894cd474b5d105df91e0ccea36c5ebbd38103 100644 (file)
--- a/mmain.c
+++ b/mmain.c
@@ -1,4 +1,4 @@
-       /* $Id: mmain.c,v 1.7 2009/03/08 18:02:36 kristaps Exp $ */
+       /* $Id: mmain.c,v 1.8 2009/03/08 18:50:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,7 +30,7 @@
 
 #include "mmain.h"
 
-#define        MD_LINE_SZ      (256)           /* Max input line size. */
+#define        MD_LINE_SZ      (256)           /* Input line step-size. */
 
 struct mmain {
        int               warn;         /* Warning flags. */
@@ -269,39 +269,31 @@ optswarn(struct mmain *p, char *arg)
 static int
 parse(struct mmain *p)
 {
-       ssize_t          sz, i;
-       size_t           pos;
-       char             line[MD_LINE_SZ];
-       int              lnn;
-
-       /*
-        * This is a little more complicated than fgets.  TODO: have
-        * some benchmarks that show it's faster (note that I want to
-        * check many, many manuals simultaneously, so speed is
-        * important).  Fill a buffer (sized to the block size) with a
-        * single read, then parse \n-terminated lines into a line
-        * buffer, which is passed to the parser.  Hard-code the line
-        * buffer to a particular size -- a reasonable assumption.
-        */
-
-       for (lnn = 1, pos = 0; ; ) {
+       ssize_t          sz;
+       int              i, pos, len, lnn;
+       char            *line;
+
+       for (line = NULL, lnn = 1, len = pos = 0; ; ) {
                if (-1 == (sz = read(p->fdin, p->buf, p->bufsz))) {
                        warn("%s", p->in);
                        return(0);
                } else if (0 == sz) 
                        break;
 
-               for (i = 0; i < sz; i++) {
+               for (i = 0; i < (int)sz; i++) {
+                       if (pos >= len) {
+                               len += MD_LINE_SZ;
+                               line = realloc(line, len);
+                               if (NULL == line)
+                                       err(1, "realloc");
+                       }
+
                        if ('\n' != p->buf[i]) {
-                               if (pos < sizeof(line)) {
-                                       line[(int)pos++] = p->buf[(int)i];
-                                       continue;
-                               }
-                               warnx("%s: line %d too long", p->in, lnn);
-                               return(0);
+                               line[pos++] = p->buf[i];
+                               continue;
                        }
-       
-                       line[(int)pos] = 0;
+
+                       line[pos] = 0;
                        if ( ! mdoc_parseln(p->mdoc, lnn, line))
                                return(0);
 
@@ -310,6 +302,8 @@ parse(struct mmain *p)
                }
        }
 
+       if (line)
+               free(line);
        return(mdoc_endparse(p->mdoc));
 }