aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-04-20 09:54:48 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-04-20 09:54:48 +0000
commit5547dbf739054a891baccab82acc9dd2a1d77af5 (patch)
tree5a47c7a2465ebd65afbb564aa0aba8ae2f949667
parent327ba4d7676807137f3ba3026d1d55f0b17a9bfd (diff)
downloadmandoc-5547dbf739054a891baccab82acc9dd2a1d77af5.tar.gz
mandoc-5547dbf739054a891baccab82acc9dd2a1d77af5.tar.zst
mandoc-5547dbf739054a891baccab82acc9dd2a1d77af5.zip
Fix previous: Don't let man(1) warn twice about non-existant names.
Again noticed by deraadt@.
-rw-r--r--main.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/main.c b/main.c
index 1187e09e..ebfb1135 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.236 2015/04/19 15:10:46 schwarze Exp $ */
+/* $Id: main.c,v 1.237 2015/04/20 09:54:48 schwarze Exp $ */
/*
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -352,13 +352,17 @@ main(int argc, char *argv[])
sz = 0;
#endif
- if (sz == 0 && search.argmode == ARG_NAME)
- fs_search(&search, &conf.manpath,
- argc, argv, &res, &sz);
+ if (sz == 0) {
+ if (search.argmode == ARG_NAME)
+ fs_search(&search, &conf.manpath,
+ argc, argv, &res, &sz);
+ else
+ fprintf(stderr,
+ "%s: nothing appropriate\n",
+ progname);
+ }
if (sz == 0) {
- fprintf(stderr, "%s: nothing appropriate\n",
- progname);
rc = MANDOCLEVEL_BADARG;
goto out;
}