Stop parsing man(7) input when we found all we were searching for,

[mandoc.git] / apropos.c

diff --git a/apropos.c b/apropos.c
index ac56a96109638400613d9c8f1b44dc7bb0c18f2d..96313bc1133b21ef55979cddf9d29077550d4608 100644 (file)
--- a/apropos.c
+++ b/apropos.c
@@ -1,4 +1,4 @@
-/*     $Id: apropos.c,v 1.33 2012/06/09 17:49:13 kristaps Exp $ */
+/*     $Id: apropos.c,v 1.34 2013/07/05 09:33:02 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -37,8 +37,9 @@ main(int argc, char *argv[])
        struct mansearch search;
        size_t           i, sz;
        struct manpage  *res;
-       char            *conf_file, *defpaths, *auxpaths;
        struct manpaths  paths;
+       char            *defpaths, *auxpaths;
+       char            *conf_file;
        char            *progname;
        extern char     *optarg;
        extern int       optind;
@@ -49,10 +50,13 @@ main(int argc, char *argv[])
        else
                ++progname;
 
-       auxpaths = defpaths = conf_file = NULL;
+       whatis = (0 == strncmp(progname, "whatis", 6));
+
        memset(&paths, 0, sizeof(struct manpaths));
        memset(&search, 0, sizeof(struct mansearch));
-       whatis = (0 == strcmp(progname, "whatis"));
+
+       auxpaths = defpaths = NULL;
+       conf_file = NULL;
 
        while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
                switch (ch) {
@@ -99,12 +103,8 @@ main(int argc, char *argv[])
        free(res);
        return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
 usage:
-       fprintf(stderr, "usage: %s [-C conf] "
-                                 "[-M paths] "
-                                 "[-m paths] "
-                                 "[-S arch] "
-                                 "[-s section] "
-                                 "expr ...\n", 
-                                 progname);
+       fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
+                       "[-S arch] [-s section]%s ...\n", progname,
+                       whatis ? " name" : "\n               expression");
        return(EXIT_FAILURE);
 }