Memory fixes in new dynamic schema.

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 2e75d70e43f26ec50dc455835d8bee6c213f65f2..9cd5350307cb90026731725c37f4550acde1bb42 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.38 2009/03/06 14:13:47 kristaps Exp $ */
+/* $Id: argv.c,v 1.40 2009/03/08 12:40:27 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -29,6 +29,8 @@
  * Routines to parse arguments of macros.  Arguments follow the syntax
  * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
  * arguments, multiple arguments per value, no-value arguments, etc.
  * Routines to parse arguments of macros.  Arguments follow the syntax
  * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
  * arguments, multiple arguments per value, no-value arguments, etc.

+ *
+ * There's no limit to the number or arguments that may be allocated.

  */
 
 #define        ARGS_QUOTED     (1 << 0)
  */
 
 #define        ARGS_QUOTED     (1 << 0)


@@ -41,32 +43,31 @@
 #define        ARGV_MULTI      (1 << 2)
 #define        ARGV_OPT_SINGLE (1 << 3)
 
 #define        ARGV_MULTI      (1 << 2)
 #define        ARGV_OPT_SINGLE (1 << 3)
 

+enum   mwarn {
+       WQUOTPARM,
+       WARGVPARM,
+       WCOLEMPTY,
+       WTAILWS 
+};
+
+enum   merr {
+       EQUOTTERM,
+       EARGVAL 
+};
+

 static int              argv_a2arg(int, const char *);
 static int              args(struct mdoc *, int, int *, 
                                char *, int, char **);
 static int              argv(struct mdoc *, int, int,
 static int              argv_a2arg(int, const char *);
 static int              args(struct mdoc *, int, int *, 
                                char *, int, char **);
 static int              argv(struct mdoc *, int, int,

-                               struct mdoc_arg *, int *, char *);
+                               struct mdoc_argv *, int *, char *);

 static int              argv_single(struct mdoc *, int, 
 static int              argv_single(struct mdoc *, int, 

-                               struct mdoc_arg *, int *, char *);
+                               struct mdoc_argv *, int *, char *);

 static int              argv_opt_single(struct mdoc *, int, 
 static int              argv_opt_single(struct mdoc *, int, 

-                               struct mdoc_arg *, int *, char *);
+                               struct mdoc_argv *, int *, char *);

 static int              argv_multi(struct mdoc *, int, 
 static int              argv_multi(struct mdoc *, int, 

-                               struct mdoc_arg *, int *, char *);
-static int              pwarn(struct mdoc *, int, int, int);
-static int              perr(struct mdoc *, int, int, int);
-
-/* Warning messages. */
-
-#define        WQUOTPARM       (0)
-#define        WARGVPARM       (1)
-#define        WCOLEMPTY       (2)
-#define        WTAILWS         (3)
-
-/* Error messages. */
-
-#define        EQUOTTERM       (0)
-#define        EARGVAL         (1)
-#define        EARGMANY        (2)
+                               struct mdoc_argv *, int *, char *);
+static int              pwarn(struct mdoc *, int, int, enum mwarn);
+static int              perr(struct mdoc *, int, int, enum merr);

 
 /* Per-argument flags. */
 
 
 /* Per-argument flags. */
 


@@ -209,59 +210,163 @@ static   int mdoc_argflags[MDOC_MAX] = {
 };
 
 
 };
 
 

