version 1.187, 2014/08/23 22:26:06 |
version 1.192, 2014/09/03 23:21:47 |
Line 87 static void mmsg(enum mandocerr, enum mandoclevel, |
|
Line 87 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, |
static void parse(struct curparse *, int, |
const char *, enum mandoclevel *); |
const char *, enum mandoclevel *); |
static enum mandoclevel passthrough(const char *); |
static enum mandoclevel passthrough(const char *, int); |
static void spawn_pager(void); |
static void spawn_pager(void); |
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)); |
Line 114 main(int argc, char *argv[]) |
|
Line 114 main(int argc, char *argv[]) |
|
#endif |
#endif |
enum mandoclevel rc; |
enum mandoclevel rc; |
enum outmode outmode; |
enum outmode outmode; |
|
pid_t child_pid; |
|
int fd; |
int show_usage; |
int show_usage; |
int use_pager; |
int use_pager; |
int options; |
int options; |
Line 154 main(int argc, char *argv[]) |
|
Line 156 main(int argc, char *argv[]) |
|
show_usage = 0; |
show_usage = 0; |
outmode = OUTMODE_DEF; |
outmode = OUTMODE_DEF; |
|
|
while (-1 != (c = getopt(argc, argv, "aC:cfI:ikM:m:O:S:s:T:VW:w"))) { |
while (-1 != (c = getopt(argc, argv, "aC:cfhI:iklM:m:O:S:s:T:VW:w"))) { |
switch (c) { |
switch (c) { |
case 'a': |
case 'a': |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
Line 168 main(int argc, char *argv[]) |
|
Line 170 main(int argc, char *argv[]) |
|
case 'f': |
case 'f': |
search.argmode = ARG_WORD; |
search.argmode = ARG_WORD; |
break; |
break; |
|
case 'h': |
|
(void)strlcat(curp.outopts, "synopsis,", BUFSIZ); |
|
outmode = OUTMODE_ALL; |
|
break; |
case 'I': |
case 'I': |
if (strncmp(optarg, "os=", 3)) { |
if (strncmp(optarg, "os=", 3)) { |
fprintf(stderr, |
fprintf(stderr, |
Line 189 main(int argc, char *argv[]) |
|
Line 195 main(int argc, char *argv[]) |
|
case 'k': |
case 'k': |
search.argmode = ARG_EXPR; |
search.argmode = ARG_EXPR; |
break; |
break; |
|
case 'l': |
|
search.argmode = ARG_FILE; |
|
outmode = OUTMODE_ALL; |
|
break; |
case 'M': |
case 'M': |
defpaths = optarg; |
defpaths = optarg; |
break; |
break; |
Line 280 main(int argc, char *argv[]) |
|
Line 290 main(int argc, char *argv[]) |
|
mansearch_setup(1); |
mansearch_setup(1); |
if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) |
if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
manpath_free(&paths); |
|
resp = res; |
resp = res; |
|
|
if (sz == 0) { |
if (sz == 0) { |
Line 363 main(int argc, char *argv[]) |
|
Line 372 main(int argc, char *argv[]) |
|
while (argc) { |
while (argc) { |
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
if (resp != NULL) { |
if (resp != NULL) { |
if (resp->form) |
rc = mparse_open(curp.mp, &fd, resp->file, |
parse(&curp, -1, resp->file, &rc); |
&child_pid); |
else |
if (fd == -1) |
rc = passthrough(resp->file); |
/* nothing */; |
|
else if (resp->form & FORM_SRC) { |
|
/* For .so only; ignore failure. */ |
|
chdir(paths.paths[resp->ipath]); |
|
parse(&curp, fd, resp->file, &rc); |
|
} else |
|
rc = passthrough(resp->file, fd); |
resp++; |
resp++; |
} else |
} else |
#endif |
#endif |
parse(&curp, -1, *argv++, &rc); |
{ |
|
rc = mparse_open(curp.mp, &fd, *argv++, |
|
&child_pid); |
|
if (fd != -1) |
|
parse(&curp, fd, argv[-1], &rc); |
|
} |
|
|
|
if (child_pid && |
|
mparse_wait(curp.mp, child_pid) != MANDOCLEVEL_OK) |
|
rc = MANDOCLEVEL_SYSERR; |
|
|
if (MANDOCLEVEL_OK != rc && curp.wstop) |
if (MANDOCLEVEL_OK != rc && curp.wstop) |
break; |
break; |
argc--; |
argc--; |
Line 384 main(int argc, char *argv[]) |
|
Line 409 main(int argc, char *argv[]) |
|
#if HAVE_SQLITE3 |
#if HAVE_SQLITE3 |
out: |
out: |
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
|
manpath_free(&paths); |
mansearch_free(res, sz); |
mansearch_free(res, sz); |
mansearch_setup(0); |
mansearch_setup(0); |
} |
} |
Line 408 usage(enum argmode argmode) |
|
Line 434 usage(enum argmode argmode) |
|
|
|
switch (argmode) { |
switch (argmode) { |
case ARG_FILE: |
case ARG_FILE: |
fputs("usage: mandoc [-V] [-Ios=name] [-mformat]" |
fputs("usage: mandoc [-acfhklV] [-Ios=name] " |
" [-Ooption] [-Toutput] [-Wlevel]\n" |
"[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n" |
"\t [file ...]\n", stderr); |
"\t [file ...]\n", stderr); |
break; |
break; |
case ARG_NAME: |
case ARG_NAME: |
fputs("usage: man [-acfhkVw] [-C file] " |
fputs("usage: man [-acfhklVw] [-C file] " |
"[-M path] [-m path] [-S arch] [-s section]\n" |
"[-M path] [-m path] [-S arch] [-s section]\n" |
"\t [section] name ...\n", stderr); |
"\t [section] name ...\n", stderr); |
break; |
break; |
case ARG_WORD: |
case ARG_WORD: |
fputs("usage: whatis [-V] [-C file] [-M path] [-m path] " |
fputs("usage: whatis [-acfhklVw] [-C file] " |
"[-S arch] [-s section] name ...\n", stderr); |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
|
"\t [-s section] name ...\n", stderr); |
break; |
break; |
case ARG_EXPR: |
case ARG_EXPR: |
fputs("usage: apropos [-V] [-C file] [-M path] [-m path] " |
fputs("usage: apropos [-acfhklVw] [-C file] " |
"[-O outkey] [-S arch]\n" |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"\t [-s section] expression ...\n", stderr); |
"\t [-s section] expression ...\n", stderr); |
break; |
break; |
} |
} |
Line 544 parse(struct curparse *curp, int fd, const char *file, |
|
Line 571 parse(struct curparse *curp, int fd, const char *file, |
|
} |
} |
|
|
static enum mandoclevel |
static enum mandoclevel |
passthrough(const char *file) |
passthrough(const char *file, int fd) |
{ |
{ |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
const char *syscall; |
const char *syscall; |
ssize_t nr, nw, off; |
ssize_t nr, nw, off; |
int fd; |
|
|
|
fd = open(file, O_RDONLY); |
|
if (fd == -1) { |
|
syscall = "open"; |
|
goto fail; |
|
} |
|
|
|
while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0) |
while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0) |
for (off = 0; off < nr; off += nw) |
for (off = 0; off < nr; off += nw) |