aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2012-11-16 22:21:05 +0000
committerIngo Schwarze <schwarze@openbsd.org>2012-11-16 22:21:05 +0000
commitc2b8e63bd5246f12bff11c19407d23e1b0ed5a11 (patch)
tree6719b0e743b3e95266f43efa7d2954600fea15d2
parentcb358bfc7ecc3e92c62ee7b9a9f736e403a7aba0 (diff)
downloadmandoc-c2b8e63bd5246f12bff11c19407d23e1b0ed5a11.tar.gz
mandoc-c2b8e63bd5246f12bff11c19407d23e1b0ed5a11.tar.zst
mandoc-c2b8e63bd5246f12bff11c19407d23e1b0ed5a11.zip
Warn about unknown volume or arch in Dt macro arguments;
patch written by Nicolas Joly <njoly at pasteur dot fr>.
-rw-r--r--mandoc.h3
-rw-r--r--mdoc_validate.c4
-rw-r--r--read.c3
3 files changed, 6 insertions, 4 deletions
diff --git a/mandoc.h b/mandoc.h
index caa985c2..1f072963 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/* $Id: mandoc.h,v 1.104 2012/07/18 11:11:12 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.105 2012/11/16 22:21:05 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/mdoc_validate.c b/mdoc_validate.c
index b690efbc..c356d7cb 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_validate.c,v 1.189 2012/07/18 11:11:12 schwarze Exp $ */
+/* $Id: mdoc_validate.c,v 1.190 2012/11/16 22:21:05 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -2205,9 +2205,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/read.c b/read.c
index e837d2bd..967d8b80 100644
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/* $Id: read.c,v 1.31 2012/07/18 11:11:12 schwarze Exp $ */
+/* $Id: read.c,v 1.32 2012/11/16 22:21:05 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -95,6 +95,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",