mdoc_atosec -> mdoc_str2sec (consistent with str2 being different from a2).

[mandoc.git] / mdoc_argv.c

diff --git a/mdoc_argv.c b/mdoc_argv.c
index e1b4ad4e3c9c37418761491834b61137146d1012..96ccef17d884c6d6b72023784574ce9e12e586b4 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.22 2009/08/19 14:44:35 kristaps Exp $ */
+/*     $Id: mdoc_argv.c,v 1.45 2010/05/09 21:06:50 kristaps Exp $ */

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


@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>


@@ -23,6 +27,7 @@
 #include <string.h>
 
 #include "libmdoc.h"
 #include <string.h>
 
 #include "libmdoc.h"

+#include "libmandoc.h"

 
 /*
  * Routines to parse arguments of macros.  Arguments follow the syntax
 
 /*
  * Routines to parse arguments of macros.  Arguments follow the syntax


@@ -32,9 +37,6 @@
  * There's no limit to the number or arguments that may be allocated.
  */
 
  * There's no limit to the number or arguments that may be allocated.
  */
 

-#define        ARGS_DELIM      (1 << 1)
-#define        ARGS_TABSEP     (1 << 2)
-

 #define        ARGV_NONE       (1 << 0)
 #define        ARGV_SINGLE     (1 << 1)
 #define        ARGV_MULTI      (1 << 2)
 #define        ARGV_NONE       (1 << 0)
 #define        ARGV_SINGLE     (1 << 1)
 #define        ARGV_MULTI      (1 << 2)


@@ -42,8 +44,8 @@
 
 #define        MULTI_STEP       5
 
 
 #define        MULTI_STEP       5
 

-static int              argv_a2arg(int, const char *);
-static int              args(struct mdoc *, int, int *, 
+static int              argv_a2arg(enum mdoct, const char *);
+static enum margserr    args(struct mdoc *, int, int *, 

                                char *, int, char **);
 static int              argv(struct mdoc *, int, 
                                struct mdoc_argv *, int *, char *);
                                char *, int, char **);
 static int              argv(struct mdoc *, int, 
                                struct mdoc_argv *, int *, char *);


