From 60453e88969c57bf78e8dea047a574bca7709edc Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 20 Apr 2015 09:54:34 +0000 Subject: [PATCH] Fix previous: Don't let man(1) warn twice about non-existant names. Again noticed by deraadt@. --- usr.bin/mandoc/main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c index 80d0feeba45..859e844847c 100644 --- a/usr.bin/mandoc/main.c +++ b/usr.bin/mandoc/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.141 2015/04/19 15:10:04 schwarze Exp $ */ +/* $OpenBSD: main.c,v 1.142 2015/04/20 09:54:34 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze @@ -331,13 +331,17 @@ main(int argc, char *argv[]) argc, argv, &res, &sz)) usage(search.argmode); - 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; } -- 2.20.1