=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.29 retrieving revision 1.45 diff -u -p -r1.29 -r1.45 --- mandoc/main.c 2009/06/16 19:13:28 1.29 +++ mandoc/main.c 2009/10/13 10:21:24 1.45 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.29 2009/06/16 19:13:28 kristaps Exp $ */ +/* $Id: main.c,v 1.45 2009/10/13 10:21:24 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -27,6 +28,8 @@ #include "mdoc.h" #include "man.h" +#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) + /* Account for FreeBSD and Linux in our declarations. */ #ifdef __linux__ @@ -40,8 +43,8 @@ extern int getsubopt(char **, char * const *, char # endif #endif -typedef int (*out_mdoc)(void *, const struct mdoc *); -typedef int (*out_man)(void *, const struct man *); +typedef void (*out_mdoc)(void *, const struct mdoc *); +typedef void (*out_man)(void *, const struct man *); typedef void (*out_free)(void *); struct buf { @@ -58,6 +61,7 @@ enum intt { enum outt { OUTT_ASCII = 0, OUTT_TREE, + OUTT_HTML, OUTT_LINT }; @@ -65,15 +69,14 @@ struct curparse { const char *file; /* Current parse. */ int fd; /* Current parse. */ int wflags; -#define WARN_WALL 0x03 /* All-warnings mask. */ -#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ -#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ +#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; @@ -84,13 +87,18 @@ struct curparse { out_man outman; out_free outfree; void *outdata; + char *outopts; }; +extern void *html_alloc(char *); +extern void html_mdoc(void *, const struct mdoc *); +extern void html_man(void *, const struct man *); +extern void html_free(void *); extern void *ascii_alloc(void); -extern int tree_mdoc(void *, const struct mdoc *); -extern int tree_man(void *, const struct man *); -extern int terminal_mdoc(void *, const struct mdoc *); -extern int terminal_man(void *, const struct man *); +extern void tree_mdoc(void *, const struct mdoc *); +extern void tree_man(void *, const struct man *); +extern void terminal_mdoc(void *, const struct mdoc *); +extern void terminal_man(void *, const struct man *); extern void terminal_free(void *); static int foptions(int *, char *); @@ -98,11 +106,7 @@ 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 manwarn(void *, int, int, const char *); -static int mdocwarn(void *, int, int, - enum mdoc_warn, const char *); -static int fstdin(struct buf *, struct buf *, - struct curparse *); +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 *, @@ -130,23 +134,26 @@ main(int argc, char *argv[]) curp.outtype = OUTT_ASCII; /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:VW:T:"))) + while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:"))) switch (c) { case ('f'): if ( ! foptions(&curp.fflags, optarg)) - return(0); + return(EXIT_FAILURE); break; case ('m'): if ( ! moptions(&curp.inttype, optarg)) - return(0); + return(EXIT_FAILURE); break; + case ('o'): + curp.outopts = optarg; + break; case ('T'): if ( ! toptions(&curp.outtype, optarg)) - return(0); + return(EXIT_FAILURE); break; case ('W'): if ( ! woptions(&curp.wflags, optarg)) - return(0); + return(EXIT_FAILURE); break; case ('V'): version(); @@ -159,20 +166,29 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - /* Configure buffers. */ - bzero(&ln, sizeof(struct buf)); bzero(&blk, sizeof(struct buf)); rc = 1; - if (NULL == *argv) - if ( ! fstdin(&blk, &ln, &curp)) - rc = 0; + if (NULL == *argv) { + curp.file = ""; + curp.fd = STDIN_FILENO; + c = fdesc(&blk, &ln, &curp); + if ( ! (IGN_ERRORS & curp.fflags)) + rc = 1 == c ? 1 : 0; + else + rc = -1 == c ? 0 : 1; + } + while (rc && *argv) { - if ( ! ffile(&blk, &ln, *argv, &curp)) - rc = 0; + c = ffile(&blk, &ln, *argv, &curp); + if ( ! (IGN_ERRORS & curp.fflags)) + rc = 1 == c ? 1 : 0; + else + rc = -1 == c ? 0 : 1; + argv++; if (*argv && rc) { if (curp.lastman) @@ -190,8 +206,6 @@ main(int argc, char *argv[]) free(blk.buf); if (ln.buf) free(ln.buf); - - /* TODO: have a curp_free routine. */ if (curp.outfree) (*curp.outfree)(curp.outdata); if (curp.mdoc) @@ -231,19 +245,18 @@ man_init(struct curparse *curp) struct man_cb mancb; mancb.man_err = merr; - mancb.man_warn = manwarn; + mancb.man_warn = mwarn; - /* - * Default behaviour is to ignore unknown macros. This is - * specified in mandoc.1. - */ + /* Defaults from mandoc.1. */ - pflags = MAN_IGN_MACRO; + pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; - /* Override default behaviour... */ - 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"); @@ -260,18 +273,12 @@ mdoc_init(struct curparse *curp) struct mdoc_cb mdoccb; mdoccb.mdoc_err = merr; - mdoccb.mdoc_warn = mdocwarn; + mdoccb.mdoc_warn = mwarn; - /* - * Default behaviour is to ignore unknown macros, escape - * sequences and characters (very liberal). This is specified - * in mandoc.1. - */ + /* Defaults from mandoc.1. */ pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; - /* Override default behaviour... */ - if (curp->fflags & IGN_SCOPE) pflags |= MDOC_IGN_SCOPE; if (curp->fflags & NO_IGN_ESCAPE) @@ -289,16 +296,6 @@ mdoc_init(struct curparse *curp) static int -fstdin(struct buf *blk, struct buf *ln, struct curparse *curp) -{ - - curp->file = ""; - curp->fd = STDIN_FILENO; - return(fdesc(blk, ln, curp)); -} - - -static int ffile(struct buf *blk, struct buf *ln, const char *file, struct curparse *curp) { @@ -307,7 +304,7 @@ ffile(struct buf *blk, struct buf *ln, curp->file = file; if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { warn("%s", curp->file); - return(0); + return(-1); } c = fdesc(blk, ln, curp); @@ -340,7 +337,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse */ if (-1 == fstat(curp->fd, &st)) - warnx("%s", curp->file); + warn("%s", curp->file); else if ((size_t)st.st_blksize > sz) sz = st.st_blksize; @@ -348,7 +345,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse blk->buf = realloc(blk->buf, sz); if (NULL == blk->buf) { warn("realloc"); - return(0); + return(-1); } blk->sz = sz; } @@ -358,7 +355,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse for (lnn = pos = comment = 0; ; ) { if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { warn("%s", curp->file); - return(0); + return(-1); } else if (0 == ssz) break; @@ -370,7 +367,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse ln->buf = realloc(ln->buf, ln->sz); if (NULL == ln->buf) { warn("realloc"); - return(0); + return(-1); } } @@ -417,10 +414,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if ( ! (man || mdoc) && ! pset(ln->buf, pos, curp, &man, &mdoc)) - return(0); + return(-1); pos = comment = 0; + /* Pass down into parsers. */ + if (man && ! man_parseln(man, lnn, ln->buf)) return(0); if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) @@ -431,7 +430,8 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse /* NOTE a parser may not have been assigned, yet. */ if ( ! (man || mdoc)) { - warnx("%s: not a manual", curp->file); + (void)fprintf(stderr, "%s: not a manual\n", + curp->file); return(0); } @@ -444,6 +444,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if ( ! (curp->outman && curp->outmdoc)) { switch (curp->outtype) { + case (OUTT_HTML): + curp->outdata = html_alloc(curp->outopts); + curp->outman = html_man; + curp->outmdoc = html_mdoc; + curp->outfree = html_free; + break; case (OUTT_TREE): curp->outman = tree_man; curp->outmdoc = tree_mdoc; @@ -462,11 +468,9 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse /* Execute the out device, if it exists. */ if (man && curp->outman) - if ( ! (*curp->outman)(curp->outdata, man)) - return(0); + (*curp->outman)(curp->outdata, man); if (mdoc && curp->outmdoc) - if ( ! (*curp->outmdoc)(curp->outdata, mdoc)) - return(0); + (*curp->outmdoc)(curp->outdata, mdoc); return(1); } @@ -482,7 +486,7 @@ pset(const char *buf, int pos, struct curparse *curp, * 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 comments, use -mdoc when finding `.Dt', or + * line: either skip dot-lines, use -mdoc when finding `.Dt', or * default to -man, which is more lenient. */ @@ -560,6 +564,8 @@ toptions(enum outt *tflags, char *arg) *tflags = OUTT_LINT; else if (0 == strcmp(arg, "tree")) *tflags = OUTT_TREE; + else if (0 == strcmp(arg, "html")) + *tflags = OUTT_HTML; else { warnx("bad argument: -T%s", arg); return(0); @@ -569,25 +575,23 @@ toptions(enum outt *tflags, char *arg) } -/* - * Parse out the options for [-fopt...] setting compiler options. These - * can be comma-delimited or called again. - */ static int foptions(int *fflags, char *arg) { - char *v; - char *toks[6]; + char *v, *o; + const char *toks[7]; toks[0] = "ign-scope"; toks[1] = "no-ign-escape"; toks[2] = "no-ign-macro"; toks[3] = "no-ign-chars"; - toks[4] = "strict"; - toks[5] = NULL; + toks[4] = "ign-errors"; + toks[5] = "strict"; + toks[6] = NULL; - while (*arg) - switch (getsubopt(&arg, toks, &v)) { + while (*arg) { + o = arg; + switch (getsubopt(&arg, UNCONST(toks), &v)) { case (0): *fflags |= IGN_SCOPE; break; @@ -601,52 +605,46 @@ foptions(int *fflags, char *arg) *fflags |= NO_IGN_CHARS; break; case (4): + *fflags |= IGN_ERRORS; + break; + case (5): *fflags |= NO_IGN_ESCAPE | NO_IGN_MACRO | NO_IGN_CHARS; break; default: - warnx("bad argument: -f%s", arg); + warnx("bad argument: -f%s", o); return(0); } + } return(1); } -/* - * Parse out the options for [-Werr...], which sets warning modes. - * These can be comma-delimited or called again. - */ static int woptions(int *wflags, char *arg) { - char *v; - char *toks[5]; + char *v, *o; + const char *toks[3]; toks[0] = "all"; - toks[1] = "compat"; - toks[2] = "syntax"; - toks[3] = "error"; - toks[4] = NULL; + toks[1] = "error"; + toks[2] = NULL; - while (*arg) - switch (getsubopt(&arg, toks, &v)) { + while (*arg) { + o = arg; + switch (getsubopt(&arg, UNCONST(toks), &v)) { case (0): *wflags |= WARN_WALL; break; case (1): - *wflags |= WARN_WCOMPAT; - break; - case (2): - *wflags |= WARN_WSYNTAX; - break; - case (3): *wflags |= WARN_WERR; break; default: - warnx("bad argument: -W%s", arg); + warnx("bad argument: -W%s", o); return(0); } + } return(1); } @@ -659,77 +657,30 @@ merr(void *arg, int line, int col, const char *msg) struct curparse *curp; curp = (struct curparse *)arg; - warnx("%s:%d: error: %s (column %d)", - curp->file, line, msg, col); - /* Always exit on errors... */ + (void)fprintf(stderr, "%s:%d:%d: error: %s\n", + curp->file, line, col + 1, msg); + return(0); } static int -mdocwarn(void *arg, int line, int col, - enum mdoc_warn type, const char *msg) +mwarn(void *arg, int line, int col, const char *msg) { struct curparse *curp; - char *wtype; curp = (struct curparse *)arg; - wtype = NULL; - switch (type) { - case (WARN_COMPAT): - wtype = "compat"; - if (curp->wflags & WARN_WCOMPAT) - break; + if ( ! (curp->wflags & WARN_WALL)) return(1); - case (WARN_SYNTAX): - wtype = "syntax"; - if (curp->wflags & WARN_WSYNTAX) - break; - return(1); - } - assert(wtype); - warnx("%s:%d: %s warning: %s (column %d)", - curp->file, line, wtype, msg, col); + (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", + curp->file, line, col + 1, msg); if ( ! (curp->wflags & WARN_WERR)) return(1); - /* - * If the -Werror flag is passed in, as in gcc, then all - * warnings are considered as errors. - */ - - warnx("%s: considering warnings as errors", - __progname); return(0); } - -static int -manwarn(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; - - curp = (struct curparse *)arg; - - if ( ! (curp->wflags & WARN_WSYNTAX)) - return(1); - - warnx("%s:%d: syntax warning: %s (column %d)", - curp->file, line, msg, col); - - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - /* - * If the -Werror flag is passed in, as in gcc, then all - * warnings are considered as errors. - */ - - warnx("%s: considering warnings as errors", - __progname); - return(0); -}