version 1.308, 2018/08/23 19:33:27 |
version 1.309, 2018/11/22 11:30:23 |
Line 518 main(int argc, char *argv[]) |
|
Line 518 main(int argc, char *argv[]) |
|
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) |
Line 1180 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 1196 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 1210 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()) { |