@@ -62,8 +64,8 @@ static        int mdoc_argvflags[MDOC_ARG_MAX] = {
        ARGV_NONE,      /* MDOC_Ragged */
        ARGV_NONE,      /* MDOC_Unfilled */
        ARGV_NONE,      /* MDOC_Literal */
        ARGV_NONE,      /* MDOC_Ragged */
        ARGV_NONE,      /* MDOC_Unfilled */
        ARGV_NONE,      /* MDOC_Literal */

-       ARGV_NONE,      /* MDOC_File */
-       ARGV_SINGLE,    /* MDOC_Offset */
+       ARGV_SINGLE,    /* MDOC_File */
+       ARGV_OPT_SINGLE, /* MDOC_Offset */

        ARGV_NONE,      /* MDOC_Bullet */
        ARGV_NONE,      /* MDOC_Dash */
        ARGV_NONE,      /* MDOC_Hyphen */
        ARGV_NONE,      /* MDOC_Bullet */
        ARGV_NONE,      /* MDOC_Dash */
        ARGV_NONE,      /* MDOC_Hyphen */


@@ -77,7 +79,7 @@ static        int mdoc_argvflags[MDOC_ARG_MAX] = {
        ARGV_MULTI,     /* MDOC_Column */
        ARGV_SINGLE,    /* MDOC_Width */
        ARGV_NONE,      /* MDOC_Compact */
        ARGV_MULTI,     /* MDOC_Column */
        ARGV_SINGLE,    /* MDOC_Width */
        ARGV_NONE,      /* MDOC_Compact */

-       ARGV_OPT_SINGLE, /* MDOC_Std */
+       ARGV_NONE,      /* MDOC_Std */

        ARGV_NONE,      /* MDOC_Filled */
        ARGV_NONE,      /* MDOC_Words */
        ARGV_NONE,      /* MDOC_Emphasis */
        ARGV_NONE,      /* MDOC_Filled */
        ARGV_NONE,      /* MDOC_Words */
        ARGV_NONE,      /* MDOC_Emphasis */


@@ -206,6 +208,7 @@ static      int mdoc_argflags[MDOC_MAX] = {
        0, /* %Q */
        0, /* br */
        0, /* sp */
        0, /* %Q */
        0, /* br */
        0, /* sp */

+       0, /* %U */

 };
 
 
 };
 
 


@@ -214,8 +217,8 @@ static      int mdoc_argflags[MDOC_MAX] = {
  * [value0...], which may either have a single mandatory value, at least
  * one mandatory value, an optional single value, or no value.
  */
  * [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 *m, int line, int tok,
+enum margverr
+mdoc_argv(struct mdoc *m, int line, enum mdoct tok,

                struct mdoc_arg **v, int *pos, char *buf)
 {
        char             *p, sv;
                struct mdoc_arg **v, int *pos, char *buf)
 {
        char             *p, sv;


@@ -268,23 +271,12 @@ mdoc_argv(struct mdoc *m, int line, int tok,
        if ( ! argv(m, line, &tmp, pos, buf))
                return(ARGV_ERROR);
 
        if ( ! argv(m, line, &tmp, pos, buf))
                return(ARGV_ERROR);
 

-       if (NULL == (arg = *v)) {
-               *v = calloc(1, sizeof(struct mdoc_arg));
-               if (NULL == *v) {
-                       (void)mdoc_nerr(m, m->last, EMALLOC);
-                       return(ARGV_ERROR);
-               }
-               arg = *v;
-       } 
+       if (NULL == (arg = *v))
+               arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg));

 
        arg->argc++;
 
        arg->argc++;

-       arg->argv = realloc(arg->argv, arg->argc * 
-                       sizeof(struct mdoc_argv));
-
-       if (NULL == arg->argv) {
-               (void)mdoc_nerr(m, m->last, EMALLOC);
-               return(ARGV_ERROR);
-       }
+       arg->argv = mandoc_realloc
+               (arg->argv, arg->argc * sizeof(struct mdoc_argv));

 
        (void)memcpy(&arg->argv[(int)arg->argc - 1], 
                        &tmp, sizeof(struct mdoc_argv));
 
        (void)memcpy(&arg->argv[(int)arg->argc - 1], 
                        &tmp, sizeof(struct mdoc_argv));


@@ -296,7 +288,7 @@ mdoc_argv(struct mdoc *m, int line, int tok,
 void
 mdoc_argv_free(struct mdoc_arg *p)
 {
 void
 mdoc_argv_free(struct mdoc_arg *p)
 {

-       int              i, j;
+       int              i;

 
        if (NULL == p)
                return;
 
        if (NULL == p)
                return;


@@ -308,38 +300,48 @@ mdoc_argv_free(struct mdoc_arg *p)
        }
        assert(p->argc);
 
        }
        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);
-       }
+       for (i = (int)p->argc - 1; i >= 0; i--)
+               mdoc_argn_free(p, i);

 
        free(p->argv);
        free(p);
 }
 
 
 
        free(p->argv);
        free(p);
 }
 
 

-int
-mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v)
+void
+mdoc_argn_free(struct mdoc_arg *p, int iarg)
+{
+       struct mdoc_argv *arg = &p->argv[iarg];
+       int               j;
+
+       if (arg->sz && arg->value) {
+               for (j = (int)arg->sz - 1; j >= 0; j--) 
+                       free(arg->value[j]);
+               free(arg->value);
+       }
+
+       for (--p->argc; iarg < (int)p->argc; iarg++)
+               p->argv[iarg] = p->argv[iarg+1];
+}
+
+
+enum margserr
+mdoc_zargs(struct mdoc *m, int line, int *pos, 
+               char *buf, int flags, char **v)

 {
 
 {
 

-       return(args(m, line, pos, buf, 0, v));
+       return(args(m, line, pos, buf, flags, v));

 }
 
 
 }
 
 