+/*
+ * Parse an argument from line text.  This comes in the form of -key
+ * [value0...], which may either have a single mandatory value, at least
+ * one mandatory value, an optional single value, or no value.
+ */
+int
+mdoc_argv(struct mdoc *mdoc, int line, int tok,
+               struct mdoc_arg **v, int *pos, char *buf)
+{
+       int               i;
+       char             *p;
+       struct mdoc_argv tmp;
+       struct mdoc_arg  *arg;
+
+       if (0 == buf[*pos])
+               return(ARGV_EOLN);
+
+       assert( ! isspace((u_char)buf[*pos]));
+
+       if ('-' != buf[*pos])
+               return(ARGV_WORD);
+
+       i = *pos;
+       p = &buf[++(*pos)];
+
+       assert(*pos > 0);
+
+       /* LINTED */
+       while (buf[*pos]) {
+               if (isspace((u_char)buf[*pos])) 
+                       if ('\\' != buf[*pos - 1])
+                               break;
+               (*pos)++;
+       }
+
+       if (buf[*pos])
+               buf[(*pos)++] = 0;
+
+       (void)memset(&tmp, 0, sizeof(struct mdoc_argv));
+       tmp.line = line;
+       tmp.pos = *pos;
+
+       /*
+        * We now parse out the per-macro arguments.  XXX - this can be
+        * made much cleaner using per-argument tables.  See argv_a2arg
+        * for details.
+        */
+
+       if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) {
+               if ( ! pwarn(mdoc, line, i, WARGVPARM))
+                       return(ARGV_ERROR);
+               return(ARGV_WORD);
+       }
+
+       while (buf[*pos] && isspace((u_char)buf[*pos]))
+               (*pos)++;
+
+       /* FIXME: whitespace if no value. */
+
+       if ( ! argv(mdoc, tok, line, &tmp, pos, buf))
+               return(ARGV_ERROR);
+
+       if (NULL == (arg = *v)) {
+               *v = xcalloc(1, sizeof(struct mdoc_arg));
+               arg = *v;
+       } 
+
+       arg->argc++;
+       arg->argv = xrealloc(arg->argv, arg->argc * 
+                       sizeof(struct mdoc_argv));
+
+       (void)memcpy(&arg->argv[(int)arg->argc - 1], 
+                       &tmp, sizeof(struct mdoc_argv));
+
+       return(ARGV_ARG);
+}
+
+
+void
+mdoc_argv_free(struct mdoc_arg *p)
+{
+       int              i, j;
+
+       if (p->refcnt) {
+               --(p->refcnt);
+               if (p->refcnt)
+                       return;
+       }
+
+       assert(p->argc);
+
+       /* LINTED */
+       for (i = 0; i < (int)p->argc; i++) {
+               if (0 == p->argv[i].sz)
+                       continue;
+               /* LINTED */
+               for (j = 0; j < (int)p->argv[i].sz; j++)
+                       free(p->argv[i].value[j]);
+
+               free(p->argv[i].value);
+       }
+
+       free(p->argv);
+       free(p);
+}
+
+
+

 static int
 static int

-perr(struct mdoc *mdoc, int line, int pos, int code)
+perr(struct mdoc *mdoc, int line, int pos, enum merr code)

 {
 {

-       int              c;
+       char            *p;
+
+       p = NULL;

 
        switch (code) {
        case (EQUOTTERM):
 
        switch (code) {
        case (EQUOTTERM):

-               c = mdoc_perr(mdoc, line, pos, 
-                               "unterminated quoted parameter");
+               p = "unterminated quoted parameter";

                break;
        case (EARGVAL):
                break;
        case (EARGVAL):

-               c = mdoc_perr(mdoc, line, pos, 
-                               "argument requires a value");
-               break;
-       case (EARGMANY):
-               c = mdoc_perr(mdoc, line, pos, 
-                               "too many values for argument");
+               p = "argument requires a value";

                break;
                break;

-       default:
-               abort();
-               /* NOTREACHED */

        }
        }

-       return(c);
+
+       assert(p);
+       return(mdoc_perr(mdoc, line, pos, p));

 }
 
 
 static int
 }
 
 
 static int

-pwarn(struct mdoc *mdoc, int line, int pos, int code)
+pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code)

 {
 {

+       char            *p;

        int              c;
 
        int              c;
 

+       p = NULL;
+       c = WARN_SYNTAX;
+

        switch (code) {
        case (WQUOTPARM):
        switch (code) {
        case (WQUOTPARM):

-               c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-                               "unexpected quoted parameter");
+               p = "unexpected quoted parameter";

                break;
        case (WARGVPARM):
                break;
        case (WARGVPARM):

-               c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-                               "argument-like parameter");
+               p = "argument-like parameter";

                break;
        case (WCOLEMPTY):
                break;
        case (WCOLEMPTY):

-               c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, 
-                               "last list column is empty");
+               p = "last list column is empty";
+               c = WARN_COMPAT;

                break;
        case (WTAILWS):
                break;
        case (WTAILWS):

-               c = mdoc_pwarn(mdoc, line, pos, WARN_COMPAT, 
-                               "trailing whitespace");
+               p = "trailing whitespace";
+               c = WARN_COMPAT;

                break;
                break;

-       default:
-               abort();
-               /* NOTREACHED */

        }
        }

