* mdocml: Two minor tweaks regarding the fallback from -u/-d to default
@ 2014-04-19 2:56 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2014-04-19 2:56 UTC (permalink / raw)
To: source
Log Message:
-----------
Two minor tweaks regarding the fallback from -u/-d to default mode:
(1) Use all files found on the command line, but do *not* use all stray
files found during fallback tree recursion.
(2) If the fallback works, call that success, i.e. exit(0).
As pointed out by naddy@, the latter is required for ports' happiness.
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.139 -r1.140
--- mandocdb.c
+++ mandocdb.c
@@ -430,19 +430,20 @@ main(int argc, char *argv[])
ohash_init(&mlinks, 6, &mlinks_info);
if (OP_UPDATE == op || OP_DELETE == op || OP_TEST == op) {
- /*
- * Force processing all files.
- */
- use_all = 1;
/*
* All of these deal with a specific directory.
- * Jump into that directory then collect files specified
- * on the command-line.
+ * Jump into that directory first.
*/
if (0 == set_basedir(path_arg))
goto out;
+
if (dbopen(1)) {
+ /*
+ * The existing database is usable. Process
+ * all files specified on the command-line.
+ */
+ use_all = 1;
for (i = 0; i < argc; i++)
filescan(argv[i]);
if (OP_TEST != op)
@@ -452,6 +453,7 @@ main(int argc, char *argv[])
* Database missing or corrupt.
* Recreate from scratch.
*/
+ exitcode = (int)MANDOCLEVEL_OK;
op = OP_DEFAULT;
if (0 == treescan())
goto out;
--
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-19 2:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-19 2:56 mdocml: Two minor tweaks regarding the fallback from -u/-d to default 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).