aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libmdoc.h
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-12-21 17:15:18 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-12-21 17:15:18 +0000
commita90a19d8ea1fd9c75174c833a56f4c68dae450c4 (patch)
tree6040fbeff2ceb01c795fcdc0bf917f24038e4b44 /libmdoc.h
parent3cfd064738dd1ac7b31bfbb5b6eab47b4ea99b2c (diff)
downloadmandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.gz
mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.tar.zst
mandoc-a90a19d8ea1fd9c75174c833a56f4c68dae450c4.zip
Rename mandoc_getarg() to roff_getarg() and pass it the roff parser
struct as an argument such that after copy-in, it can call roff_expand() once again, which used to be called roff_res() before this. This fixes a subtle low-level roff(7) parsing bug reported by Fabio Scotoni <fabio at esse dot ch> in the 4.4BSD-Lite2 mdoc.samples(7) manual page, because that page used an escaped escape sequence in a macro argument. To expand escaped escape sequences in quoted mdoc(7) arguments, too, stop bypassing the call to roff_getarg() in mdoc_argv.c, function args() for this case. This does not solve the case of escaped escape sequences in quoted .Bl -column phrases yet. Because roff_expand() can make the string longer, roff_getarg() can no longer operate in-place but needs to malloc(3) the returned string. In the high-level parsers, free(3) that string after processing it.
Diffstat (limited to 'libmdoc.h')
-rw-r--r--libmdoc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmdoc.h b/libmdoc.h
index a605889d..dbe6ccfb 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/* $Id: libmdoc.h,v 1.114 2018/12/04 02:53:51 schwarze Exp $ */
+/* $Id: libmdoc.h,v 1.115 2018/12/21 17:15:18 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -38,6 +38,7 @@ enum margserr {
ARGS_ERROR,
ARGS_EOLN, /* end-of-line */
ARGS_WORD, /* normal word */
+ ARGS_ALLOC, /* normal word from roff_getarg() */
ARGS_PUNCT, /* series of punctuation */
ARGS_PHRASE /* Bl -column phrase */
};