From 5547dbf739054a891baccab82acc9dd2a1d77af5 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 20 Apr 2015 09:54:48 +0000 Subject: Fix previous: Don't let man(1) warn twice about non-existant names. Again noticed by deraadt@. --- main.c | 16 ++++++++++------ 1 file 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 * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze @@ -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; } -- cgit v1.2.3-56-ge451