-       return(c);
+
+       assert(p);
+       return(mdoc_pwarn(mdoc, line, pos, c, p));

 }
 
 
 }
 
 


@@ -287,7 +392,7 @@ mdoc_args(struct mdoc *mdoc, int line,
                                break;
 
                assert(n);
                                break;
 
                assert(n);

-               c = (int)n->data.block.argc;
+               c = (int)(n->args ? n->args->argc : 0);

                assert(c > 0);
 
                /*
                assert(c > 0);
 
                /*


@@ -298,7 +403,7 @@ mdoc_args(struct mdoc *mdoc, int line,
 
                /* LINTED */
                for (i = 0; i < c; i++) {
 
                /* LINTED */
                for (i = 0; i < c; i++) {

-                       switch (n->data.block.argv[i].arg) {
+                       switch (n->args->argv[i].arg) {

                        case (MDOC_Column):
                                fl |= ARGS_TABSEP;
                                fl &= ~ARGS_DELIM;
                        case (MDOC_Column):
                                fl |= ARGS_TABSEP;
                                fl &= ~ARGS_DELIM;


@@ -312,6 +417,7 @@ mdoc_args(struct mdoc *mdoc, int line,
                                break;
                        }
                }
                                break;
                        }
                }

+               break;

        default:
                break;
        }
        default:
                break;
        }


@@ -621,48 +727,43 @@ argv_a2arg(int tok, const char *argv)
 
 static int
 argv_multi(struct mdoc *mdoc, int line, 
 
 static int
 argv_multi(struct mdoc *mdoc, int line, 

-               struct mdoc_arg *v, int *pos, char *buf)
+               struct mdoc_argv *v, int *pos, char *buf)

 {
        int              c, ppos;
        char            *p;
 
 {
        int              c, ppos;
        char            *p;
 

-       v->sz = 0;
-       v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));
-

        ppos = *pos;
 
        ppos = *pos;
 

-       for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) {
+       for (v->sz = 0; ; v->sz++) {

                if ('-' == buf[*pos])
                        break;
                c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
                if ('-' == buf[*pos])
                        break;
                c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p);

-               if (ARGS_ERROR == c) {
-                       free(v->value);
+               if (ARGS_ERROR == c)

                        return(0);
                        return(0);

-               } else if (ARGS_EOLN == c)
+               else if (ARGS_EOLN == c)

                        break;
                        break;

-               v->value[(int)v->sz] = p;
+
+               if (0 == v->sz % 5)
+                       v->value = xrealloc(v->value, 
+                               (v->sz + 5) * sizeof(char *));
+
+               v->value[(int)v->sz] = xstrdup(p);

        }
 
        }
 

-       if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
+       if (v->sz)

                return(1);
 
                return(1);
 

