diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-02-06 11:54:03 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-02-06 11:54:03 +0000 |
| commit | 39839348ec51fa57f6ef38590295ebcfb8d53e52 (patch) | |
| tree | a39119f19ea0d3da8f609db466050d932f5cc2b7 /usr.bin/mandoc/man_macro.c | |
| parent | convert atoi to strtonum (diff) | |
| download | wireguard-openbsd-39839348ec51fa57f6ef38590295ebcfb8d53e52.tar.xz wireguard-openbsd-39839348ec51fa57f6ef38590295ebcfb8d53e52.zip | |
better error reporting regarding .OP .RS .UR .TH arguments
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 7843c4e7eb8..d61a0d70493 100644 --- a/usr.bin/mandoc/man_macro.c +++ b/usr.bin/mandoc/man_macro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_macro.c,v 1.59 2015/02/06 09:38:22 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.60 2015/02/06 11:54:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -335,31 +335,25 @@ blk_close(MACRO_PROT_ARGS) void blk_exp(MACRO_PROT_ARGS) { - struct man_node *n; - int la; + struct man_node *head; char *p; + int la; rew_scope(MAN_BLOCK, man, tok); man_block_alloc(man, line, ppos, tok); man_head_alloc(man, line, ppos, tok); + head = man->last; - for (;;) { - la = *pos; - if ( ! man_args(man, line, pos, buf, &p)) - break; + la = *pos; + if (man_args(man, line, pos, buf, &p)) man_word_alloc(man, line, la, p); - } - - assert(man); - assert(tok != MAN_MAX); - for (n = man->last; n; n = n->parent) - if (n->tok == tok) { - assert(n->type == MAN_HEAD); - man_unscope(man, n); - break; - } + if (buf[*pos] != '\0') + mandoc_vmsg(MANDOCERR_ARG_EXCESS, + man->parse, line, *pos, "%s ... %s", + man_macronames[tok], buf + *pos); + man_unscope(man, head); man_body_alloc(man, line, ppos, tok); } |