version 1.243, 2015/07/21 03:26:21 |
version 1.245, 2015/10/06 18:32:19 |
Line 95 static int fs_lookup(const struct manpaths *, |
|
Line 95 static int fs_lookup(const struct manpaths *, |
|
static void fs_search(const struct mansearch *, |
static void fs_search(const struct mansearch *, |
const struct manpaths *, int, char**, |
const struct manpaths *, int, char**, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static void handle_sigpipe(int); |
|
static int koptions(int *, char *); |
static int koptions(int *, char *); |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
int mandocdb(int, char**); |
int mandocdb(int, char**); |
Line 105 static void mmsg(enum mandocerr, enum mandoclevel, |
|
Line 104 static void mmsg(enum mandocerr, enum mandoclevel, |
|
const char *, int, int, const char *); |
const char *, int, int, const char *); |
static void parse(struct curparse *, int, const char *); |
static void parse(struct curparse *, int, const char *); |
static void passthrough(const char *, int, int); |
static void passthrough(const char *, int, int); |
static pid_t spawn_pager(void); |
static pid_t spawn_pager(struct tag_files *); |
static int toptions(struct curparse *, char *); |
static int toptions(struct curparse *, char *); |
static void usage(enum argmode) __attribute__((noreturn)); |
static void usage(enum argmode) __attribute__((noreturn)); |
static int woptions(struct curparse *, char *); |
static int woptions(struct curparse *, char *); |
Line 123 main(int argc, char *argv[]) |
|
Line 122 main(int argc, char *argv[]) |
|
struct manconf conf; |
struct manconf conf; |
struct curparse curp; |
struct curparse curp; |
struct mansearch search; |
struct mansearch search; |
|
struct tag_files *tag_files; |
char *auxpaths; |
char *auxpaths; |
char *defos; |
char *defos; |
unsigned char *uc; |
unsigned char *uc; |
Line 136 main(int argc, char *argv[]) |
|
Line 136 main(int argc, char *argv[]) |
|
int fd; |
int fd; |
int show_usage; |
int show_usage; |
int options; |
int options; |
|
int use_pager; |
int c; |
int c; |
pid_t pager_pid; /* 0: don't use; 1: not yet spawned. */ |
|
|
|
if (argc < 1) |
if (argc < 1) |
progname = "mandoc"; |
progname = "mandoc"; |
Line 148 main(int argc, char *argv[]) |
|
Line 148 main(int argc, char *argv[]) |
|
|
|
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
if (strcmp(progname, BINM_MAKEWHATIS) == 0) |
if (strcmp(progname, BINM_MAKEWHATIS) == 0) |
return(mandocdb(argc, argv)); |
return mandocdb(argc, argv); |
#endif |
#endif |
|
|
/* Search options. */ |
/* Search options. */ |
Line 180 main(int argc, char *argv[]) |
|
Line 180 main(int argc, char *argv[]) |
|
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
defos = NULL; |
defos = NULL; |
|
|
pager_pid = 1; |
use_pager = 1; |
|
tag_files = NULL; |
show_usage = 0; |
show_usage = 0; |
outmode = OUTMODE_DEF; |
outmode = OUTMODE_DEF; |
|
|
Line 194 main(int argc, char *argv[]) |
|
Line 195 main(int argc, char *argv[]) |
|
conf_file = optarg; |
conf_file = optarg; |
break; |
break; |
case 'c': |
case 'c': |
pager_pid = 0; |
use_pager = 0; |
break; |
break; |
case 'f': |
case 'f': |
search.argmode = ARG_WORD; |
search.argmode = ARG_WORD; |
break; |
break; |
case 'h': |
case 'h': |
conf.output.synopsisonly = 1; |
conf.output.synopsisonly = 1; |
pager_pid = 0; |
use_pager = 0; |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
break; |
break; |
case 'I': |
case 'I': |
Line 209 main(int argc, char *argv[]) |
|
Line 210 main(int argc, char *argv[]) |
|
fprintf(stderr, |
fprintf(stderr, |
"%s: -I %s: Bad argument\n", |
"%s: -I %s: Bad argument\n", |
progname, optarg); |
progname, optarg); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
if (defos) { |
if (defos) { |
fprintf(stderr, |
fprintf(stderr, |
"%s: -I %s: Duplicate argument\n", |
"%s: -I %s: Duplicate argument\n", |
progname, optarg); |
progname, optarg); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
defos = mandoc_strdup(optarg + 3); |
defos = mandoc_strdup(optarg + 3); |
break; |
break; |
Line 224 main(int argc, char *argv[]) |
|
Line 225 main(int argc, char *argv[]) |
|
break; |
break; |
case 'K': |
case 'K': |
if ( ! koptions(&options, optarg)) |
if ( ! koptions(&options, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'k': |
case 'k': |
search.argmode = ARG_EXPR; |
search.argmode = ARG_EXPR; |
Line 253 main(int argc, char *argv[]) |
|
Line 254 main(int argc, char *argv[]) |
|
break; |
break; |
case 'T': |
case 'T': |
if ( ! toptions(&curp, optarg)) |
if ( ! toptions(&curp, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'W': |
case 'W': |
if ( ! woptions(&curp, optarg)) |
if ( ! woptions(&curp, optarg)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
break; |
break; |
case 'w': |
case 'w': |
outmode = OUTMODE_FLN; |
outmode = OUTMODE_FLN; |
Line 277 main(int argc, char *argv[]) |
|
Line 278 main(int argc, char *argv[]) |
|
switch (search.argmode) { |
switch (search.argmode) { |
case ARG_FILE: |
case ARG_FILE: |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
pager_pid = 0; |
use_pager = 0; |
break; |
break; |
case ARG_NAME: |
case ARG_NAME: |
outmode = OUTMODE_ONE; |
outmode = OUTMODE_ONE; |
Line 348 main(int argc, char *argv[]) |
|
Line 349 main(int argc, char *argv[]) |
|
if (search.argmode != ARG_NAME) { |
if (search.argmode != ARG_NAME) { |
fputs("mandoc: database support not compiled in\n", |
fputs("mandoc: database support not compiled in\n", |
stderr); |
stderr); |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
sz = 0; |
sz = 0; |
#endif |
#endif |
Line 417 main(int argc, char *argv[]) |
|
Line 418 main(int argc, char *argv[]) |
|
/* mandoc(1) */ |
/* mandoc(1) */ |
|
|
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
return((int)MANDOCLEVEL_BADARG); |
return (int)MANDOCLEVEL_BADARG; |
|
|
if (pager_pid == 1 && isatty(STDOUT_FILENO) == 0) |
if (use_pager && ! isatty(STDOUT_FILENO)) |
pager_pid = 0; |
use_pager = 0; |
|
|
curp.mchars = mchars_alloc(); |
curp.mchars = mchars_alloc(); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, |
Line 433 main(int argc, char *argv[]) |
|
Line 434 main(int argc, char *argv[]) |
|
mparse_keep(curp.mp); |
mparse_keep(curp.mp); |
|
|
if (argc < 1) { |
if (argc < 1) { |
if (pager_pid == 1) |
if (use_pager) |
pager_pid = spawn_pager(); |
tag_files = tag_init(); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
} |
} |
|
|
Line 445 main(int argc, char *argv[]) |
|
Line 446 main(int argc, char *argv[]) |
|
rc = rctmp; |
rc = rctmp; |
|
|
if (fd != -1) { |
if (fd != -1) { |
if (pager_pid == 1) |
if (use_pager) { |
pager_pid = spawn_pager(); |
tag_files = tag_init(); |
|
use_pager = 0; |
|
} |
|
|
if (resp == NULL) |
if (resp == NULL) |
parse(&curp, fd, *argv); |
parse(&curp, fd, *argv); |
|
|
free(defos); |
free(defos); |
|
|
/* |
/* |
* If a pager is attached, flush the pipe leading to it |
* When using a pager, finish writing both temporary files, |
* and signal end of file such that the user can browse |
* fork it, wait for the user to close it, and clean up. |
* to the end. Then wait for the user to close the pager. |
|
*/ |
*/ |
|
|
if (pager_pid != 0 && pager_pid != 1) { |
if (tag_files != NULL) { |
fclose(stdout); |
fclose(stdout); |
tag_write(); |
tag_write(); |
waitpid(pager_pid, NULL, 0); |
waitpid(spawn_pager(tag_files), NULL, 0); |
tag_unlink(); |
tag_unlink(); |
} |
} |
|
|
return((int)rc); |
return (int)rc; |
} |
} |
|
|
static void |
static void |
Line 580 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 582 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
file = mandoc_strdup(*globinfo.gl_pathv); |
file = mandoc_strdup(*globinfo.gl_pathv); |
globfree(&globinfo); |
globfree(&globinfo); |
if (globres != 0) |
if (globres != 0) |
return(0); |
return 0; |
|
|
found: |
found: |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
|
|
page->bits = NAME_FILE & NAME_MASK; |
page->bits = NAME_FILE & NAME_MASK; |
page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10; |
page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10; |
page->form = form; |
page->form = form; |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 821 koptions(int *options, char *arg) |
|
Line 823 koptions(int *options, char *arg) |
|
} else { |
} else { |
fprintf(stderr, "%s: -K %s: Bad argument\n", |
fprintf(stderr, "%s: -K %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 841 moptions(int *options, char *arg) |
|
Line 843 moptions(int *options, char *arg) |
|
else { |
else { |
fprintf(stderr, "%s: -m %s: Bad argument\n", |
fprintf(stderr, "%s: -m %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 875 toptions(struct curparse *curp, char *arg) |
|
Line 877 toptions(struct curparse *curp, char *arg) |
|
else { |
else { |
fprintf(stderr, "%s: -T %s: Bad argument\n", |
fprintf(stderr, "%s: -T %s: Bad argument\n", |
progname, arg); |
progname, arg); |
return(0); |
return 0; |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 918 woptions(struct curparse *curp, char *arg) |
|
Line 920 woptions(struct curparse *curp, char *arg) |
|
default: |
default: |
fprintf(stderr, "%s: -W %s: Bad argument\n", |
fprintf(stderr, "%s: -W %s: Bad argument\n", |
progname, o); |
progname, o); |
return(0); |
return 0; |
} |
} |
} |
} |
|
|
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 947 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 949 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
fputc('\n', stderr); |
fputc('\n', stderr); |
} |
} |
|
|
static void |
|
handle_sigpipe(int signum) |
|
{ |
|
|
|
exit((int)rc); |
|
} |
|
|
|
static pid_t |
static pid_t |
spawn_pager(void) |
spawn_pager(struct tag_files *tag_files) |
{ |
{ |
#define MAX_PAGER_ARGS 16 |
#define MAX_PAGER_ARGS 16 |
char *argv[MAX_PAGER_ARGS]; |
char *argv[MAX_PAGER_ARGS]; |
const char *pager; |
const char *pager; |
char *cp; |
char *cp; |
size_t cmdlen; |
size_t cmdlen; |
int fildes[2]; |
|
int argc; |
int argc; |
pid_t pager_pid; |
pid_t pager_pid; |
|
|
Line 991 spawn_pager(void) |
|
Line 985 spawn_pager(void) |
|
break; |
break; |
} |
} |
|
|
/* Read all text right away and use the tag file. */ |
/* For more(1) and less(1), use the tag file. */ |
|
|
for (;;) { |
if ((cmdlen = strlen(argv[0])) >= 4) { |
if ((cmdlen = strlen(argv[0])) < 4) |
|
break; |
|
cp = argv[0] + cmdlen - 4; |
cp = argv[0] + cmdlen - 4; |
if (strcmp(cp, "less") && strcmp(cp, "more")) |
if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) { |
break; |
argv[argc++] = mandoc_strdup("-T"); |
if ((cp = tag_init()) == NULL) |
argv[argc++] = tag_files->tfn; |
break; |
} |
argv[argc++] = mandoc_strdup("+G1G"); |
|
argv[argc++] = mandoc_strdup("-T"); |
|
argv[argc++] = cp; |
|
break; |
|
} |
} |
|
argv[argc++] = tag_files->ofn; |
argv[argc] = NULL; |
argv[argc] = NULL; |
|
|
if (pipe(fildes) == -1) { |
|
fprintf(stderr, "%s: pipe: %s\n", |
|
progname, strerror(errno)); |
|
return(0); |
|
} |
|
|
|
switch (pager_pid = fork()) { |
switch (pager_pid = fork()) { |
case -1: |
case -1: |
fprintf(stderr, "%s: fork: %s\n", |
fprintf(stderr, "%s: fork: %s\n", |
Line 1022 spawn_pager(void) |
|
Line 1005 spawn_pager(void) |
|
case 0: |
case 0: |
break; |
break; |
default: |
default: |
close(fildes[0]); |
return pager_pid; |
if (dup2(fildes[1], STDOUT_FILENO) == -1) { |
|
fprintf(stderr, "%s: dup output: %s\n", |
|
progname, strerror(errno)); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
close(fildes[1]); |
|
signal(SIGPIPE, handle_sigpipe); |
|
return(pager_pid); |
|
} |
} |
|
|
/* The child process becomes the pager. */ |
/* The child process becomes the pager. */ |
|
|
close(fildes[1]); |
if (dup2(tag_files->ofd, STDOUT_FILENO) == -1) { |
if (dup2(fildes[0], STDIN_FILENO) == -1) { |
fprintf(stderr, "pager: stdout: %s\n", strerror(errno)); |
fprintf(stderr, "%s: dup input: %s\n", |
|
progname, strerror(errno)); |
|
exit((int)MANDOCLEVEL_SYSERR); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
close(fildes[0]); |
close(tag_files->ofd); |
|
close(tag_files->tfd); |
/* Hand over to the pager. */ |
|
|
|
execvp(argv[0], argv); |
execvp(argv[0], argv); |
fprintf(stderr, "%s: exec %s: %s\n", |
fprintf(stderr, "%s: exec %s: %s\n", |
progname, argv[0], strerror(errno)); |
progname, argv[0], strerror(errno)); |