From 77219a39a7d273f7e31e626a51832a2a5dde0960 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Thu, 3 Apr 2014 15:37:19 +0000 Subject: 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). --- mandocdb.8 | 14 ++++++-------- mandocdb.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/mandocdb.8 b/mandocdb.8 index 75ddd989..173f2c2a 100644 --- a/mandocdb.8 +++ b/mandocdb.8 @@ -1,4 +1,4 @@ -.\" $Id: mandocdb.8,v 1.22 2014/04/03 15:24:32 schwarze Exp $ +.\" $Id: mandocdb.8,v 1.23 2014/04/03 15:37:19 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2011, 2012 Ingo Schwarze @@ -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 diff --git a/mandocdb.c b/mandocdb.c index d8008e84..32f5095d 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.124 2014/03/26 21:39:38 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.125 2014/04/03 15:37:19 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze @@ -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 *mc) 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; -- cgit v1.2.3-56-ge451