diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2011-01-03 22:42:37 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2011-01-03 22:42:37 +0000 |
| commit | 98c1b1ff061599876c28f029646bead0e9b01616 (patch) | |
| tree | b90d8dda335c222ccdc9d9a010be8c1f2df9193d /libmandoc.h | |
| parent | 70bf8bf8ee386c7026a0bd4a22486dd13e3cf329 (diff) | |
| download | mandoc-98c1b1ff061599876c28f029646bead0e9b01616.tar.gz mandoc-98c1b1ff061599876c28f029646bead0e9b01616.tar.zst mandoc-98c1b1ff061599876c28f029646bead0e9b01616.zip | |
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 'libmandoc.h')
| -rw-r--r-- | libmandoc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmandoc.h b/libmandoc.h index ab21a421..0e9a7492 100644 --- a/libmandoc.h +++ b/libmandoc.h @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.9 2010/07/18 17:00:26 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.10 2011/01/03 22:42:37 schwarze Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -24,6 +24,7 @@ void *mandoc_calloc(size_t, size_t); char *mandoc_strdup(const char *); void *mandoc_malloc(size_t); void *mandoc_realloc(void *, size_t); +char *mandoc_getarg(char **, mandocmsg, void *, int, int *); time_t mandoc_a2time(int, const char *); #define MTIME_CANONICAL (1 << 0) #define MTIME_REDUCED (1 << 1) |