Lint- and NetBSD-compiler checks.

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 8ebf89bef67e07fc3c69b75c29b2b89bbeed969a..e97f536d9a2fb4d52c52dd55a1a3346c027c9286 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.18 2009/01/20 12:51:28 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,9 +25,14 @@
 
 #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. */
-/* FIXME: if arguments are quoted, they should not be later parsed for
- * macros. */
 
 static int              lookup(int, const char *);
 static int              parse(struct mdoc *, int,
@@ -65,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]) {
@@ -102,7 +107,7 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                        }
                else {
                        while (buf[*pos]) {
-                               if (isspace(buf[*pos]))
+                               if (isspace((int)buf[*pos]))
                                        if ('\\' != buf[*pos - 1])
                                                break;
                                (*pos)++;
@@ -118,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])
@@ -148,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);
 }
 
 
@@ -447,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);
@@ -460,7 +465,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 
        assert(*pos > 0);
        while (buf[*pos]) {
-               if (isspace(buf[*pos])) 
+               if (isspace((int)buf[*pos])) 
                        if ('\\' != buf[*pos - 1])
                                break;
                (*pos)++;
@@ -475,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. */