From 2fcbd1967fefe0ad3a462b25726a0cbd7483bfd7 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Thu, 3 Apr 2014 16:27:28 +0000
Subject: Rename the -W option to -p (mnemonics: picky, print to stderr): That
 letter was already chosen by espie@ for OpenBSD 2.7, so avoid being
 gratuitiously different more than a decade later. Accept -v for backward
 compatibility with espie@'s makewhatis, even though it does nothing right
 now.

---
 mandocdb.8 | 24 ++++++++++++++----------
 mandocdb.c | 17 ++++++++++-------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/mandocdb.8 b/mandocdb.8
index e25a8869..2869fc1e 100644
--- a/mandocdb.8
+++ b/mandocdb.8
@@ -23,20 +23,20 @@
 .Nd index UNIX manuals
 .Sh SYNOPSIS
 .Nm
-.Op Fl aDnQW
+.Op Fl aDnpQ
 .Op Fl T Cm utf8
 .Op Fl C Ar file
 .Nm
-.Op Fl aDnQW
+.Op Fl aDnpQ
 .Op Fl T Cm utf8
 .Ar dir ...
 .Nm
-.Op Fl DnQW
+.Op Fl DnpQ
 .Op Fl T Cm utf8
 .Fl d Ar dir
 .Op Ar
 .Nm
-.Op Fl DnW
+.Op Fl Dnp
 .Op Fl T Cm utf8
 .Fl u Ar dir
 .Op Ar
@@ -107,6 +107,9 @@ to the database in
 .It Fl n
 Do not create or modify any database;
 scan and parse only.
+.It Fl p
+Print warnings about potential problems with manual pages
+to the standard error output.
 .It Fl Q
 Quickly build reduced-size databases
 by reading only the NAME sections of manuals.
@@ -121,7 +124,7 @@ Implies
 .Fl a ,
 .Fl n ,
 and
-.Fl W .
+.Fl p .
 All diagnostic messages are printed to the standard output;
 the standard error output is not used.
 .It Fl u Ar dir
@@ -129,9 +132,6 @@ Remove
 .Ar
 from the database in
 .Ar dir .
-.It Fl W
-Print warnings about potential problems with manual pages
-to the standard error output.
 .El
 .Pp
 If fatal parse errors are encountered while parsing, the offending file
@@ -189,11 +189,15 @@ The
 argument first appeared in
 .Nx 1.0 ;
 the options
-.Fl dtu
+.Fl dpt
 in
 .Ox 2.7 ;
+the option
+.Fl u
+in
+.Ox 3.4 ;
 and the options
-.Fl aCDnQTW
+.Fl aCDnQT
 in
 .Ox 5.6 .
 .Sh AUTHORS
diff --git a/mandocdb.c b/mandocdb.c
index cfc71398..46b6c3b0 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -357,7 +357,7 @@ main(int argc, char *argv[])
 	path_arg = NULL;
 	op = OP_DEFAULT;
 
-	while (-1 != (ch = getopt(argc, argv, "aC:Dd:nQT:tu:W")))
+	while (-1 != (ch = getopt(argc, argv, "aC:Dd:npQT:tu:v")))
 		switch (ch) {
 		case ('a'):
 			use_all = 1;
@@ -378,6 +378,9 @@ main(int argc, char *argv[])
 		case ('n'):
 			nodb = 1;
 			break;
+		case ('p'):
+			warnings = 1;
+			break;
 		case ('Q'):
 			mparse_options |= MPARSE_QUICK;
 			break;
@@ -400,8 +403,8 @@ main(int argc, char *argv[])
 			path_arg = optarg;
 			op = OP_DELETE;
 			break;
-		case ('W'):
-			warnings = 1;
+		case ('v'):
+			/* Compatibility with espie@'s makewhatis. */
 			break;
 		default:
 			goto usage;
@@ -506,10 +509,10 @@ out:
 	ohash_delete(&mlinks);
 	return(exitcode);
 usage:
-	fprintf(stderr, "usage: %s [-aDnQW] [-C file] [-Tutf8]\n"
-			"       %s [-aDnQW] [-Tutf8] dir ...\n"
-			"       %s [-DnQW] [-Tutf8] -d dir [file ...]\n"
-			"       %s [-DnW] -u dir [file ...]\n"
+	fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n"
+			"       %s [-aDnpQ] [-Tutf8] dir ...\n"
+			"       %s [-DnpQ] [-Tutf8] -d dir [file ...]\n"
+			"       %s [-Dnp] -u dir [file ...]\n"
 			"       %s [-Q] -t file ...\n",
 		       progname, progname, progname, 
 		       progname, progname);
-- 
cgit