diff options
| author |   schwarze <schwarze@openbsd.org> | 2012-11-16 22:20:40 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2012-11-16 22:20:40 +0000 |
| commit | 55818fdc9bef6c76d8f309f4be7ad31326b3a1a7 (patch) | |
| tree | 107539d4b201bd2b40a607dfaec04a11450a8c7d | |
| parent | Rewrite the varags implementation again (third time's the charm), the upstream (diff) | |
| download | wireguard-openbsd-55818fdc9bef6c76d8f309f4be7ad31326b3a1a7.tar.xz wireguard-openbsd-55818fdc9bef6c76d8f309f4be7ad31326b3a1a7.zip | |
Warn about unknown volume or arch in Dt macro arguments;
patch written by Nicolas Joly <njoly at pasteur dot fr>.
| -rw-r--r-- | usr.bin/mandoc/mandoc.h | 3 | ||||
| -rw-r--r-- | usr.bin/mandoc/mdoc_validate.c | 4 | ||||
| -rw-r--r-- | usr.bin/mandoc/read.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h index 4eec27dabc4..14f32bf00cc 100644 --- a/usr.bin/mandoc/mandoc.h +++ b/usr.bin/mandoc/mandoc.h @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.48 2012/07/18 11:09:30 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.49 2012/11/16 22:20:40 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -50,6 +50,7 @@ enum mandocerr { MANDOCERR_NOTITLE, /* no title in document */ MANDOCERR_UPPERCASE, /* document title should be all caps */ MANDOCERR_BADMSEC, /* unknown manual section */ + MANDOCERR_BADVOLARCH, /* unknown manual volume or arch */ MANDOCERR_NODATE, /* date missing, using today's date */ MANDOCERR_BADDATE, /* cannot parse date, using it verbatim */ MANDOCERR_PROLOGOOO, /* prologue macros out of order */ diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index 5523381b672..102c8d8d673 100644 --- a/usr.bin/mandoc/mdoc_validate.c +++ b/usr.bin/mandoc/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.107 2012/07/18 11:09:30 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.108 2012/11/16 22:20:40 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -2201,9 +2201,9 @@ post_dt(POST_ARGS) free(mdoc->meta.vol); mdoc->meta.vol = mandoc_strdup(cp); } else { - /* FIXME: warn about bad arch. */ cp = mdoc_a2arch(nn->string); if (NULL == cp) { + mdoc_nmsg(mdoc, nn, MANDOCERR_BADVOLARCH); free(mdoc->meta.vol); mdoc->meta.vol = mandoc_strdup(nn->string); } else diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 2cc0f6a27ed..2150a5550bd 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.10 2012/07/18 11:09:30 schwarze Exp $ */ +/* $Id: read.c,v 1.11 2012/11/16 22:20:40 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -84,6 +84,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "no title in document", "document title should be all caps", "unknown manual section", + "unknown manual volume or arch", "date missing, using today's date", "cannot parse date, using it verbatim", "prologue macros out of order", |