Lint- and NetBSD-compiler checks.

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index fd32241d905852d6114d926e095efeb8b7e6dd03..e97f536d9a2fb4d52c52dd55a1a3346c027c9286 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.16 2009/01/17 20:10:36 kristaps Exp $ */
+/* $Id: argv.c,v 1.21 2009/01/20 13:49:36 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,6 +25,12 @@
 
 #include "private.h"
 
+/*
+ * Parse arguments and parameters of macros.  Arguments follow the
+ * syntax of `-arg [val [valN...]]', while parameters are free-form text
+ * following arguments (if any).  This file must correctly handle the
+ * strange punctuation rules dictated by groff.
+ */
 
 /* FIXME: .It called with -column and quoted arguments. */
 
@@ -64,10 +70,10 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                        if ( ! mdoc_iscdelim(buf[i]))
                                break;
                        i++;
-                       if (0 == buf[i] || ! isspace(buf[i]))
+                       if (0 == buf[i] || ! isspace((int)buf[i]))
                                break;
                        i++;
-                       while (buf[i] && isspace(buf[i]))
+                       while (buf[i] && isspace((int)buf[i]))
                                i++;
                }
                if (0 == buf[i]) {
@@ -78,7 +84,8 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
 
        /* Parse routine for non-quoted string. */
 
-       if ('\"' != buf[*pos]) {
+       assert(*pos > 0);
+       if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {
                *v = &buf[*pos];
 
                /* FIXME: UGLY tab-sep processing. */
@@ -98,9 +105,14 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                                }
                                (*pos)++;
                        }
-               else
-                       while (buf[*pos] && ! isspace(buf[*pos]))
+               else {
+                       while (buf[*pos]) {
+                               if (isspace((int)buf[*pos]))
+                                       if ('\\' != buf[*pos - 1])
+                                               break;
                                (*pos)++;
+                       }
+               }
 
                if (0 == buf[*pos])
                        return(ARGS_WORD);
@@ -111,7 +123,7 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                        return(ARGS_WORD);
 
                if ( ! (ARGS_TABSEP & fl))
-                       while (buf[*pos] && isspace(buf[*pos]))
+                       while (buf[*pos] && isspace((int)buf[*pos]))
                                (*pos)++;
 
                if (buf[*pos])
@@ -141,18 +153,18 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
 
        buf[(*pos)++] = 0;
        if (0 == buf[*pos])
-               return(ARGS_WORD);
+               return(ARGS_QWORD);
 
-       while (buf[*pos] && isspace(buf[*pos]))
+       while (buf[*pos] && isspace((int)buf[*pos]))
                (*pos)++;
 
        if (buf[*pos])
-               return(ARGS_WORD);
+               return(ARGS_QWORD);
 
        if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))
                return(ARGS_ERROR);
 
-       return(ARGS_WORD);
+       return(ARGS_QWORD);
 }
 
 
@@ -440,7 +452,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        if (0 == buf[*pos])
                return(ARGV_EOLN);
 
-       assert( ! isspace(buf[*pos]));
+       assert( ! isspace((int)buf[*pos]));
 
        if ('-' != buf[*pos])
                return(ARGV_WORD);
@@ -451,8 +463,13 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        v->line = line;
        v->pos = *pos;
 
-       while (buf[*pos] && ! isspace(buf[*pos]))
+       assert(*pos > 0);
+       while (buf[*pos]) {
+               if (isspace((int)buf[*pos])) 
+                       if ('\\' != buf[*pos - 1])
+                               break;
                (*pos)++;
+       }
 
        if (buf[*pos])
                buf[(*pos)++] = 0;
@@ -463,7 +480,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
                return(ARGV_WORD);
        }
 
-       while (buf[*pos] && isspace(buf[*pos]))
+       while (buf[*pos] && isspace((int)buf[*pos]))
                (*pos)++;
 
        /* FIXME: whitespace if no value. */