-       free(v->value);
-       if (0 == v->sz) 
-               return(perr(mdoc, line, ppos, EARGVAL));
-
-       return(perr(mdoc, line, ppos, EARGMANY));
+       return(perr(mdoc, line, ppos, EARGVAL));

 }
 
 
 static int
 argv_opt_single(struct mdoc *mdoc, int line, 
 }
 
 
 static int
 argv_opt_single(struct mdoc *mdoc, int line, 

-               struct mdoc_arg *v, int *pos, char *buf)
+               struct mdoc_argv *v, int *pos, char *buf)

 {
 {

-       int              c, ppos;
+       int              c;

        char            *p;
 
        char            *p;
 

-       ppos = *pos;
-

        if ('-' == buf[*pos])
                return(1);
 
        if ('-' == buf[*pos])
                return(1);
 


@@ -674,7 +775,7 @@ argv_opt_single(struct mdoc *mdoc, int line,
 
        v->sz = 1;
        v->value = xcalloc(1, sizeof(char *));
 
        v->sz = 1;
        v->value = xcalloc(1, sizeof(char *));

-       v->value[0] = p;
+       v->value[0] = xstrdup(p);

        return(1);
 }
 
        return(1);
 }
 


@@ -684,7 +785,7 @@ argv_opt_single(struct mdoc *mdoc, int line,
  */
 static int
 argv_single(struct mdoc *mdoc, int line, 
  */
 static int
 argv_single(struct mdoc *mdoc, int line, 

-               struct mdoc_arg *v, int *pos, char *buf)
+               struct mdoc_argv *v, int *pos, char *buf)

 {
        int              c, ppos;
        char            *p;
 {
        int              c, ppos;
        char            *p;


@@ -699,7 +800,7 @@ argv_single(struct mdoc *mdoc, int line,
 
        v->sz = 1;
        v->value = xcalloc(1, sizeof(char *));
 
        v->sz = 1;
        v->value = xcalloc(1, sizeof(char *));

-       v->value[0] = p;
+       v->value[0] = xstrdup(p);

        return(1);
 }
 
        return(1);
 }
 


@@ -711,7 +812,7 @@ argv_single(struct mdoc *mdoc, int line,
  */
 static int
 argv(struct mdoc *mdoc, int tok, int line, 
  */
 static int
 argv(struct mdoc *mdoc, int tok, int line, 

-               struct mdoc_arg *v, int *pos, char *buf)
+               struct mdoc_argv *v, int *pos, char *buf)

 {
        int              fl;
 
 {
        int              fl;
 


@@ -745,85 +846,3 @@ argv(struct mdoc *mdoc, int tok, int line,
 
        return(1);
 }
 
        return(1);
 }

-
-
-/*
- * Parse an argument from line text.  This comes in the form of -key
- * [value0...], which may either have a single mandatory value, at least
- * one mandatory value, an optional single value, or no value.
- */
-int
-mdoc_argv(struct mdoc *mdoc, int line, int tok,
-               struct mdoc_arg *v, int *pos, char *buf)
-{
-       int              i;
-       char            *p;
-
-       (void)memset(v, 0, sizeof(struct mdoc_arg));
-
-       if (0 == buf[*pos])
-               return(ARGV_EOLN);
-
-       assert( ! isspace((u_char)buf[*pos]));
-
-       if ('-' != buf[*pos])
-               return(ARGV_WORD);
-
-       i = *pos;
-       p = &buf[++(*pos)];
-
-       v->line = line;
-       v->pos = *pos;
-
-       assert(*pos > 0);
-
-       /* LINTED */
-       while (buf[*pos]) {
-               if (isspace((u_char)buf[*pos])) 
-                       if ('\\' != buf[*pos - 1])
-                               break;
-               (*pos)++;
-       }
-
-       if (buf[*pos])
-               buf[(*pos)++] = 0;
-
-       /*
-        * We now parse out the per-macro arguments.  XXX - this can be
-        * made much cleaner using per-argument tables.  See argv_a2arg
-        * for details.
-        */
-
-       if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) {
-               if ( ! pwarn(mdoc, line, i, WARGVPARM))
-                       return(ARGV_ERROR);
-               return(ARGV_WORD);
-       }
-
-       while (buf[*pos] && isspace((u_char)buf[*pos]))
-               (*pos)++;
-
-       /* FIXME: whitespace if no value. */
-
-       if ( ! argv(mdoc, tok, line, v, pos, buf))
-               return(ARGV_ERROR);
-
-       return(ARGV_ARG);
-}
-
-
-void
-mdoc_argv_free(int sz, struct mdoc_arg *arg)
-{
-       int              i;
-
-       for (i = 0; i < sz; i++) {
-               if (0 == arg[i].sz) {
-                       assert(NULL == arg[i].value);
-                       continue;
-               }
-               assert(arg[i].value);
-               free(arg[i].value);
-       }
-}
-