-int
-mdoc_args(struct mdoc *m, int line, 
-               int *pos, char *buf, int tok, char **v)
+enum margserr
+mdoc_args(struct mdoc *m, int line, int *pos, 
+               char *buf, enum mdoct tok, char **v)

 {
        int               fl, c, i;
        struct mdoc_node *n;
 
 {
        int               fl, c, i;
        struct mdoc_node *n;
 

-       fl = (0 == tok) ? 0 : mdoc_argflags[tok];
+       fl = mdoc_argflags[tok];

 
        if (MDOC_It != tok)
                return(args(m, line, pos, buf, fl, v));
 
        if (MDOC_It != tok)
                return(args(m, line, pos, buf, fl, v));


@@ -370,41 +372,62 @@ mdoc_args(struct mdoc *m, int line,
 }
 
 
 }
 
 

-static int
+static enum margserr

 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {
        int               i;
        char             *p, *pp;
 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {
        int               i;
        char             *p, *pp;

+       enum margserr     rc;
+
+       /*
+        * Parse out the terms (like `val' in `.Xx -arg val' or simply
+        * `.Xx val'), which can have all sorts of properties:
+        *
+        *   ARGS_DELIM: use special handling if encountering trailing
+        *   delimiters in the form of [[::delim::][ ]+]+.
+        *
+        *   ARGS_NOWARN: don't post warnings.  This is only used when
+        *   re-parsing delimiters, as the warnings have already been
+        *   posted.
+        *
+        *   ARGS_TABSEP: use special handling for tab/`Ta' separated
+        *   phrases like in `Bl -column'.
+        */

 
        assert(*pos);
        assert(' ' != buf[*pos]);
 
 
        assert(*pos);
        assert(' ' != buf[*pos]);
 

-       if (0 == buf[*pos])
+       if ('\0' == buf[*pos])

                return(ARGS_EOLN);
 
        /* 
                return(ARGS_EOLN);
 
        /* 

-        * If the first character is a delimiter and we're to look for
-        * delimited strings, then pass down the buffer seeing if it
-        * follows the pattern of [[::delim::][ ]+]+.
+        * If the first character is a closing delimiter and we're to
+        * look for delimited strings, then pass down the buffer seeing
+        * if it follows the pattern of [[::delim::][ ]+]+.  Note that
+        * we ONLY care about closing delimiters.

         */
 
         */
 

-       if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
+       if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) {

                for (i = *pos; buf[i]; ) {
                for (i = *pos; buf[i]; ) {

-                       if ( ! mdoc_iscdelim(buf[i]))
+                       if ( mdoc_iscdelim(buf[i]) < 2)

                                break;
                        i++;
                                break;
                        i++;

-                       if (0 == buf[i] || ' ' != buf[i])
+                       if ('\0' == buf[i] || ' ' != buf[i])

                                break;
                        i++;
                        while (buf[i] && ' ' == buf[i])
                                i++;
                }
 
                                break;
                        i++;
                        while (buf[i] && ' ' == buf[i])
                                i++;
                }
 

-               /* FIXME: warn about trailing whitespace. */
-
-               if (0 == buf[i]) {
+               if ('\0' == buf[i]) {

                        *v = &buf[*pos];
                        *v = &buf[*pos];

+                       if (' ' != buf[i - 1])
+                               return(ARGS_PUNCT);
+                       if (ARGS_NOWARN & fl)
+                               return(ARGS_PUNCT);
+                       if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
+                               return(ARGS_ERROR);

                        return(ARGS_PUNCT);
                }
        }
                        return(ARGS_PUNCT);
                }
        }


@@ -432,23 +455,30 @@ args(struct mdoc *m, int line, int *pos,
                                break;
                }
 
                                break;
                }
 

