diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-04-19 02:56:54 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-04-19 02:56:54 +0000 |
commit | 27178e6666d82be945ee668c2530249f5c728eb6 (patch) | |
tree | 87a62d26c12e50f8be6becb92e39cb8b14b4a91a /mandocdb.c | |
parent | a28faa272ac76185bf26ae465660f613bdac74c7 (diff) | |
download | mandoc-27178e6666d82be945ee668c2530249f5c728eb6.tar.gz mandoc-27178e6666d82be945ee668c2530249f5c728eb6.tar.zst mandoc-27178e6666d82be945ee668c2530249f5c728eb6.zip |
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.
Diffstat (limited to 'mandocdb.c')
-rw-r--r-- | mandocdb.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.139 2014/04/19 02:30:19 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.140 2014/04/19 02:56:54 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -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; |