diff options
Diffstat (limited to 'apropos.c')
| -rw-r--r-- | apropos.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: apropos.c,v 1.23 2011/12/07 16:08:55 kristaps Exp $ */ +/* $Id: apropos.c,v 1.24 2011/12/12 02:00:49 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -44,6 +44,7 @@ main(int argc, char *argv[]) struct opts opts; struct expr *e; char *defpaths, *auxpaths; + char *conf_file; extern int optind; extern char *optarg; @@ -59,10 +60,14 @@ main(int argc, char *argv[]) memset(&opts, 0, sizeof(struct opts)); auxpaths = defpaths = NULL; + conf_file = NULL; e = NULL; - while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) + while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:"))) switch (ch) { + case ('C'): + conf_file = optarg; + break; case ('M'): defpaths = optarg; break; @@ -88,7 +93,7 @@ main(int argc, char *argv[]) rc = 0; - manpath_parse(&paths, defpaths, auxpaths); + manpath_parse(&paths, conf_file, defpaths, auxpaths); e = whatis ? termcomp(argc, argv, &terms) : exprcomp(argc, argv, &terms); @@ -142,10 +147,11 @@ usage(void) { fprintf(stderr, "usage: %s " + "[-C file] " "[-M manpath] " "[-m manpath] " "[-S arch] " "[-s section] " - "expression...\n", + "expression ...\n", progname); } |