version 1.229, 2015/03/27 17:37:25 |
version 1.230, 2015/03/27 21:33:20 |
Line 83 struct curparse { |
|
Line 83 struct curparse { |
|
out_man outman; /* man output ptr */ |
out_man outman; /* man output ptr */ |
out_free outfree; /* free output ptr */ |
out_free outfree; /* free output ptr */ |
void *outdata; /* data for output */ |
void *outdata; /* data for output */ |
char outopts[BUFSIZ]; /* buf of output opts */ |
struct manoutput *outopts; /* output options */ |
}; |
}; |
|
|
static int fs_lookup(const struct manpaths *, |
static int fs_lookup(const struct manpaths *, |
Line 127 main(int argc, char *argv[]) |
|
Line 127 main(int argc, char *argv[]) |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
char *conf_file, *defpaths; |
char *conf_file, *defpaths; |
size_t isec, i, sz; |
size_t isec, i, sz; |
int prio, best_prio, synopsis_only; |
int prio, best_prio; |
char sec; |
char sec; |
enum mandoclevel rctmp; |
enum mandoclevel rctmp; |
enum outmode outmode; |
enum outmode outmode; |
Line 174 main(int argc, char *argv[]) |
|
Line 174 main(int argc, char *argv[]) |
|
memset(&curp, 0, sizeof(struct curparse)); |
memset(&curp, 0, sizeof(struct curparse)); |
curp.outtype = OUTT_LOCALE; |
curp.outtype = OUTT_LOCALE; |
curp.wlevel = MANDOCLEVEL_BADARG; |
curp.wlevel = MANDOCLEVEL_BADARG; |
|
curp.outopts = &conf.output; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
defos = NULL; |
defos = NULL; |
|
|
pager_pid = 1; |
pager_pid = 1; |
show_usage = 0; |
show_usage = 0; |
synopsis_only = 0; |
|
outmode = OUTMODE_DEF; |
outmode = OUTMODE_DEF; |
|
|
while (-1 != (c = getopt(argc, argv, |
while (-1 != (c = getopt(argc, argv, |
Line 198 main(int argc, char *argv[]) |
|
Line 198 main(int argc, char *argv[]) |
|
search.argmode = ARG_WORD; |
search.argmode = ARG_WORD; |
break; |
break; |
case 'h': |
case 'h': |
(void)strlcat(curp.outopts, "synopsis,", BUFSIZ); |
conf.output.synopsisonly = 1; |
synopsis_only = 1; |
|
pager_pid = 0; |
pager_pid = 0; |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
break; |
break; |
Line 240 main(int argc, char *argv[]) |
|
Line 239 main(int argc, char *argv[]) |
|
break; |
break; |
case 'O': |
case 'O': |
search.outkey = optarg; |
search.outkey = optarg; |
(void)strlcat(curp.outopts, optarg, BUFSIZ); |
while (optarg != NULL) |
(void)strlcat(curp.outopts, ",", BUFSIZ); |
manconf_output(&conf.output, |
|
strsep(&optarg, ",")); |
break; |
break; |
case 'S': |
case 'S': |
search.arch = optarg; |
search.arch = optarg; |
Line 444 main(int argc, char *argv[]) |
|
Line 444 main(int argc, char *argv[]) |
|
chdir(conf.manpath.paths[resp->ipath]); |
chdir(conf.manpath.paths[resp->ipath]); |
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
} else |
} else |
passthrough(resp->file, fd, synopsis_only); |
passthrough(resp->file, fd, |
|
conf.output.synopsisonly); |
|
|
rctmp = mparse_wait(curp.mp); |
rctmp = mparse_wait(curp.mp); |
if (rc < rctmp) |
if (rc < rctmp) |