version 1.282, 2017/02/16 10:56:07 |
version 1.290, 2017/05/16 19:06:30 |
|
|
OUTMODE_FLN, |
OUTMODE_FLN, |
OUTMODE_LST, |
OUTMODE_LST, |
OUTMODE_ALL, |
OUTMODE_ALL, |
OUTMODE_INT, |
|
OUTMODE_ONE |
OUTMODE_ONE |
}; |
}; |
|
|
|
|
OUTT_TREE, /* -Ttree */ |
OUTT_TREE, /* -Ttree */ |
OUTT_MAN, /* -Tman */ |
OUTT_MAN, /* -Tman */ |
OUTT_HTML, /* -Thtml */ |
OUTT_HTML, /* -Thtml */ |
|
OUTT_MARKDOWN, /* -Tmarkdown */ |
OUTT_LINT, /* -Tlint */ |
OUTT_LINT, /* -Tlint */ |
OUTT_PS, /* -Tps */ |
OUTT_PS, /* -Tps */ |
OUTT_PDF /* -Tpdf */ |
OUTT_PDF /* -Tpdf */ |
Line 92 static void fs_search(const struct mansearch *, |
|
Line 92 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 int koptions(int *, char *); |
static int koptions(int *, char *); |
static int moptions(int *, char *); |
static void moptions(int *, char *); |
static void mmsg(enum mandocerr, enum mandoclevel, |
static void mmsg(enum mandocerr, enum mandoclevel, |
const char *, int, int, const char *); |
const char *, int, int, const char *); |
static void outdata_alloc(struct curparse *); |
static void outdata_alloc(struct curparse *); |
Line 100 static void parse(struct curparse *, int, const cha |
|
Line 100 static void parse(struct curparse *, int, const cha |
|
static void passthrough(const char *, int, int); |
static void passthrough(const char *, int, int); |
static pid_t spawn_pager(struct tag_files *); |
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 *); |
|
|
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
Line 149 main(int argc, char *argv[]) |
|
Line 149 main(int argc, char *argv[]) |
|
return mandocdb(argc, argv); |
return mandocdb(argc, argv); |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1) |
if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
Line 193 main(int argc, char *argv[]) |
|
Line 193 main(int argc, char *argv[]) |
|
show_usage = 0; |
show_usage = 0; |
outmode = OUTMODE_DEF; |
outmode = OUTMODE_DEF; |
|
|
while (-1 != (c = getopt(argc, argv, |
while ((c = getopt(argc, argv, |
"aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) { |
"aC:cfhI:iK:klM:m:O:S:s:T:VW:w")) != -1) { |
|
if (c == 'i' && search.argmode == ARG_EXPR) { |
|
optind--; |
|
break; |
|
} |
switch (c) { |
switch (c) { |
case 'a': |
case 'a': |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
Line 224 main(int argc, char *argv[]) |
|
Line 228 main(int argc, char *argv[]) |
|
} |
} |
defos = mandoc_strdup(optarg + 3); |
defos = mandoc_strdup(optarg + 3); |
break; |
break; |
case 'i': |
|
outmode = OUTMODE_INT; |
|
break; |
|
case 'K': |
case 'K': |
if ( ! koptions(&options, optarg)) |
if ( ! koptions(&options, optarg)) |
return (int)MANDOCLEVEL_BADARG; |
return (int)MANDOCLEVEL_BADARG; |
Line 312 main(int argc, char *argv[]) |
|
Line 313 main(int argc, char *argv[]) |
|
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (!use_pager) |
if (!use_pager) |
if (pledge("stdio rpath flock", NULL) == -1) |
if (pledge("stdio rpath", NULL) == -1) |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
err((int)MANDOCLEVEL_SYSERR, "pledge"); |
#endif |
#endif |
|
|
Line 441 main(int argc, char *argv[]) |
|
Line 442 main(int argc, char *argv[]) |
|
} |
} |
#endif |
#endif |
|
|
if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) |
if (search.argmode == ARG_FILE) |
return (int)MANDOCLEVEL_BADARG; |
moptions(&options, auxpaths); |
|
|
mchars_alloc(); |
mchars_alloc(); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); |
curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); |
Line 591 usage(enum argmode argmode) |
|
Line 592 usage(enum argmode argmode) |
|
|
|
switch (argmode) { |
switch (argmode) { |
case ARG_FILE: |
case ARG_FILE: |
fputs("usage: mandoc [-acfhkl] [-I os=name] " |
fputs("usage: mandoc [-ac] [-I os=name] " |
"[-K encoding] [-mformat] [-O option]\n" |
"[-K encoding] [-mdoc | -man] [-O options]\n" |
"\t [-T output] [-W level] [file ...]\n", stderr); |
"\t [-T output] [-W level] [file ...]\n", stderr); |
break; |
break; |
case ARG_NAME: |
case ARG_NAME: |
fputs("usage: man [-acfhklw] [-C file] [-I os=name] " |
fputs("usage: man [-acfhklw] [-C file] [-M path] " |
"[-K encoding] [-M path] [-m path]\n" |
"[-m path] [-S subsection]\n" |
"\t [-O option=value] [-S subsection] [-s section] " |
"\t [[-s] section] name ...\n", stderr); |
"[-T output] [-W level]\n" |
|
"\t [section] name ...\n", stderr); |
|
break; |
break; |
case ARG_WORD: |
case ARG_WORD: |
fputs("usage: whatis [-acfhklw] [-C file] " |
fputs("usage: whatis [-afk] [-C file] " |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"[-M path] [-m path] [-O outkey] [-S arch]\n" |
"\t [-s section] name ...\n", stderr); |
"\t [-s section] name ...\n", stderr); |
break; |
break; |
case ARG_EXPR: |
case ARG_EXPR: |
fputs("usage: apropos [-acfhklw] [-C file] " |
fputs("usage: apropos [-afk] [-C file] " |
"[-M path] [-m path] [-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 766 parse(struct curparse *curp, int fd, const char *file) |
|
Line 765 parse(struct curparse *curp, int fd, const char *file) |
|
case OUTT_PS: |
case OUTT_PS: |
terminal_mdoc(curp->outdata, man); |
terminal_mdoc(curp->outdata, man); |
break; |
break; |
|
case OUTT_MARKDOWN: |
|
markdown_mdoc(curp->outdata, man); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
Line 915 koptions(int *options, char *arg) |
|
Line 917 koptions(int *options, char *arg) |
|
return 1; |
return 1; |
} |
} |
|
|
static int |
static void |
moptions(int *options, char *arg) |
moptions(int *options, char *arg) |
{ |
{ |
|
|
if (arg == NULL) |
if (arg == NULL) |
/* nothing to do */; |
return; |
else if (0 == strcmp(arg, "doc")) |
if (strcmp(arg, "doc") == 0) |
*options |= MPARSE_MDOC; |
*options |= MPARSE_MDOC; |
else if (0 == strcmp(arg, "andoc")) |
else if (strcmp(arg, "an") == 0) |
/* nothing to do */; |
|
else if (0 == strcmp(arg, "an")) |
|
*options |= MPARSE_MAN; |
*options |= MPARSE_MAN; |
else { |
|
warnx("-m %s: Bad argument", arg); |
|
return 0; |
|
} |
|
|
|
return 1; |
|
} |
} |
|
|
static int |
static int |
Line 950 toptions(struct curparse *curp, char *arg) |
|
Line 944 toptions(struct curparse *curp, char *arg) |
|
curp->outtype = OUTT_MAN; |
curp->outtype = OUTT_MAN; |
else if (0 == strcmp(arg, "html")) |
else if (0 == strcmp(arg, "html")) |
curp->outtype = OUTT_HTML; |
curp->outtype = OUTT_HTML; |
|
else if (0 == strcmp(arg, "markdown")) |
|
curp->outtype = OUTT_MARKDOWN; |
else if (0 == strcmp(arg, "utf8")) |
else if (0 == strcmp(arg, "utf8")) |
curp->outtype = OUTT_UTF8; |
curp->outtype = OUTT_UTF8; |
else if (0 == strcmp(arg, "locale")) |
else if (0 == strcmp(arg, "locale")) |
|
|
woptions(struct curparse *curp, char *arg) |
woptions(struct curparse *curp, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
const char *toks[7]; |
const char *toks[8]; |
|
|
toks[0] = "stop"; |
toks[0] = "stop"; |
toks[1] = "all"; |
toks[1] = "all"; |
toks[2] = "warning"; |
toks[2] = "style"; |
toks[3] = "error"; |
toks[3] = "warning"; |
toks[4] = "unsupp"; |
toks[4] = "error"; |
toks[5] = "fatal"; |
toks[5] = "unsupp"; |
toks[6] = NULL; |
toks[6] = "fatal"; |
|
toks[7] = NULL; |
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
Line 990 woptions(struct curparse *curp, char *arg) |
|
Line 987 woptions(struct curparse *curp, char *arg) |
|
break; |
break; |
case 1: |
case 1: |
case 2: |
case 2: |
curp->wlevel = MANDOCLEVEL_WARNING; |
curp->wlevel = MANDOCLEVEL_STYLE; |
break; |
break; |
case 3: |
case 3: |
curp->wlevel = MANDOCLEVEL_ERROR; |
curp->wlevel = MANDOCLEVEL_WARNING; |
break; |
break; |
case 4: |
case 4: |
curp->wlevel = MANDOCLEVEL_UNSUPP; |
curp->wlevel = MANDOCLEVEL_ERROR; |
break; |
break; |
case 5: |
case 5: |
|
curp->wlevel = MANDOCLEVEL_UNSUPP; |
|
break; |
|
case 6: |
curp->wlevel = MANDOCLEVEL_BADARG; |
curp->wlevel = MANDOCLEVEL_BADARG; |
break; |
break; |
default: |
default: |
Line 1006 woptions(struct curparse *curp, char *arg) |
|
Line 1006 woptions(struct curparse *curp, char *arg) |
|
return 0; |
return 0; |
} |
} |
} |
} |
|
|
return 1; |
return 1; |
} |
} |
|
|