summaryrefslogtreecommitdiffstats
path: root/man_argv.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2011-01-03 22:42:37 +0000
committerIngo Schwarze <schwarze@openbsd.org>2011-01-03 22:42:37 +0000
commite1a791dfe938cc8826f20112330b85af7119064b (patch)
tree060f1e2c33e3ffeec9cc1e1a9d23285c9848e8bd /man_argv.c
parentec42aa083a7583af9591a90cd48ce0e67e3ba4db (diff)
downloadmandoc-e1a791dfe938cc8826f20112330b85af7119064b.tar.gz
Unify roff macro argument parsing (in roff.c, roff_userdef()) and man macro
argument parsing (in man_argv.c, man_args()), both having different bugs, to use one common macro argument parser (in mandoc.c, mandoc_getarg()), because from the point of view of roff, man macros are just roff macros, hence their arguments are parsed in exactly the same way. While doing so, fix these bugs: * Escaped blanks (i.e. those preceded by an odd number of backslashes) were mishandled as argument separators in unquoted arguments to user-defined roff macros. * Unescaped blanks preceded by an even number of backslashes were not recognized as argument separators in unquoted arguments to man macros. * Escaped backslashes (i.e. pairs of backslashes) were not reduced to single backslashes both in unquoted and quoted arguments both to user-defined roff macros and to man macros. * Escaped quotes (i.e. pairs of quotes inside quoted arguments) were not reduced to single quotes in man macros. OK kristaps@ Note that mdoc macro argument parsing is yet another beast for no good reason and is probably afflicted by similar bugs. But i don't attempt to fix that right now because it is intricately entangled with lots of unrelated high-level mdoc(7) functionality, like delimiter handling and column list phrase handling. Disentagling that would waste too much time now.
Diffstat (limited to 'man_argv.c')
-rw-r--r--man_argv.c76
1 files changed, 8 insertions, 68 deletions
diff --git a/man_argv.c b/man_argv.c
index 998c7a68..f091d0f2 100644
--- a/man_argv.c
+++ b/man_argv.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -21,84 +21,24 @@
#include <sys/types.h>
#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
#include "mandoc.h"
#include "libman.h"
+#include "libmandoc.h"
int
man_args(struct man *m, int line, int *pos, char *buf, char **v)
{
+ char *start;
assert(*pos);
- assert(' ' != buf[*pos]);
+ *v = start = buf + *pos;
+ assert(' ' != *start);
- if (0 == buf[*pos])
+ if ('\0' == *start)
return(ARGS_EOLN);
- *v = &buf[*pos];
-
- /*
- * Process a quoted literal. A quote begins with a double-quote
- * and ends with a double-quote NOT preceded by a double-quote.
- * Whitespace is NOT involved in literal termination.
- */
-
- if ('\"' == buf[*pos]) {
- *v = &buf[++(*pos)];
-
- for ( ; buf[*pos]; (*pos)++) {
- if ('\"' != buf[*pos])
- continue;
- if ('\"' != buf[*pos + 1])
- break;
- (*pos)++;
- }
-
- if (0 == buf[*pos]) {
- if ( ! man_pmsg(m, line, *pos, MANDOCERR_BADQUOTE))
- return(ARGS_ERROR);
- return(ARGS_QWORD);
- }
-
- buf[(*pos)++] = 0;
-
- if (0 == buf[*pos])
- return(ARGS_QWORD);
-
- while (' ' == buf[*pos])
- (*pos)++;
-
- if (0 == buf[*pos])
- if ( ! man_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
- return(ARGS_ERROR);
-
- return(ARGS_QWORD);
- }
-
- /*
- * A non-quoted term progresses until either the end of line or
- * a non-escaped whitespace.
- */
-
- for ( ; buf[*pos]; (*pos)++)
- if (' ' == buf[*pos] && '\\' != buf[*pos - 1])
- break;
-
- if (0 == buf[*pos])
- return(ARGS_WORD);
-
- buf[(*pos)++] = 0;
-
- while (' ' == buf[*pos])
- (*pos)++;
-
- if (0 == buf[*pos])
- if ( ! man_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
- return(ARGS_ERROR);
-
- return(ARGS_WORD);
+ *v = mandoc_getarg(v, m->msg, m->data, line, pos);
+ return('"' == *start ? ARGS_QWORD : ARGS_WORD);
}
-