aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/man_macro.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-02-06 09:38:43 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-02-06 09:38:43 +0000
commit21757403990ffaeb488a62351a28bc9c74eef267 (patch)
tree110a5ad758af98378512ae4edce6445f045925cd /man_macro.c
parentd8b17016dd40c058e6cbfc2f195d4a2ac296d65e (diff)
downloadmandoc-21757403990ffaeb488a62351a28bc9c74eef267.tar.gz
mandoc-21757403990ffaeb488a62351a28bc9c74eef267.tar.zst
mandoc-21757403990ffaeb488a62351a28bc9c74eef267.zip
better diagnostics about excess arguments to .PD .ft .sp
Diffstat (limited to 'man_macro.c')
-rw-r--r--man_macro.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/man_macro.c b/man_macro.c
index 06a1d05d..96f3f581 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.96 2015/02/06 08:28:35 schwarze Exp $ */
+/* $Id: man_macro.c,v 1.97 2015/02/06 09:38:43 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -427,6 +427,13 @@ in_line_eoln(MACRO_PROT_ARGS)
man_macronames[tok], buf + *pos);
break;
}
+ if (buf[*pos] != '\0' && man->last != n &&
+ (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) {
+ mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+ man->parse, line, *pos, "%s ... %s",
+ man_macronames[tok], buf + *pos);
+ break;
+ }
la = *pos;
if ( ! man_args(man, line, pos, buf, &p))
break;