+               /* By default, assume a phrase. */
+               rc = ARGS_PHRASE;
+

                /* 
                 * Adjust new-buffer position to be beyond delimiter
                 * mark (e.g., Ta -> end + 2).
                 */
                if (p && pp) {
                        *pos += pp < p ? 2 : 1;
                /* 
                 * Adjust new-buffer position to be beyond delimiter
                 * mark (e.g., Ta -> end + 2).
                 */
                if (p && pp) {
                        *pos += pp < p ? 2 : 1;

+                       rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE;

                        p = pp < p ? pp : p;
                } else if (p && ! pp) {
                        p = pp < p ? pp : p;
                } else if (p && ! pp) {

+                       rc = ARGS_PPHRASE;

                        *pos += 1;
                } else if (pp && ! p) {
                        p = pp;
                        *pos += 2;
                        *pos += 1;
                } else if (pp && ! p) {
                        p = pp;
                        *pos += 2;

-               } else
+               } else {
+                       rc = ARGS_PEND;

                        p = strchr(*v, 0);
                        p = strchr(*v, 0);

+               }

 
                /* Whitespace check for eoln case... */
 
                /* Whitespace check for eoln case... */

-               if (0 == *p && ' ' == *(p - 1))
+               if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))

                        if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                                return(ARGS_ERROR);
 
                        if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                                return(ARGS_ERROR);
 


