version 1.304, 2018/04/13 19:55:30 |
version 1.309, 2018/11/22 11:30:23 |
Line 132 main(int argc, char *argv[]) |
|
Line 132 main(int argc, char *argv[]) |
|
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
int fd; |
int fd, startdir; |
int show_usage; |
int show_usage; |
int options; |
int options; |
int use_pager; |
int use_pager; |
Line 321 main(int argc, char *argv[]) |
|
Line 321 main(int argc, char *argv[]) |
|
|
|
if (use_pager && |
if (use_pager && |
(conf.output.width == 0 || conf.output.indent == 0) && |
(conf.output.width == 0 || conf.output.indent == 0) && |
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) { |
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && |
|
ws.ws_col > 1) { |
if (conf.output.width == 0 && ws.ws_col < 79) |
if (conf.output.width == 0 && ws.ws_col < 79) |
conf.output.width = ws.ws_col - 1; |
conf.output.width = ws.ws_col - 1; |
if (conf.output.indent == 0 && ws.ws_col < 66) |
if (conf.output.indent == 0 && ws.ws_col < 66) |
Line 386 main(int argc, char *argv[]) |
|
Line 387 main(int argc, char *argv[]) |
|
argc, argv, &res, &sz)) |
argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
|
|
if (sz == 0) { |
if (sz == 0 && search.argmode == ARG_NAME) |
if (search.argmode == ARG_NAME) |
fs_search(&search, &conf.manpath, |
fs_search(&search, &conf.manpath, |
argc, argv, &res, &sz); |
argc, argv, &res, &sz); |
|
else |
if (search.argmode == ARG_NAME) { |
warnx("nothing appropriate"); |
for (c = 0; c < argc; c++) { |
|
if (strchr(argv[c], '/') == NULL) |
|
continue; |
|
if (access(argv[c], R_OK) == -1) { |
|
warn("%s", argv[c]); |
|
continue; |
|
} |
|
res = mandoc_reallocarray(res, |
|
sz + 1, sizeof(*res)); |
|
res[sz].file = mandoc_strdup(argv[c]); |
|
res[sz].names = NULL; |
|
res[sz].output = NULL; |
|
res[sz].ipath = SIZE_MAX; |
|
res[sz].bits = 0; |
|
res[sz].sec = 10; |
|
res[sz].form = FORM_SRC; |
|
sz++; |
|
} |
} |
} |
|
|
if (sz == 0) { |
if (sz == 0) { |
|
if (search.argmode != ARG_NAME) |
|
warnx("nothing appropriate"); |
rc = MANDOCLEVEL_BADARG; |
rc = MANDOCLEVEL_BADARG; |
goto out; |
goto out; |
} |
} |
Line 466 main(int argc, char *argv[]) |
|
Line 486 main(int argc, char *argv[]) |
|
curp.mp = mparse_alloc(options, curp.mmin, mmsg, |
curp.mp = mparse_alloc(options, curp.mmin, mmsg, |
curp.os_e, curp.os_s); |
curp.os_e, curp.os_s); |
|
|
/* |
|
* Conditionally start up the lookaside buffer before parsing. |
|
*/ |
|
if (OUTT_MAN == curp.outtype) |
|
mparse_keep(curp.mp); |
|
|
|
if (argc < 1) { |
if (argc < 1) { |
if (use_pager) |
if (use_pager) |
tag_files = tag_init(); |
tag_files = tag_init(); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
} |
} |
|
|
|
/* |
|
* Remember the original working directory, if possible. |
|
* This will be needed if some names on the command line |
|
* are page names and some are relative file names. |
|
* Do not error out if the current directory is not |
|
* readable: Maybe it won't be needed after all. |
|
*/ |
|
startdir = open(".", O_RDONLY | O_DIRECTORY); |
|
|
while (argc > 0) { |
while (argc > 0) { |
|
|
|
/* |
|
* Changing directories is not needed in ARG_FILE mode. |
|
* Do it on a best-effort basis. Even in case of |
|
* failure, some functionality may still work. |
|
*/ |
|
if (resp != NULL) { |
|
if (resp->ipath != SIZE_MAX) |
|
(void)chdir(conf.manpath.paths[resp->ipath]); |
|
else if (startdir != -1) |
|
(void)fchdir(startdir); |
|
} |
|
|
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
if (fd != -1) { |
if (fd != -1) { |
if (use_pager) { |
if (use_pager) { |
tag_files = tag_init(); |
|
use_pager = 0; |
use_pager = 0; |
|
tag_files = tag_init(); |
|
if (conf.output.tag != NULL && |
|
tag_files->tagname == NULL) |
|
tag_files->tagname = |
|
*conf.output.tag != '\0' ? |
|
conf.output.tag : *argv; |
} |
} |
|
|
if (resp == NULL) |
if (resp == NULL) |
parse(&curp, fd, *argv); |
parse(&curp, fd, *argv); |
else if (resp->form == FORM_SRC) { |
else if (resp->form == FORM_SRC) |
/* For .so only; ignore failure. */ |
|
(void)chdir(conf.manpath.paths[resp->ipath]); |
|
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
} else |
else |
passthrough(resp->file, fd, |
passthrough(resp->file, fd, |
conf.output.synopsisonly); |
conf.output.synopsisonly); |
|
|
Line 525 main(int argc, char *argv[]) |
|
Line 564 main(int argc, char *argv[]) |
|
if (--argc) |
if (--argc) |
mparse_reset(curp.mp); |
mparse_reset(curp.mp); |
} |
} |
|
if (startdir != -1) { |
|
(void)fchdir(startdir); |
|
close(startdir); |
|
} |
|
|
if (curp.outdata != NULL) { |
if (curp.outdata != NULL) { |
switch (curp.outtype) { |
switch (curp.outtype) { |
Line 745 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 788 fs_search(const struct mansearch *cfg, const struct ma |
|
cfg->firstmatch) |
cfg->firstmatch) |
return 1; |
return 1; |
} |
} |
if (res != NULL && *ressz == lastsz) |
if (res != NULL && *ressz == lastsz && |
warnx("No entry for %s in the manual.", *argv); |
strchr(*argv, '/') == NULL) { |
|
if (cfg->sec == NULL) |
|
warnx("No entry for %s in the manual.", |
|
*argv); |
|
else |
|
warnx("No entry for %s in section %s " |
|
"of the manual.", *argv, cfg->sec); |
|
} |
lastsz = *ressz; |
lastsz = *ressz; |
argv++; |
argv++; |
argc--; |
argc--; |
Line 827 parse(struct curparse *curp, int fd, const char *file) |
|
Line 877 parse(struct curparse *curp, int fd, const char *file) |
|
tree_man(curp->outdata, man); |
tree_man(curp->outdata, man); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
man_man(curp->outdata, man); |
mparse_copy(curp->mp); |
break; |
break; |
case OUTT_PDF: |
case OUTT_PDF: |
case OUTT_ASCII: |
case OUTT_ASCII: |
Line 1135 spawn_pager(struct tag_files *tag_files) |
|
Line 1185 spawn_pager(struct tag_files *tag_files) |
|
const char *pager; |
const char *pager; |
char *cp; |
char *cp; |
size_t cmdlen; |
size_t cmdlen; |
int argc; |
int argc, use_ofn; |
pid_t pager_pid; |
pid_t pager_pid; |
|
|
pager = getenv("MANPAGER"); |
pager = getenv("MANPAGER"); |
Line 1151 spawn_pager(struct tag_files *tag_files) |
|
Line 1201 spawn_pager(struct tag_files *tag_files) |
|
*/ |
*/ |
|
|
argc = 0; |
argc = 0; |
while (argc + 4 < MAX_PAGER_ARGS) { |
while (argc + 5 < MAX_PAGER_ARGS) { |
argv[argc++] = cp; |
argv[argc++] = cp; |
cp = strchr(cp, ' '); |
cp = strchr(cp, ' '); |
if (cp == NULL) |
if (cp == NULL) |
Line 1165 spawn_pager(struct tag_files *tag_files) |
|
Line 1215 spawn_pager(struct tag_files *tag_files) |
|
|
|
/* For less(1), use the tag file. */ |
/* For less(1), use the tag file. */ |
|
|
|
use_ofn = 1; |
if ((cmdlen = strlen(argv[0])) >= 4) { |
if ((cmdlen = strlen(argv[0])) >= 4) { |
cp = argv[0] + cmdlen - 4; |
cp = argv[0] + cmdlen - 4; |
if (strcmp(cp, "less") == 0) { |
if (strcmp(cp, "less") == 0) { |
argv[argc++] = mandoc_strdup("-T"); |
argv[argc++] = mandoc_strdup("-T"); |
argv[argc++] = tag_files->tfn; |
argv[argc++] = tag_files->tfn; |
|
if (tag_files->tagname != NULL) { |
|
argv[argc++] = mandoc_strdup("-t"); |
|
argv[argc++] = tag_files->tagname; |
|
use_ofn = 0; |
|
} |
} |
} |
} |
} |
argv[argc++] = tag_files->ofn; |
if (use_ofn) |
|
argv[argc++] = tag_files->ofn; |
argv[argc] = NULL; |
argv[argc] = NULL; |
|
|
switch (pager_pid = fork()) { |
switch (pager_pid = fork()) { |