=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.37 retrieving revision 1.47 diff -u -p -r1.37 -r1.47 --- mandoc/main.c 2009/07/06 13:08:12 1.37 +++ mandoc/main.c 2009/10/26 04:15:42 1.47 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.37 2009/07/06 13:08:12 kristaps Exp $ */ +/* $Id: main.c,v 1.47 2009/10/26 04:15:42 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -20,13 +20,17 @@ #include #include #include +#include #include #include #include #include "mdoc.h" #include "man.h" +#include "main.h" +#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) + /* Account for FreeBSD and Linux in our declarations. */ #ifdef __linux__ @@ -40,8 +44,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 +62,7 @@ enum intt { enum outt { OUTT_ASCII = 0, OUTT_TREE, + OUTT_HTML, OUTT_LINT }; @@ -72,6 +77,7 @@ struct curparse { #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; @@ -82,15 +88,9 @@ struct curparse { out_man outman; out_free outfree; void *outdata; + char *outopts; }; -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 terminal_free(void *); - static int foptions(int *, char *); static int toptions(enum outt *, char *); static int moptions(enum intt *, char *); @@ -124,7 +124,7 @@ 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)) @@ -134,6 +134,9 @@ main(int argc, char *argv[]) if ( ! moptions(&curp.inttype, optarg)) return(EXIT_FAILURE); break; + case ('o'): + curp.outopts = optarg; + break; case ('T'): if ( ! toptions(&curp.outtype, optarg)) return(EXIT_FAILURE); @@ -161,13 +164,21 @@ main(int argc, char *argv[]) if (NULL == *argv) { curp.file = ""; curp.fd = STDIN_FILENO; - if ( ! fdesc(&blk, &ln, &curp)) - rc = 0; + + 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) @@ -283,7 +294,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); @@ -324,7 +335,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; } @@ -334,7 +345,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; @@ -346,7 +357,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); } } @@ -393,7 +404,7 @@ 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; @@ -409,7 +420,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); } @@ -422,6 +434,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; @@ -440,11 +458,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); } @@ -538,6 +554,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); @@ -551,18 +569,19 @@ static int foptions(int *fflags, char *arg) { char *v, *o; - char *toks[6]; + 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) { o = arg; - switch (getsubopt(&arg, toks, &v)) { + switch (getsubopt(&arg, UNCONST(toks), &v)) { case (0): *fflags |= IGN_SCOPE; break; @@ -576,6 +595,9 @@ 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; @@ -593,7 +615,7 @@ static int woptions(int *wflags, char *arg) { char *v, *o; - char *toks[3]; + const char *toks[3]; toks[0] = "all"; toks[1] = "error"; @@ -601,7 +623,7 @@ woptions(int *wflags, char *arg) while (*arg) { o = arg; - switch (getsubopt(&arg, toks, &v)) { + switch (getsubopt(&arg, UNCONST(toks), &v)) { case (0): *wflags |= WARN_WALL; break; @@ -626,8 +648,8 @@ merr(void *arg, int line, int col, const char *msg) curp = (struct curparse *)arg; - warnx("%s:%d: error: %s (column %d)", - curp->file, line, msg, col); + (void)fprintf(stderr, "%s:%d:%d: error: %s\n", + curp->file, line, col + 1, msg); return(0); } @@ -643,13 +665,12 @@ mwarn(void *arg, int line, int col, const char *msg) if ( ! (curp->wflags & WARN_WALL)) return(1); - warnx("%s:%d: syntax warning: %s (column %d)", - curp->file, line, msg, col); + (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", + curp->file, line, col + 1, msg); if ( ! (curp->wflags & WARN_WERR)) return(1); - warnx("considering warnings as errors"); return(0); }