@@ -467,7 +497,7 @@ args(struct mdoc *m, int line, int *pos,
                for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
                        /* Skip ahead. */ ;
 
                for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
                        /* Skip ahead. */ ;
 

-               return(ARGS_PHRASE);
+               return(rc);

        } 
 
        /* 
        } 
 
        /* 


@@ -488,6 +518,8 @@ args(struct mdoc *m, int line, int *pos,
                }
 
                if (0 == buf[*pos]) {
                }
 
                if (0 == buf[*pos]) {

+                       if (ARGS_NOWARN & fl)
+                               return(ARGS_QWORD);

                        if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM))
                                return(ARGS_ERROR);
                        return(ARGS_QWORD);
                        if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM))
                                return(ARGS_ERROR);
                        return(ARGS_QWORD);


@@ -501,7 +533,7 @@ args(struct mdoc *m, int line, int *pos,
                while (' ' == buf[*pos])
                        (*pos)++;
 
                while (' ' == buf[*pos])
                        (*pos)++;
 

-               if (0 == buf[*pos])
+               if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))

                        if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                                return(ARGS_ERROR);
 
                        if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                                return(ARGS_ERROR);
 


@@ -525,7 +557,7 @@ args(struct mdoc *m, int line, int *pos,
        while (' ' == buf[*pos])
                (*pos)++;
 
        while (' ' == buf[*pos])
                (*pos)++;
 

-       if (0 == buf[*pos])
+       if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))

                if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                        return(ARGS_ERROR);
 
                if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
                        return(ARGS_ERROR);
 


@@ -534,7 +566,7 @@ args(struct mdoc *m, int line, int *pos,
 
 
 static int
 
 
 static int

-argv_a2arg(int tok, const char *argv)
+argv_a2arg(enum mdoct tok, const char *p)

 {
 
        /*
 {
 
        /*


@@ -547,80 +579,82 @@ argv_a2arg(int tok, const char *argv)
 
        switch (tok) {
        case (MDOC_An):
 
        switch (tok) {
        case (MDOC_An):

-               if (0 == strcmp(argv, "split"))
+               if (0 == strcmp(p, "split"))

                        return(MDOC_Split);
                        return(MDOC_Split);

-               else if (0 == strcmp(argv, "nosplit"))
+               else if (0 == strcmp(p, "nosplit"))

                        return(MDOC_Nosplit);
                break;
 
        case (MDOC_Bd):
                        return(MDOC_Nosplit);
                break;
 
        case (MDOC_Bd):

-               if (0 == strcmp(argv, "ragged"))
+               if (0 == strcmp(p, "ragged"))

                        return(MDOC_Ragged);
                        return(MDOC_Ragged);

-               else if (0 == strcmp(argv, "unfilled"))
+               else if (0 == strcmp(p, "unfilled"))

                        return(MDOC_Unfilled);
                        return(MDOC_Unfilled);

-               else if (0 == strcmp(argv, "filled"))
+               else if (0 == strcmp(p, "filled"))

                        return(MDOC_Filled);
                        return(MDOC_Filled);

-               else if (0 == strcmp(argv, "literal"))
+               else if (0 == strcmp(p, "literal"))

                        return(MDOC_Literal);
                        return(MDOC_Literal);

-               else if (0 == strcmp(argv, "file"))
+               else if (0 == strcmp(p, "file"))

                        return(MDOC_File);
                        return(MDOC_File);

-               else if (0 == strcmp(argv, "offset"))
+               else if (0 == strcmp(p, "offset"))

                        return(MDOC_Offset);
                        return(MDOC_Offset);

-               else if (0 == strcmp(argv, "compact"))
+               else if (0 == strcmp(p, "compact"))

                        return(MDOC_Compact);
                        return(MDOC_Compact);

+               else if (0 == strcmp(p, "centered"))
+                       return(MDOC_Centred);

                break;
 
        case (MDOC_Bf):
                break;
 
        case (MDOC_Bf):

-               if (0 == strcmp(argv, "emphasis"))
+               if (0 == strcmp(p, "emphasis"))

                        return(MDOC_Emphasis);
                        return(MDOC_Emphasis);

-               else if (0 == strcmp(argv, "literal"))
+               else if (0 == strcmp(p, "literal"))

                        return(MDOC_Literal);
                        return(MDOC_Literal);

-               else if (0 == strcmp(argv, "symbolic"))
+               else if (0 == strcmp(p, "symbolic"))

                        return(MDOC_Symbolic);
                break;
 
        case (MDOC_Bk):
                        return(MDOC_Symbolic);
                break;
 
        case (MDOC_Bk):

-               if (0 == strcmp(argv, "words"))
+               if (0 == strcmp(p, "words"))

                        return(MDOC_Words);
                break;
 
        case (MDOC_Bl):
                        return(MDOC_Words);
                break;
 
        case (MDOC_Bl):

-               if (0 == strcmp(argv, "bullet"))
+               if (0 == strcmp(p, "bullet"))

                        return(MDOC_Bullet);
                        return(MDOC_Bullet);

-               else if (0 == strcmp(argv, "dash"))
+               else if (0 == strcmp(p, "dash"))

                        return(MDOC_Dash);
                        return(MDOC_Dash);

-               else if (0 == strcmp(argv, "hyphen"))
+               else if (0 == strcmp(p, "hyphen"))

                        return(MDOC_Hyphen);
                        return(MDOC_Hyphen);

-               else if (0 == strcmp(argv, "item"))
+               else if (0 == strcmp(p, "item"))

                        return(MDOC_Item);
                        return(MDOC_Item);

-               else if (0 == strcmp(argv, "enum"))
+               else if (0 == strcmp(p, "enum"))

                        return(MDOC_Enum);
                        return(MDOC_Enum);

-               else if (0 == strcmp(argv, "tag"))
+               else if (0 == strcmp(p, "tag"))

                        return(MDOC_Tag);
                        return(MDOC_Tag);

-               else if (0 == strcmp(argv, "diag"))
+               else if (0 == strcmp(p, "diag"))

                        return(MDOC_Diag);
                        return(MDOC_Diag);

-               else if (0 == strcmp(argv, "hang"))
+               else if (0 == strcmp(p, "hang"))

                        return(MDOC_Hang);
                        return(MDOC_Hang);

-               else if (0 == strcmp(argv, "ohang"))
+               else if (0 == strcmp(p, "ohang"))

                        return(MDOC_Ohang);
                        return(MDOC_Ohang);

-               else if (0 == strcmp(argv, "inset"))
+               else if (0 == strcmp(p, "inset"))

                        return(MDOC_Inset);
                        return(MDOC_Inset);

-               else if (0 == strcmp(argv, "column"))
+               else if (0 == strcmp(p, "column"))

                        return(MDOC_Column);
                        return(MDOC_Column);

-               else if (0 == strcmp(argv, "width"))
+               else if (0 == strcmp(p, "width"))

                        return(MDOC_Width);
                        return(MDOC_Width);

-               else if (0 == strcmp(argv, "offset"))
+               else if (0 == strcmp(p, "offset"))

                        return(MDOC_Offset);
                        return(MDOC_Offset);

-               else if (0 == strcmp(argv, "compact"))
+               else if (0 == strcmp(p, "compact"))

                        return(MDOC_Compact);
                        return(MDOC_Compact);

-               else if (0 == strcmp(argv, "nested"))
+               else if (0 == strcmp(p, "nested"))

                        return(MDOC_Nested);
                break;
        
        case (MDOC_Rv):
                /* FALLTHROUGH */
        case (MDOC_Ex):
                        return(MDOC_Nested);
                break;
        
        case (MDOC_Rv):
                /* FALLTHROUGH */
        case (MDOC_Ex):

