* mdocml: The -v option of mandocdb(8) clashes with the -v option of
@ 2014-04-03 15:37 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-04-03 15:37 UTC (permalink / raw)
To: source
Log Message:
-----------
The -v option of mandocdb(8) clashes with the -v option of espie@'s
makewhatis(8), which traditionally does something different,
so rename it to -D (mnemonics: Debug, Dump, Display).
Modified Files:
--------------
mdocml:
mandocdb.8
mandocdb.c
Revision Data
-------------
Index: mandocdb.8
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.8,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lmandocdb.8 -Lmandocdb.8 -u -p -r1.22 -r1.23
--- mandocdb.8
+++ mandocdb.8
@@ -23,20 +23,20 @@
.Nd index UNIX manuals
.Sh SYNOPSIS
.Nm
-.Op Fl anQvW
+.Op Fl aDnQW
.Op Fl T Cm utf8
.Op Fl C Ar file
.Nm
-.Op Fl anQvW
+.Op Fl aDnQW
.Op Fl T Cm utf8
.Ar dir ...
.Nm
-.Op Fl nQvW
+.Op Fl DnQW
.Op Fl T Cm utf8
.Fl d Ar dir
.Op Ar
.Nm
-.Op Fl nvW
+.Op Fl DnW
.Op Fl T Cm utf8
.Fl u Ar dir
.Op Ar
@@ -129,8 +129,6 @@ Remove
.Ar
from the database in
.Ar dir .
-.It Fl v
-Display all files added or removed to the index.
.It Fl W
Print warnings about potential problems with manual pages
to the standard error output.
@@ -195,7 +193,7 @@ the options
in
.Ox 2.7 ;
and the options
-.Fl aCnQTvW
+.Fl aCDnQTW
in
.Ox 5.6 .
.Sh AUTHORS
Index: mandocdb.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.124 -r1.125
--- mandocdb.c
+++ mandocdb.c
@@ -179,7 +179,7 @@ static char *progname;
static int nodb; /* no database changes */
static int mparse_options; /* abort the parse early */
static int use_all; /* use all found files */
-static int verb; /* print what we're doing */
+static int debug; /* print what we're doing */
static int warnings; /* warn about crap */
static int write_utf8; /* write UTF-8 output; else ASCII */
static int exitcode; /* to be returned by main */
@@ -357,7 +357,7 @@ main(int argc, char *argv[])
path_arg = NULL;
op = OP_DEFAULT;
- while (-1 != (ch = getopt(argc, argv, "aC:d:nQT:tu:vW")))
+ while (-1 != (ch = getopt(argc, argv, "aC:Dd:nQT:tu:W")))
switch (ch) {
case ('a'):
use_all = 1;
@@ -367,6 +367,9 @@ main(int argc, char *argv[])
path_arg = optarg;
op = OP_CONFFILE;
break;
+ case ('D'):
+ debug++;
+ break;
case ('d'):
CHECKOP(op, ch);
path_arg = optarg;
@@ -397,9 +400,6 @@ main(int argc, char *argv[])
path_arg = optarg;
op = OP_DELETE;
break;
- case ('v'):
- verb++;
- break;
case ('W'):
warnings = 1;
break;
@@ -506,10 +506,10 @@ out:
ohash_delete(&mlinks);
return(exitcode);
usage:
- fprintf(stderr, "usage: %s [-anQvW] [-C file] [-Tutf8]\n"
- " %s [-anQvW] [-Tutf8] dir ...\n"
- " %s [-nQvW] [-Tutf8] -d dir [file ...]\n"
- " %s [-nvW] -u dir [file ...]\n"
+ 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"
" %s [-Q] -t file ...\n",
progname, progname, progname,
progname, progname);
@@ -1623,7 +1623,7 @@ putkeys(const struct mpage *mpage,
if (0 == sz)
return;
- if (verb > 1) {
+ if (debug > 1) {
for (i = 0, mask = 1;
i < mansearch_keymax;
i++, mask <<= 1)
@@ -1850,7 +1850,7 @@ dbadd(struct mpage *mpage, struct mchars
size_t i;
unsigned int slot;
- if (verb)
+ if (debug)
say(mpage->mlinks->file, "Adding to database");
if (nodb)
@@ -1896,7 +1896,7 @@ dbprune(void)
for (mpage = ohash_first(&mpages, &slot); NULL != mpage;
mpage = ohash_next(&mpages, &slot)) {
mlink = mpage->mlinks;
- if (verb)
+ if (debug)
say(mlink->file, "Deleting from database");
if (nodb)
continue;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-03 15:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-03 15:37 mdocml: The -v option of mandocdb(8) clashes with the -v option of schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).