diff options
-rw-r--r-- | apropos.1 | 12 | ||||
-rw-r--r-- | apropos.c | 22 |
2 files changed, 17 insertions, 17 deletions
@@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.19 2012/06/09 14:11:15 kristaps Exp $ +.\" $Id: apropos.1,v 1.20 2013/07/05 09:33:02 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 9 2012 $ +.Dd $Mdocdate: July 5 2013 $ .Dt APROPOS 1 .Os .Sh NAME @@ -24,8 +24,8 @@ .Sh SYNOPSIS .Nm .Op Fl C Ar file -.Op Fl M Ar manpath -.Op Fl m Ar manpath +.Op Fl M Ar path +.Op Fl m Ar path .Op Fl S Ar arch .Op Fl s Ar section .Ar expression ... @@ -60,13 +60,13 @@ Specify an alternative configuration in .Xr man.conf 5 format. -.It Fl M Ar manpath +.It Fl M Ar path Use the colon-separated path instead of the default list of paths searched for .Xr mandocdb 8 databases. Invalid paths, or paths without manual databases, are ignored. -.It Fl m Ar manpath +.It Fl m Ar path Prepend the colon-separated paths to the list of paths searched for .Xr mandocdb 8 @@ -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); } |