-               if (0 == strcmp(argv, "std"))
+               if (0 == strcmp(p, "std"))

                        return(MDOC_Std);
                break;
        default:
                        return(MDOC_Std);
                break;
        default:


@@ -635,28 +669,23 @@ static int
 argv_multi(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_multi(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c;
+       enum margserr    ac;

        char            *p;
 
        for (v->sz = 0; ; v->sz++) {
                if ('-' == buf[*pos])
                        break;
        char            *p;
 
        for (v->sz = 0; ; v->sz++) {
                if ('-' == buf[*pos])
                        break;

-               c = args(m, line, pos, buf, 0, &p);
-               if (ARGS_ERROR == c)
+               ac = args(m, line, pos, buf, 0, &p);
+               if (ARGS_ERROR == ac)

                        return(0);
                        return(0);

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

                        break;
 
                        break;
 

-               if (0 == v->sz % MULTI_STEP) {
-                       v->value = realloc(v->value, 
+               if (0 == v->sz % MULTI_STEP)
+                       v->value = mandoc_realloc(v->value, 

                                (v->sz + MULTI_STEP) * sizeof(char *));
                                (v->sz + MULTI_STEP) * sizeof(char *));

-                       if (NULL == v->value) {
-                               (void)mdoc_nerr(m, m->last, EMALLOC);
-                               return(ARGV_ERROR);
-                       }
-               }
-               if (NULL == (v->value[(int)v->sz] = strdup(p)))
-                       return(mdoc_nerr(m, m->last, EMALLOC));
+
+               v->value[(int)v->sz] = mandoc_strdup(p);

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


@@ -667,23 +696,21 @@ static int
 argv_opt_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_opt_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c;
+       enum margserr    ac;

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

-       c = args(m, line, pos, buf, 0, &p);
-       if (ARGS_ERROR == c)
+       ac = args(m, line, pos, buf, 0, &p);
+       if (ARGS_ERROR == ac)

                return(0);
                return(0);

-       if (ARGS_EOLN == c)
+       if (ARGS_EOLN == ac)

                return(1);
 
        v->sz = 1;
                return(1);
 
        v->sz = 1;

-       if (NULL == (v->value = calloc(1, sizeof(char *))))
-               return(mdoc_nerr(m, m->last, EMALLOC));
-       if (NULL == (v->value[0] = strdup(p)))
-               return(mdoc_nerr(m, m->last, EMALLOC));
+       v->value = mandoc_malloc(sizeof(char *));
+       v->value[0] = mandoc_strdup(p);

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


@@ -696,22 +723,21 @@ static int
 argv_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c, ppos;
+       int              ppos;
+       enum margserr    ac;

        char            *p;
 
        ppos = *pos;
 
        char            *p;
 
        ppos = *pos;
 

-       c = args(m, line, pos, buf, 0, &p);
-       if (ARGS_ERROR == c)
+       ac = args(m, line, pos, buf, 0, &p);
+       if (ARGS_ERROR == ac)

                return(0);
                return(0);

-       if (ARGS_EOLN == c)
+       if (ARGS_EOLN == ac)

                return(mdoc_perr(m, line, ppos, EARGVAL));
 
        v->sz = 1;
                return(mdoc_perr(m, line, ppos, EARGVAL));
 
        v->sz = 1;

-       if (NULL == (v->value = calloc(1, sizeof(char *))))
-               return(mdoc_nerr(m, m->last, EMALLOC));
-       if (NULL == (v->value[0] = strdup(p)))
-               return(mdoc_nerr(m, m->last, EMALLOC));
+       v->value = mandoc_malloc(sizeof(char *));
+       v->value[0] = mandoc_strdup(p);

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