=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.50 retrieving revision 1.194 diff -u -p -r1.50 -r1.194 --- mandoc/main.c 2009/10/26 15:44:51 1.50 +++ mandoc/main.c 2014/10/25 01:03:52 1.194 @@ -1,6 +1,8 @@ -/* $Id: main.c,v 1.50 2009/10/26 15:44:51 kristaps Exp $ */ +/* $Id: main.c,v 1.194 2014/10/25 01:03:52 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008-2012 Kristaps Dzonsons + * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze + * Copyright (c) 2010 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,10 +16,13 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include "config.h" +#include + #include -#include +#include +#include #include #include #include @@ -25,438 +30,537 @@ #include #include +#include "mandoc.h" +#include "mandoc_aux.h" +#include "main.h" #include "mdoc.h" #include "man.h" -#include "main.h" +#include "manpath.h" +#include "mansearch.h" -#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) - -/* Account for FreeBSD and Linux in our declarations. */ - -#ifdef __linux__ -extern int getsubopt(char **, char * const *, char **); -extern size_t strlcat(char *, const char *, size_t); -# ifndef __dead -# define __dead __attribute__((__noreturn__)) +#if !defined(__GNUC__) || (__GNUC__ < 2) +# if !defined(lint) +# define __attribute__(x) # endif -#elif defined(__dead2) -# ifndef __dead -# define __dead __dead2 -# endif -#endif +#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ +enum outmode { + OUTMODE_DEF = 0, + OUTMODE_FLN, + OUTMODE_LST, + OUTMODE_ALL, + OUTMODE_INT, + OUTMODE_ONE +}; + typedef void (*out_mdoc)(void *, const struct mdoc *); typedef void (*out_man)(void *, const struct man *); typedef void (*out_free)(void *); -struct buf { - char *buf; - size_t sz; -}; - -enum intt { - INTT_AUTO, - INTT_MDOC, - INTT_MAN -}; - enum outt { - OUTT_ASCII = 0, - OUTT_TREE, - OUTT_HTML, - OUTT_LINT + OUTT_ASCII = 0, /* -Tascii */ + OUTT_LOCALE, /* -Tlocale */ + OUTT_UTF8, /* -Tutf8 */ + OUTT_TREE, /* -Ttree */ + OUTT_MAN, /* -Tman */ + OUTT_HTML, /* -Thtml */ + OUTT_XHTML, /* -Txhtml */ + OUTT_LINT, /* -Tlint */ + OUTT_PS, /* -Tps */ + OUTT_PDF /* -Tpdf */ }; struct curparse { - const char *file; /* Current parse. */ - int fd; /* Current parse. */ - int wflags; -#define WARN_WALL (1 << 0) /* All-warnings mask. */ -#define WARN_WERR (1 << 2) /* Warnings->errors. */ - int fflags; -#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ -#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ -#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ -#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ -#define IGN_ERRORS (1 << 4) /* Ignore failed parse. */ - enum intt inttype; /* Input parsers... */ - struct man *man; - struct man *lastman; - struct mdoc *mdoc; - struct mdoc *lastmdoc; - enum outt outtype; /* Output devices... */ - out_mdoc outmdoc; - out_man outman; - out_free outfree; - void *outdata; - char outopts[BUFSIZ]; + struct mparse *mp; + enum mandoclevel wlevel; /* ignore messages below this */ + int wstop; /* stop after a file with a warning */ + enum outt outtype; /* which output to use */ + out_mdoc outmdoc; /* mdoc output ptr */ + out_man outman; /* man output ptr */ + out_free outfree; /* free output ptr */ + void *outdata; /* data for output */ + char outopts[BUFSIZ]; /* buf of output opts */ }; -static int foptions(int *, char *); -static int toptions(enum outt *, char *); -static int moptions(enum intt *, char *); -static int woptions(int *, char *); -static int merr(void *, int, int, const char *); -static int mwarn(void *, int, int, const char *); -static int ffile(struct buf *, struct buf *, - const char *, struct curparse *); -static int fdesc(struct buf *, struct buf *, - struct curparse *); -static int pset(const char *, int, struct curparse *, - struct man **, struct mdoc **); -static struct man *man_init(struct curparse *); -static struct mdoc *mdoc_init(struct curparse *); -__dead static void version(void); -__dead static void usage(void); +static int koptions(int *, char *); +static int moptions(int *, char *); +static void mmsg(enum mandocerr, enum mandoclevel, + const char *, int, int, const char *); +static void parse(struct curparse *, int, + const char *, enum mandoclevel *); +static enum mandoclevel passthrough(const char *, int); +static void spawn_pager(void); +static int toptions(struct curparse *, char *); +static void usage(enum argmode) __attribute__((noreturn)); +static void version(void) __attribute__((noreturn)); +static int woptions(struct curparse *, char *); -extern char *__progname; +static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; +static const char *progname; int main(int argc, char *argv[]) { - int c, rc; - struct buf ln, blk; struct curparse curp; + struct mansearch search; + struct manpaths paths; + char *conf_file, *defpaths, *auxpaths; + char *defos; +#if HAVE_SQLITE3 + struct manpage *res, *resp; + size_t isec, i, sz; + int prio, best_prio; + char sec; +#endif + enum mandoclevel rc; + enum outmode outmode; + pid_t child_pid; + int fd; + int show_usage; + int use_pager; + int options; + int c; - bzero(&curp, sizeof(struct curparse)); + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; - curp.inttype = INTT_AUTO; + /* Search options. */ + + memset(&paths, 0, sizeof(struct manpaths)); + conf_file = defpaths = auxpaths = NULL; + + memset(&search, 0, sizeof(struct mansearch)); + search.outkey = "Nd"; + + if (strcmp(progname, "man") == 0) + search.argmode = ARG_NAME; + else if (strncmp(progname, "apropos", 7) == 0) + search.argmode = ARG_EXPR; + else if (strncmp(progname, "whatis", 6) == 0) + search.argmode = ARG_WORD; + else + search.argmode = ARG_FILE; + + /* Parser and formatter options. */ + + memset(&curp, 0, sizeof(struct curparse)); curp.outtype = OUTT_ASCII; + curp.wlevel = MANDOCLEVEL_FATAL; + options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; + defos = NULL; - /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:"))) + use_pager = 1; + show_usage = 0; + outmode = OUTMODE_DEF; + + while (-1 != (c = getopt(argc, argv, + "aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) { switch (c) { - case ('f'): - if ( ! foptions(&curp.fflags, optarg)) - return(EXIT_FAILURE); + case 'a': + outmode = OUTMODE_ALL; break; - case ('m'): - if ( ! moptions(&curp.inttype, optarg)) - return(EXIT_FAILURE); + case 'C': + conf_file = optarg; break; - case ('O'): + case 'c': + use_pager = 0; + break; + case 'f': + search.argmode = ARG_WORD; + break; + case 'h': + (void)strlcat(curp.outopts, "synopsis,", BUFSIZ); + outmode = OUTMODE_ALL; + break; + case 'I': + if (strncmp(optarg, "os=", 3)) { + fprintf(stderr, + "%s: -I%s: Bad argument\n", + progname, optarg); + return((int)MANDOCLEVEL_BADARG); + } + if (defos) { + fprintf(stderr, + "%s: -I%s: Duplicate argument\n", + progname, optarg); + return((int)MANDOCLEVEL_BADARG); + } + defos = mandoc_strdup(optarg + 3); + break; + case 'i': + outmode = OUTMODE_INT; + break; + case 'K': + if ( ! koptions(&options, optarg)) + return((int)MANDOCLEVEL_BADARG); + break; + case 'k': + search.argmode = ARG_EXPR; + break; + case 'l': + search.argmode = ARG_FILE; + outmode = OUTMODE_ALL; + break; + case 'M': + defpaths = optarg; + break; + case 'm': + auxpaths = optarg; + break; + case 'O': + search.outkey = optarg; (void)strlcat(curp.outopts, optarg, BUFSIZ); (void)strlcat(curp.outopts, ",", BUFSIZ); break; - case ('T'): - if ( ! toptions(&curp.outtype, optarg)) - return(EXIT_FAILURE); + case 'S': + search.arch = optarg; break; - case ('W'): - if ( ! woptions(&curp.wflags, optarg)) - return(EXIT_FAILURE); + case 's': + search.sec = optarg; break; - case ('V'): + case 'T': + if ( ! toptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); + break; + case 'W': + if ( ! woptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); + break; + case 'w': + outmode = OUTMODE_FLN; + break; + case 'V': version(); /* NOTREACHED */ default: - usage(); - /* NOTREACHED */ + show_usage = 1; + break; } + } - argc -= optind; - argv += optind; + if (show_usage) + usage(search.argmode); - bzero(&ln, sizeof(struct buf)); - bzero(&blk, sizeof(struct buf)); + /* Postprocess options. */ - rc = 1; + if (outmode == OUTMODE_DEF) { + switch (search.argmode) { + case ARG_FILE: + outmode = OUTMODE_ALL; + use_pager = 0; + break; + case ARG_NAME: + outmode = OUTMODE_ONE; + break; + default: + outmode = OUTMODE_LST; + break; + } + } - if (NULL == *argv) { - curp.file = ""; - curp.fd = STDIN_FILENO; + /* Parse arguments. */ - c = fdesc(&blk, &ln, &curp); - if ( ! (IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; - } + argc -= optind; + argv += optind; +#if HAVE_SQLITE3 + resp = NULL; +#endif - while (rc && *argv) { - c = ffile(&blk, &ln, *argv, &curp); - if ( ! (IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; + /* Quirk for a man(1) section argument without -s. */ + if (search.argmode == ARG_NAME && + argv[0] != NULL && + isdigit((unsigned char)argv[0][0]) && + (argv[0][1] == '\0' || !strcmp(argv[0], "3p"))) { + search.sec = argv[0]; argv++; - if (*argv && rc) { - if (curp.lastman) - if ( ! man_reset(curp.lastman)) - rc = 0; - if (curp.lastmdoc) - if ( ! mdoc_reset(curp.lastmdoc)) - rc = 0; - curp.lastman = NULL; - curp.lastmdoc = NULL; - } + argc--; } - if (blk.buf) - free(blk.buf); - if (ln.buf) - free(ln.buf); - if (curp.outfree) - (*curp.outfree)(curp.outdata); - if (curp.mdoc) - mdoc_free(curp.mdoc); - if (curp.man) - man_free(curp.man); + rc = MANDOCLEVEL_OK; - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); -} + /* man(1), whatis(1), apropos(1) */ + if (search.argmode != ARG_FILE) { +#if HAVE_SQLITE3 + if (argc == 0) + usage(search.argmode); -__dead static void -version(void) -{ + /* Access the mandoc database. */ - (void)printf("%s %s\n", __progname, VERSION); - exit(EXIT_SUCCESS); -} + manpath_parse(&paths, conf_file, defpaths, auxpaths); + mansearch_setup(1); + if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) + usage(search.argmode); + resp = res; + if (sz == 0) { + if (search.argmode == ARG_NAME) + fprintf(stderr, "%s: No entry for %s " + "in the manual.\n", progname, argv[0]); + rc = MANDOCLEVEL_BADARG; + goto out; + } -__dead static void -usage(void) -{ + /* + * For standard man(1) and -a output mode, + * prepare for copying filename pointers + * into the program parameter array. + */ - (void)fprintf(stderr, "usage: %s [-V] [-foption...] " - "[-mformat] [-Ooption] [-Toutput] " - "[-Werr...]\n", __progname); - exit(EXIT_FAILURE); -} + if (outmode == OUTMODE_ONE) { + argc = 1; + best_prio = 10; + } else if (outmode == OUTMODE_ALL) + argc = (int)sz; + /* Iterate all matching manuals. */ -static struct man * -man_init(struct curparse *curp) -{ - int pflags; - struct man *man; - struct man_cb mancb; + for (i = 0; i < sz; i++) { + if (outmode == OUTMODE_FLN) + puts(res[i].file); + else if (outmode == OUTMODE_LST) + printf("%s - %s\n", res[i].names, + res[i].output == NULL ? "" : + res[i].output); + else if (outmode == OUTMODE_ONE) { + /* Search for the best section. */ + isec = strcspn(res[i].file, "123456789"); + sec = res[i].file[isec]; + if ('\0' == sec) + continue; + prio = sec_prios[sec - '1']; + if (prio >= best_prio) + continue; + best_prio = prio; + resp = res + i; + } + } - mancb.man_err = merr; - mancb.man_warn = mwarn; + /* + * For man(1), -a and -i output mode, fall through + * to the main mandoc(1) code iterating files + * and running the parsers on each of them. + */ - /* Defaults from mandoc.1. */ - - pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; - - if (curp->fflags & NO_IGN_MACRO) - pflags &= ~MAN_IGN_MACRO; - if (curp->fflags & NO_IGN_CHARS) - pflags &= ~MAN_IGN_CHARS; - if (curp->fflags & NO_IGN_ESCAPE) - pflags &= ~MAN_IGN_ESCAPE; - - if (NULL == (man = man_alloc(curp, pflags, &mancb))) - warnx("memory exhausted"); - - return(man); -} - - -static struct mdoc * -mdoc_init(struct curparse *curp) -{ - int pflags; - struct mdoc *mdoc; - struct mdoc_cb mdoccb; - - mdoccb.mdoc_err = merr; - mdoccb.mdoc_warn = mwarn; - - /* Defaults from mandoc.1. */ - - pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; - - if (curp->fflags & IGN_SCOPE) - pflags |= MDOC_IGN_SCOPE; - if (curp->fflags & NO_IGN_ESCAPE) - pflags &= ~MDOC_IGN_ESCAPE; - if (curp->fflags & NO_IGN_MACRO) - pflags &= ~MDOC_IGN_MACRO; - if (curp->fflags & NO_IGN_CHARS) - pflags &= ~MDOC_IGN_CHARS; - - if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) - warnx("memory exhausted"); - - return(mdoc); -} - - -static int -ffile(struct buf *blk, struct buf *ln, - const char *file, struct curparse *curp) -{ - int c; - - curp->file = file; - if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { - warn("%s", curp->file); - return(-1); + if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST) + goto out; +#else + fputs("mandoc: database support not compiled in\n", + stderr); + return((int)MANDOCLEVEL_BADARG); +#endif } - c = fdesc(blk, ln, curp); + /* mandoc(1) */ - if (-1 == close(curp->fd)) - warn("%s", curp->file); + if ( ! moptions(&options, auxpaths)) + return((int)MANDOCLEVEL_BADARG); - return(c); -} + if (use_pager && isatty(STDOUT_FILENO)) + spawn_pager(); + curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); -static int -fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) -{ - size_t sz; - ssize_t ssz; - struct stat st; - int j, i, pos, lnn, comment; - struct man *man; - struct mdoc *mdoc; - - sz = BUFSIZ; - man = NULL; - mdoc = NULL; - /* - * Two buffers: ln and buf. buf is the input buffer optimised - * here for each file's block size. ln is a line buffer. Both - * growable, hence passed in by ptr-ptr. + * Conditionally start up the lookaside buffer before parsing. */ + if (OUTT_MAN == curp.outtype) + mparse_keep(curp.mp); - if (-1 == fstat(curp->fd, &st)) - warn("%s", curp->file); - else if ((size_t)st.st_blksize > sz) - sz = st.st_blksize; + if (argc == 0) + parse(&curp, STDIN_FILENO, "", &rc); - if (sz > blk->sz) { - blk->buf = realloc(blk->buf, sz); - if (NULL == blk->buf) { - warn("realloc"); - return(-1); + while (argc) { +#if HAVE_SQLITE3 + if (resp != NULL) { + rc = mparse_open(curp.mp, &fd, resp->file, + &child_pid); + if (fd == -1) + /* 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++; + } else +#endif + { + rc = mparse_open(curp.mp, &fd, *argv++, + &child_pid); + if (fd != -1) + parse(&curp, fd, argv[-1], &rc); } - blk->sz = sz; - } - /* Fill buf with file blocksize. */ + if (child_pid && + mparse_wait(curp.mp, child_pid) != MANDOCLEVEL_OK) + rc = MANDOCLEVEL_SYSERR; - for (lnn = pos = comment = 0; ; ) { - if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { - warn("%s", curp->file); - return(-1); - } else if (0 == ssz) + if (MANDOCLEVEL_OK != rc && curp.wstop) break; + argc--; + } - /* Parse the read block into partial or full lines. */ + if (curp.outfree) + (*curp.outfree)(curp.outdata); + if (curp.mp) + mparse_free(curp.mp); - for (i = 0; i < (int)ssz; i++) { - if (pos >= (int)ln->sz) { - ln->sz += 256; /* Step-size. */ - ln->buf = realloc(ln->buf, ln->sz); - if (NULL == ln->buf) { - warn("realloc"); - return(-1); - } - } +#if HAVE_SQLITE3 +out: + if (search.argmode != ARG_FILE) { + manpath_free(&paths); + mansearch_free(res, sz); + mansearch_setup(0); + } +#endif - if ('\n' != blk->buf[i]) { - if (comment) - continue; - ln->buf[pos++] = blk->buf[i]; + free(defos); - /* Handle in-line `\"' comments. */ + return((int)rc); +} - if (1 == pos || '\"' != ln->buf[pos - 1]) - continue; +static void +version(void) +{ - for (j = pos - 2; j >= 0; j--) - if ('\\' != ln->buf[j]) - break; + printf("mandoc %s\n", VERSION); + exit((int)MANDOCLEVEL_OK); +} - if ( ! ((pos - 2 - j) % 2)) - continue; +static void +usage(enum argmode argmode) +{ - comment = 1; - pos -= 2; - continue; - } + switch (argmode) { + case ARG_FILE: + fputs("usage: mandoc [-acfhklV] [-Ios=name] " + "[-mformat] [-Ooption] [-Toutput] [-Wlevel]\n" + "\t [file ...]\n", stderr); + break; + case ARG_NAME: + fputs("usage: man [-acfhklVw] [-C file] " + "[-M path] [-m path] [-S arch] [-s section]\n" + "\t [section] name ...\n", stderr); + break; + case ARG_WORD: + fputs("usage: whatis [-acfhklVw] [-C file] " + "[-M path] [-m path] [-O outkey] [-S arch]\n" + "\t [-s section] name ...\n", stderr); + break; + case ARG_EXPR: + fputs("usage: apropos [-acfhklVw] [-C file] " + "[-M path] [-m path] [-O outkey] [-S arch]\n" + "\t [-s section] expression ...\n", stderr); + break; + } + exit((int)MANDOCLEVEL_BADARG); +} - /* Handle escaped `\\n' newlines. */ +static void +parse(struct curparse *curp, int fd, const char *file, + enum mandoclevel *level) +{ + enum mandoclevel rc; + struct mdoc *mdoc; + struct man *man; - if (pos > 0 && 0 == comment && - '\\' == ln->buf[pos - 1]) { - for (j = pos - 1; j >= 0; j--) - if ('\\' != ln->buf[j]) - break; - if ( ! ((pos - j) % 2)) { - pos--; - lnn++; - continue; - } - } + /* Begin by parsing the file itself. */ - ln->buf[pos] = 0; - lnn++; + assert(file); + assert(fd >= -1); - /* If unset, assign parser in pset(). */ + rc = mparse_readfd(curp->mp, fd, file); - if ( ! (man || mdoc) && ! pset(ln->buf, - pos, curp, &man, &mdoc)) - return(-1); + /* Stop immediately if the parse has failed. */ - pos = comment = 0; + if (MANDOCLEVEL_FATAL <= rc) + goto cleanup; - /* Pass down into parsers. */ + /* + * With -Wstop and warnings or errors of at least the requested + * level, do not produce output. + */ - if (man && ! man_parseln(man, lnn, ln->buf)) - return(0); - if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) - return(0); - } - } + if (MANDOCLEVEL_OK != rc && curp->wstop) + goto cleanup; - /* NOTE a parser may not have been assigned, yet. */ - - if ( ! (man || mdoc)) { - (void)fprintf(stderr, "%s: not a manual\n", - curp->file); - return(0); - } - - if (mdoc && ! mdoc_endparse(mdoc)) - return(0); - if (man && ! man_endparse(man)) - return(0); - /* If unset, allocate output dev now (if applicable). */ if ( ! (curp->outman && curp->outmdoc)) { switch (curp->outtype) { - case (OUTT_HTML): + case OUTT_XHTML: + curp->outdata = xhtml_alloc(curp->outopts); + curp->outfree = html_free; + break; + case OUTT_HTML: curp->outdata = html_alloc(curp->outopts); + curp->outfree = html_free; + break; + case OUTT_UTF8: + curp->outdata = utf8_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case OUTT_LOCALE: + curp->outdata = locale_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case OUTT_ASCII: + curp->outdata = ascii_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case OUTT_PDF: + curp->outdata = pdf_alloc(curp->outopts); + curp->outfree = pspdf_free; + break; + case OUTT_PS: + curp->outdata = ps_alloc(curp->outopts); + curp->outfree = pspdf_free; + break; + default: + break; + } + + switch (curp->outtype) { + case OUTT_HTML: + /* FALLTHROUGH */ + case OUTT_XHTML: curp->outman = html_man; curp->outmdoc = html_mdoc; - curp->outfree = html_free; break; - case (OUTT_TREE): + case OUTT_TREE: curp->outman = tree_man; curp->outmdoc = tree_mdoc; break; - case (OUTT_LINT): + case OUTT_MAN: + curp->outmdoc = man_mdoc; + curp->outman = man_man; break; - default: - curp->outdata = ascii_alloc(); + case OUTT_PDF: + /* FALLTHROUGH */ + case OUTT_ASCII: + /* FALLTHROUGH */ + case OUTT_UTF8: + /* FALLTHROUGH */ + case OUTT_LOCALE: + /* FALLTHROUGH */ + case OUTT_PS: curp->outman = terminal_man; curp->outmdoc = terminal_mdoc; - curp->outfree = terminal_free; break; + default: + break; } } + mparse_result(curp->mp, &mdoc, &man, NULL); + /* Execute the out device, if it exists. */ if (man && curp->outman) @@ -464,151 +568,150 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if (mdoc && curp->outmdoc) (*curp->outmdoc)(curp->outdata, mdoc); - return(1); -} + cleanup: + mparse_reset(curp->mp); -static int -pset(const char *buf, int pos, struct curparse *curp, - struct man **man, struct mdoc **mdoc) + if (*level < rc) + *level = rc; +} + +static enum mandoclevel +passthrough(const char *file, int fd) { - int i; + char buf[BUFSIZ]; + const char *syscall; + ssize_t nr, nw, off; - /* - * Try to intuit which kind of manual parser should be used. If - * passed in by command-line (-man, -mdoc), then use that - * explicitly. If passed as -mandoc, then try to guess from the - * line: either skip dot-lines, use -mdoc when finding `.Dt', or - * default to -man, which is more lenient. - */ + while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0) + for (off = 0; off < nr; off += nw) + if ((nw = write(STDOUT_FILENO, buf + off, + (size_t)(nr - off))) == -1 || nw == 0) { + close(fd); + syscall = "write"; + goto fail; + } - if (buf[0] == '.') { - for (i = 1; buf[i]; i++) - if (' ' != buf[i] && '\t' != buf[i]) - break; - if (0 == buf[i]) - return(1); - } + close(fd); - switch (curp->inttype) { - case (INTT_MDOC): - if (NULL == curp->mdoc) - curp->mdoc = mdoc_init(curp); - if (NULL == (*mdoc = curp->mdoc)) - return(0); - curp->lastmdoc = *mdoc; - return(1); - case (INTT_MAN): - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - curp->lastman = *man; - return(1); - default: - break; - } + if (nr == 0) + return(MANDOCLEVEL_OK); - if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3)) { - if (NULL == curp->mdoc) - curp->mdoc = mdoc_init(curp); - if (NULL == (*mdoc = curp->mdoc)) - return(0); - curp->lastmdoc = *mdoc; - return(1); - } + syscall = "read"; +fail: + fprintf(stderr, "%s: %s: SYSERR: %s: %s", + progname, file, syscall, strerror(errno)); + return(MANDOCLEVEL_SYSERR); +} - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) +static int +koptions(int *options, char *arg) +{ + + if ( ! strcmp(arg, "utf-8")) { + *options |= MPARSE_UTF8; + *options &= ~MPARSE_LATIN1; + } else if ( ! strcmp(arg, "iso-8859-1")) { + *options |= MPARSE_LATIN1; + *options &= ~MPARSE_UTF8; + } else if ( ! strcmp(arg, "us-ascii")) { + *options &= ~(MPARSE_UTF8 | MPARSE_LATIN1); + } else { + fprintf(stderr, "%s: -K%s: Bad argument\n", + progname, arg); return(0); - curp->lastman = *man; + } return(1); } - static int -moptions(enum intt *tflags, char *arg) +moptions(int *options, char *arg) { - if (0 == strcmp(arg, "doc")) - *tflags = INTT_MDOC; + if (arg == NULL) + /* nothing to do */; + else if (0 == strcmp(arg, "doc")) + *options |= MPARSE_MDOC; else if (0 == strcmp(arg, "andoc")) - *tflags = INTT_AUTO; + /* nothing to do */; else if (0 == strcmp(arg, "an")) - *tflags = INTT_MAN; + *options |= MPARSE_MAN; else { - warnx("bad argument: -m%s", arg); + fprintf(stderr, "%s: -m%s: Bad argument\n", + progname, arg); return(0); } return(1); } - static int -toptions(enum outt *tflags, char *arg) +toptions(struct curparse *curp, char *arg) { if (0 == strcmp(arg, "ascii")) - *tflags = OUTT_ASCII; - else if (0 == strcmp(arg, "lint")) - *tflags = OUTT_LINT; - else if (0 == strcmp(arg, "tree")) - *tflags = OUTT_TREE; + curp->outtype = OUTT_ASCII; + else if (0 == strcmp(arg, "lint")) { + curp->outtype = OUTT_LINT; + curp->wlevel = MANDOCLEVEL_WARNING; + } else if (0 == strcmp(arg, "tree")) + curp->outtype = OUTT_TREE; + else if (0 == strcmp(arg, "man")) + curp->outtype = OUTT_MAN; else if (0 == strcmp(arg, "html")) - *tflags = OUTT_HTML; + curp->outtype = OUTT_HTML; + else if (0 == strcmp(arg, "utf8")) + curp->outtype = OUTT_UTF8; + else if (0 == strcmp(arg, "locale")) + curp->outtype = OUTT_LOCALE; + else if (0 == strcmp(arg, "xhtml")) + curp->outtype = OUTT_XHTML; + else if (0 == strcmp(arg, "ps")) + curp->outtype = OUTT_PS; + else if (0 == strcmp(arg, "pdf")) + curp->outtype = OUTT_PDF; else { - warnx("bad argument: -T%s", arg); + fprintf(stderr, "%s: -T%s: Bad argument\n", + progname, arg); return(0); } return(1); } - static int -foptions(int *fflags, char *arg) +woptions(struct curparse *curp, char *arg) { char *v, *o; - const char *toks[8]; + const char *toks[6]; - toks[0] = "ign-scope"; - toks[1] = "no-ign-escape"; - toks[2] = "no-ign-macro"; - toks[3] = "no-ign-chars"; - toks[4] = "ign-errors"; - toks[5] = "strict"; - toks[6] = "ign-escape"; - toks[7] = NULL; + toks[0] = "stop"; + toks[1] = "all"; + toks[2] = "warning"; + toks[3] = "error"; + toks[4] = "fatal"; + toks[5] = NULL; while (*arg) { o = arg; switch (getsubopt(&arg, UNCONST(toks), &v)) { - case (0): - *fflags |= IGN_SCOPE; + case 0: + curp->wstop = 1; break; - case (1): - *fflags |= NO_IGN_ESCAPE; + case 1: + /* FALLTHROUGH */ + case 2: + curp->wlevel = MANDOCLEVEL_WARNING; break; - case (2): - *fflags |= NO_IGN_MACRO; + case 3: + curp->wlevel = MANDOCLEVEL_ERROR; break; - case (3): - *fflags |= NO_IGN_CHARS; + case 4: + curp->wlevel = MANDOCLEVEL_FATAL; break; - case (4): - *fflags |= IGN_ERRORS; - break; - case (5): - *fflags |= NO_IGN_ESCAPE | - NO_IGN_MACRO | NO_IGN_CHARS; - break; - case (6): - *fflags &= ~NO_IGN_ESCAPE; - break; default: - warnx("bad argument: -f%s", o); + fprintf(stderr, "%s: -W%s: Bad argument\n", + progname, o); return(0); } } @@ -616,67 +719,100 @@ foptions(int *fflags, char *arg) return(1); } - -static int -woptions(int *wflags, char *arg) +static void +mmsg(enum mandocerr t, enum mandoclevel lvl, + const char *file, int line, int col, const char *msg) { - char *v, *o; - const char *toks[3]; + const char *mparse_msg; - toks[0] = "all"; - toks[1] = "error"; - toks[2] = NULL; + fprintf(stderr, "%s: %s:", progname, file); - while (*arg) { - o = arg; - switch (getsubopt(&arg, UNCONST(toks), &v)) { - case (0): - *wflags |= WARN_WALL; - break; - case (1): - *wflags |= WARN_WERR; - break; - default: - warnx("bad argument: -W%s", o); - return(0); - } - } + if (line) + fprintf(stderr, "%d:%d:", line, col + 1); - return(1); -} + fprintf(stderr, " %s", mparse_strlevel(lvl)); + if (NULL != (mparse_msg = mparse_strerror(t))) + fprintf(stderr, ": %s", mparse_msg); -/* ARGSUSED */ -static int -merr(void *arg, int line, int col, const char *msg) + if (msg) + fprintf(stderr, ": %s", msg); + + fputc('\n', stderr); +} + +static void +spawn_pager(void) { - struct curparse *curp; +#define MAX_PAGER_ARGS 16 + char *argv[MAX_PAGER_ARGS]; + const char *pager; + char *cp; + int fildes[2]; + int argc; - curp = (struct curparse *)arg; + if (pipe(fildes) == -1) { + fprintf(stderr, "%s: pipe: %s\n", + progname, strerror(errno)); + return; + } - (void)fprintf(stderr, "%s:%d:%d: error: %s\n", - curp->file, line, col + 1, msg); + switch (fork()) { + case -1: + fprintf(stderr, "%s: fork: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + case 0: + close(fildes[0]); + if (dup2(fildes[1], STDOUT_FILENO) == -1) { + fprintf(stderr, "%s: dup output: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + } + return; + default: + break; + } - return(0); -} + /* The original process becomes the pager. */ + close(fildes[1]); + if (dup2(fildes[0], STDIN_FILENO) == -1) { + fprintf(stderr, "%s: dup input: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); + } -static int -mwarn(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; + pager = getenv("MANPAGER"); + if (pager == NULL || *pager == '\0') + pager = getenv("PAGER"); + if (pager == NULL || *pager == '\0') + pager = "/usr/bin/more -s"; + cp = mandoc_strdup(pager); - curp = (struct curparse *)arg; + /* + * Parse the pager command into words. + * Intentionally do not do anything fancy here. + */ - if ( ! (curp->wflags & WARN_WALL)) - return(1); + argc = 0; + while (argc + 1 < MAX_PAGER_ARGS) { + argv[argc++] = cp; + cp = strchr(cp, ' '); + if (cp == NULL) + break; + *cp++ = '\0'; + while (*cp == ' ') + cp++; + if (*cp == '\0') + break; + } + argv[argc] = NULL; - (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", - curp->file, line, col + 1, msg); + /* Hand over to the pager. */ - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - return(0); + execvp(argv[0], argv); + fprintf(stderr, "%s: exec: %s\n", + progname, strerror(errno)); + exit((int)MANDOCLEVEL_SYSERR); } -