version 1.20, 2011/11/27 18:54:01 |
version 1.26, 2012/03/23 02:52:33 |
Line 44 main(int argc, char *argv[]) |
|
Line 44 main(int argc, char *argv[]) |
|
struct opts opts; |
struct opts opts; |
struct expr *e; |
struct expr *e; |
char *defpaths, *auxpaths; |
char *defpaths, *auxpaths; |
|
char *conf_file; |
extern int optind; |
extern int optind; |
extern char *optarg; |
extern char *optarg; |
|
|
Line 53 main(int argc, char *argv[]) |
|
Line 54 main(int argc, char *argv[]) |
|
else |
else |
++progname; |
++progname; |
|
|
whatis = 0 == strcmp(progname, "whatis"); |
whatis = 0 == strncmp(progname, "whatis", 6); |
|
|
memset(&paths, 0, sizeof(struct manpaths)); |
memset(&paths, 0, sizeof(struct manpaths)); |
memset(&opts, 0, sizeof(struct opts)); |
memset(&opts, 0, sizeof(struct opts)); |
|
|
auxpaths = defpaths = NULL; |
auxpaths = defpaths = NULL; |
|
conf_file = NULL; |
e = 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) { |
switch (ch) { |
|
case ('C'): |
|
conf_file = optarg; |
|
break; |
case ('M'): |
case ('M'): |
defpaths = optarg; |
defpaths = optarg; |
break; |
break; |
Line 88 main(int argc, char *argv[]) |
|
Line 93 main(int argc, char *argv[]) |
|
|
|
rc = 0; |
rc = 0; |
|
|
manpath_parse(&paths, defpaths, auxpaths); |
manpath_parse(&paths, conf_file, defpaths, auxpaths); |
|
|
e = whatis ? termcomp(argc, argv, &terms) : |
e = whatis ? termcomp(argc, argv, &terms) : |
exprcomp(argc, argv, &terms); |
exprcomp(argc, argv, &terms); |
|
|
static void |
static void |
list(struct res *res, size_t sz, void *arg) |
list(struct res *res, size_t sz, void *arg) |
{ |
{ |
int i; |
size_t i; |
|
|
qsort(res, sz, sizeof(struct res), cmp); |
qsort(res, sz, sizeof(struct res), cmp); |
|
|
for (i = 0; i < (int)sz; i++) |
for (i = 0; i < sz; i++) |
printf("%s(%s%s%s) - %s\n", res[i].title, |
printf("%s(%s%s%s) - %.70s\n", |
|
res[i].title, |
res[i].cat, |
res[i].cat, |
*res[i].arch ? "/" : "", |
*res[i].arch ? "/" : "", |
*res[i].arch ? res[i].arch : "", |
*res[i].arch ? res[i].arch : "", |
|
|
cmp(const void *p1, const void *p2) |
cmp(const void *p1, const void *p2) |
{ |
{ |
|
|
return(strcmp(((const struct res *)p1)->title, |
return(strcasecmp(((const struct res *)p1)->title, |
((const struct res *)p2)->title)); |
((const struct res *)p2)->title)); |
} |
} |
|
|
|
|
{ |
{ |
|
|
fprintf(stderr, "usage: %s " |
fprintf(stderr, "usage: %s " |
"[-M path] " |
"[-C file] " |
"[-m path] " |
"[-M manpath] " |
|
"[-m manpath] " |
"[-S arch] " |
"[-S arch] " |
"[-s section] " |
"[-s section] " |
"expression...\n", |
"expression ...\n", |
progname); |
progname); |
} |
} |