version 1.273.2.8, 2017/02/17 14:50:13 |
version 1.301, 2017/07/26 10:21:55 |
|
|
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_xr.h" |
#include "roff.h" |
#include "roff.h" |
#include "mdoc.h" |
#include "mdoc.h" |
#include "man.h" |
#include "man.h" |
|
|
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 */ |
|
|
|
|
struct curparse { |
struct curparse { |
struct mparse *mp; |
struct mparse *mp; |
enum mandoclevel wlevel; /* ignore messages below this */ |
struct manoutput *outopts; /* output options */ |
|
void *outdata; /* data for output */ |
|
char *os_s; /* operating system for display */ |
int wstop; /* stop after a file with a warning */ |
int wstop; /* stop after a file with a warning */ |
|
enum mandocerr mmin; /* ignore messages below this */ |
|
enum mandoc_os os_e; /* check base system conventions */ |
enum outt outtype; /* which output to use */ |
enum outt outtype; /* which output to use */ |
void *outdata; /* data for output */ |
|
struct manoutput *outopts; /* output options */ |
|
}; |
}; |
|
|
|
|
#if HAVE_SQLITE3 |
|
int mandocdb(int, char *[]); |
int mandocdb(int, char *[]); |
#endif |
|
|
|
|
static void check_xr(const char *); |
static int fs_lookup(const struct manpaths *, |
static int fs_lookup(const struct manpaths *, |
size_t ipath, const char *, |
size_t ipath, const char *, |
const char *, const char *, |
const char *, const char *, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static void fs_search(const struct mansearch *, |
static int 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 109 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
Line 111 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
static char help_arg[] = "help"; |
static char help_arg[] = "help"; |
static char *help_argv[] = {help_arg, NULL}; |
static char *help_argv[] = {help_arg, NULL}; |
static enum mandoclevel rc; |
static enum mandoclevel rc; |
|
static FILE *mmsg_stream; |
|
|
|
|
int |
int |
Line 121 main(int argc, char *argv[]) |
|
Line 124 main(int argc, char *argv[]) |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
const char *progname, *sec, *thisarg; |
const char *progname, *sec, *thisarg; |
char *conf_file, *defpaths, *auxpaths; |
char *conf_file, *defpaths, *auxpaths; |
char *defos, *oarg; |
char *oarg; |
unsigned char *uc; |
unsigned char *uc; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
Line 146 main(int argc, char *argv[]) |
|
Line 149 main(int argc, char *argv[]) |
|
setprogname(progname); |
setprogname(progname); |
#endif |
#endif |
|
|
#if HAVE_SQLITE3 |
|
if (strncmp(progname, "mandocdb", 8) == 0 || |
if (strncmp(progname, "mandocdb", 8) == 0 || |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
return mandocdb(argc, argv); |
return mandocdb(argc, argv); |
#endif |
|
|
|
#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 187 main(int argc, char *argv[]) |
|
Line 188 main(int argc, char *argv[]) |
|
|
|
memset(&curp, 0, sizeof(struct curparse)); |
memset(&curp, 0, sizeof(struct curparse)); |
curp.outtype = OUTT_LOCALE; |
curp.outtype = OUTT_LOCALE; |
curp.wlevel = MANDOCLEVEL_BADARG; |
curp.mmin = MANDOCERR_MAX; |
curp.outopts = &conf.output; |
curp.outopts = &conf.output; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
defos = NULL; |
mmsg_stream = stderr; |
|
|
use_pager = 1; |
use_pager = 1; |
tag_files = NULL; |
tag_files = NULL; |
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 222 main(int argc, char *argv[]) |
|
Line 227 main(int argc, char *argv[]) |
|
warnx("-I %s: Bad argument", optarg); |
warnx("-I %s: Bad argument", optarg); |
return (int)MANDOCLEVEL_BADARG; |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
if (defos) { |
if (curp.os_s != NULL) { |
warnx("-I %s: Duplicate argument", optarg); |
warnx("-I %s: Duplicate argument", optarg); |
return (int)MANDOCLEVEL_BADARG; |
return (int)MANDOCLEVEL_BADARG; |
} |
} |
defos = mandoc_strdup(optarg + 3); |
curp.os_s = 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 316 main(int argc, char *argv[]) |
|
Line 318 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 361 main(int argc, char *argv[]) |
|
Line 363 main(int argc, char *argv[]) |
|
/* man(1), whatis(1), apropos(1) */ |
/* man(1), whatis(1), apropos(1) */ |
|
|
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
if (argc == 0) |
|
usage(search.argmode); |
|
|
|
if (search.argmode == ARG_NAME && |
if (search.argmode == ARG_NAME && |
outmode == OUTMODE_ONE) |
outmode == OUTMODE_ONE) |
search.firstmatch = 1; |
search.firstmatch = 1; |
Line 371 main(int argc, char *argv[]) |
|
Line 370 main(int argc, char *argv[]) |
|
/* Access the mandoc database. */ |
/* Access the mandoc database. */ |
|
|
manconf_parse(&conf, conf_file, defpaths, auxpaths); |
manconf_parse(&conf, conf_file, defpaths, auxpaths); |
#if HAVE_SQLITE3 |
|
mansearch_setup(1); |
|
if ( ! mansearch(&search, &conf.manpath, |
if ( ! mansearch(&search, &conf.manpath, |
argc, argv, &res, &sz)) |
argc, argv, &res, &sz)) |
usage(search.argmode); |
usage(search.argmode); |
#else |
|
if (search.argmode != ARG_NAME) { |
|
fputs("mandoc: database support not compiled in\n", |
|
stderr); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
|
sz = 0; |
|
#endif |
|
|
|
if (sz == 0) { |
if (sz == 0) { |
if (search.argmode == ARG_NAME) |
if (search.argmode == ARG_NAME) |
Line 458 main(int argc, char *argv[]) |
|
Line 447 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.mmin, mmsg, |
|
curp.os_e, curp.os_s); |
|
|
/* |
/* |
* Conditionally start up the lookaside buffer before parsing. |
* Conditionally start up the lookaside buffer before parsing. |
Line 486 main(int argc, char *argv[]) |
|
Line 476 main(int argc, char *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. */ |
/* For .so only; ignore failure. */ |
chdir(conf.manpath.paths[resp->ipath]); |
(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, |
Line 531 main(int argc, char *argv[]) |
|
Line 521 main(int argc, char *argv[]) |
|
break; |
break; |
} |
} |
} |
} |
|
mandoc_xr_free(); |
mparse_free(curp.mp); |
mparse_free(curp.mp); |
mchars_free(); |
mchars_free(); |
|
|
out: |
out: |
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
manconf_free(&conf); |
manconf_free(&conf); |
#if HAVE_SQLITE3 |
|
mansearch_free(res, sz); |
mansearch_free(res, sz); |
mansearch_setup(0); |
|
#endif |
|
} |
} |
|
|
free(defos); |
free(curp.os_s); |
|
|
/* |
/* |
* When using a pager, finish writing both temporary files, |
* When using a pager, finish writing both temporary files, |
Line 611 usage(enum argmode argmode) |
|
Line 599 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 644 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 630 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
glob_t globinfo; |
glob_t globinfo; |
struct manpage *page; |
struct manpage *page; |
char *file; |
char *file; |
int form, globres; |
int globres; |
|
enum form form; |
|
|
form = FORM_SRC; |
form = FORM_SRC; |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
mandoc_asprintf(&file, "%s/man%s/%s.%s", |
Line 678 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
Line 665 fs_lookup(const struct manpaths *paths, size_t ipath, |
|
if (globres == 0) |
if (globres == 0) |
file = mandoc_strdup(*globinfo.gl_pathv); |
file = mandoc_strdup(*globinfo.gl_pathv); |
globfree(&globinfo); |
globfree(&globinfo); |
if (globres != 0) |
if (globres == 0) |
|
goto found; |
|
if (res != NULL || ipath + 1 != paths->sz) |
return 0; |
return 0; |
|
|
|
mandoc_asprintf(&file, "%s.%s", name, sec); |
|
globres = access(file, R_OK); |
|
free(file); |
|
return globres != -1; |
|
|
found: |
found: |
#if HAVE_SQLITE3 |
|
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s", |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
name, sec, BINM_MAKEWHATIS, paths->paths[ipath]); |
#endif |
if (res == NULL) { |
|
free(file); |
|
return 1; |
|
} |
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
*res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage)); |
page = *res + (*ressz - 1); |
page = *res + (*ressz - 1); |
page->file = file; |
page->file = file; |
|
|
return 1; |
return 1; |
} |
} |
|
|
static void |
static int |
fs_search(const struct mansearch *cfg, const struct manpaths *paths, |
fs_search(const struct mansearch *cfg, const struct manpaths *paths, |
int argc, char **argv, struct manpage **res, size_t *ressz) |
int argc, char **argv, struct manpage **res, size_t *ressz) |
{ |
{ |
Line 710 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 706 fs_search(const struct mansearch *cfg, const struct ma |
|
|
|
assert(cfg->argmode == ARG_NAME); |
assert(cfg->argmode == ARG_NAME); |
|
|
*res = NULL; |
if (res != NULL) |
|
*res = NULL; |
*ressz = lastsz = 0; |
*ressz = lastsz = 0; |
while (argc) { |
while (argc) { |
for (ipath = 0; ipath < paths->sz; ipath++) { |
for (ipath = 0; ipath < paths->sz; ipath++) { |
Line 718 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 715 fs_search(const struct mansearch *cfg, const struct ma |
|
if (fs_lookup(paths, ipath, cfg->sec, |
if (fs_lookup(paths, ipath, cfg->sec, |
cfg->arch, *argv, res, ressz) && |
cfg->arch, *argv, res, ressz) && |
cfg->firstmatch) |
cfg->firstmatch) |
return; |
return 1; |
} else for (isec = 0; isec < nsec; isec++) |
} else for (isec = 0; isec < nsec; isec++) |
if (fs_lookup(paths, ipath, sections[isec], |
if (fs_lookup(paths, ipath, sections[isec], |
cfg->arch, *argv, res, ressz) && |
cfg->arch, *argv, res, ressz) && |
cfg->firstmatch) |
cfg->firstmatch) |
return; |
return 1; |
} |
} |
if (*ressz == lastsz) |
if (res != NULL && *ressz == lastsz) |
warnx("No entry for %s in the manual.", *argv); |
warnx("No entry for %s in the manual.", *argv); |
lastsz = *ressz; |
lastsz = *ressz; |
argv++; |
argv++; |
argc--; |
argc--; |
} |
} |
|
return 0; |
} |
} |
|
|
static void |
static void |
Line 767 parse(struct curparse *curp, int fd, const char *file) |
|
Line 765 parse(struct curparse *curp, int fd, const char *file) |
|
|
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
|
mandoc_xr_reset(); |
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
mdoc_validate(man); |
mdoc_validate(man); |
Line 787 parse(struct curparse *curp, int fd, const char *file) |
|
Line 786 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 815 parse(struct curparse *curp, int fd, const char *file) |
|
Line 817 parse(struct curparse *curp, int fd, const char *file) |
|
break; |
break; |
} |
} |
} |
} |
|
if (curp->mmin < MANDOCERR_STYLE) |
|
check_xr(file); |
mparse_updaterc(curp->mp, &rc); |
mparse_updaterc(curp->mp, &rc); |
} |
} |
|
|
static void |
static void |
|
check_xr(const char *file) |
|
{ |
|
static struct manpaths paths; |
|
struct mansearch search; |
|
struct mandoc_xr *xr; |
|
char *cp; |
|
size_t sz; |
|
|
|
if (paths.sz == 0) |
|
manpath_base(&paths); |
|
|
|
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
|
if (xr->line == -1) |
|
continue; |
|
search.arch = NULL; |
|
search.sec = xr->sec; |
|
search.outkey = NULL; |
|
search.argmode = ARG_NAME; |
|
search.firstmatch = 1; |
|
if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz)) |
|
continue; |
|
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
|
continue; |
|
if (xr->count == 1) |
|
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
|
else |
|
mandoc_asprintf(&cp, "Xr %s %s (%d times)", |
|
xr->name, xr->sec, xr->count); |
|
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
|
file, xr->line, xr->pos + 1, cp); |
|
free(cp); |
|
} |
|
} |
|
|
|
static void |
outdata_alloc(struct curparse *curp) |
outdata_alloc(struct curparse *curp) |
{ |
{ |
switch (curp->outtype) { |
switch (curp->outtype) { |
Line 936 koptions(int *options, char *arg) |
|
Line 975 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 964 toptions(struct curparse *curp, char *arg) |
|
Line 995 toptions(struct curparse *curp, char *arg) |
|
curp->outtype = OUTT_ASCII; |
curp->outtype = OUTT_ASCII; |
else if (0 == strcmp(arg, "lint")) { |
else if (0 == strcmp(arg, "lint")) { |
curp->outtype = OUTT_LINT; |
curp->outtype = OUTT_LINT; |
curp->wlevel = MANDOCLEVEL_WARNING; |
curp->mmin = MANDOCERR_BASE; |
|
mmsg_stream = stdout; |
} else if (0 == strcmp(arg, "tree")) |
} else if (0 == strcmp(arg, "tree")) |
curp->outtype = OUTT_TREE; |
curp->outtype = OUTT_TREE; |
else if (0 == strcmp(arg, "man")) |
else if (0 == strcmp(arg, "man")) |
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")) |
curp->outtype = OUTT_LOCALE; |
curp->outtype = OUTT_LOCALE; |
else if (0 == strcmp(arg, "xhtml")) |
|
curp->outtype = OUTT_HTML; |
|
else if (0 == strcmp(arg, "ps")) |
else if (0 == strcmp(arg, "ps")) |
curp->outtype = OUTT_PS; |
curp->outtype = OUTT_PS; |
else if (0 == strcmp(arg, "pdf")) |
else if (0 == strcmp(arg, "pdf")) |
|
|
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[11]; |
|
|
toks[0] = "stop"; |
toks[0] = "stop"; |
toks[1] = "all"; |
toks[1] = "all"; |
toks[2] = "warning"; |
toks[2] = "base"; |
toks[3] = "error"; |
toks[3] = "style"; |
toks[4] = "unsupp"; |
toks[4] = "warning"; |
toks[5] = "fatal"; |
toks[5] = "error"; |
toks[6] = NULL; |
toks[6] = "unsupp"; |
|
toks[7] = "fatal"; |
|
toks[8] = "openbsd"; |
|
toks[9] = "netbsd"; |
|
toks[10] = NULL; |
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
Line 1011 woptions(struct curparse *curp, char *arg) |
|
Line 1047 woptions(struct curparse *curp, char *arg) |
|
break; |
break; |
case 1: |
case 1: |
case 2: |
case 2: |
curp->wlevel = MANDOCLEVEL_WARNING; |
curp->mmin = MANDOCERR_BASE; |
break; |
break; |
case 3: |
case 3: |
curp->wlevel = MANDOCLEVEL_ERROR; |
curp->mmin = MANDOCERR_STYLE; |
break; |
break; |
case 4: |
case 4: |
curp->wlevel = MANDOCLEVEL_UNSUPP; |
curp->mmin = MANDOCERR_WARNING; |
break; |
break; |
case 5: |
case 5: |
curp->wlevel = MANDOCLEVEL_BADARG; |
curp->mmin = MANDOCERR_ERROR; |
break; |
break; |
|
case 6: |
|
curp->mmin = MANDOCERR_UNSUPP; |
|
break; |
|
case 7: |
|
curp->mmin = MANDOCERR_MAX; |
|
break; |
|
case 8: |
|
curp->mmin = MANDOCERR_BASE; |
|
curp->os_e = MANDOC_OS_OPENBSD; |
|
break; |
|
case 9: |
|
curp->mmin = MANDOCERR_BASE; |
|
curp->os_e = MANDOC_OS_NETBSD; |
|
break; |
default: |
default: |
warnx("-W %s: Bad argument", o); |
warnx("-W %s: Bad argument", o); |
return 0; |
return 0; |
} |
} |
} |
} |
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 1037 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 1086 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
{ |
{ |
const char *mparse_msg; |
const char *mparse_msg; |
|
|
fprintf(stderr, "%s: %s:", getprogname(), |
fprintf(mmsg_stream, "%s: %s:", getprogname(), |
file == NULL ? "<stdin>" : file); |
file == NULL ? "<stdin>" : file); |
|
|
if (line) |
if (line) |
fprintf(stderr, "%d:%d:", line, col + 1); |
fprintf(mmsg_stream, "%d:%d:", line, col + 1); |
|
|
fprintf(stderr, " %s", mparse_strlevel(lvl)); |
fprintf(mmsg_stream, " %s", mparse_strlevel(lvl)); |
|
|
if (NULL != (mparse_msg = mparse_strerror(t))) |
if ((mparse_msg = mparse_strerror(t)) != NULL) |
fprintf(stderr, ": %s", mparse_msg); |
fprintf(mmsg_stream, ": %s", mparse_msg); |
|
|
if (msg) |
if (msg) |
fprintf(stderr, ": %s", msg); |
fprintf(mmsg_stream, ": %s", msg); |
|
|
fputc('\n', stderr); |
fputc('\n', mmsg_stream); |
} |
} |
|
|
static pid_t |
static pid_t |