=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.37 retrieving revision 1.43 diff -u -p -r1.37 -r1.43 --- mandoc/main.c 2009/07/06 13:08:12 1.37 +++ mandoc/main.c 2009/09/16 22:17:27 1.43 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.37 2009/07/06 13:08:12 kristaps Exp $ */ +/* $Id: main.c,v 1.43 2009/09/16 22:17:27 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -40,8 +40,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 +58,9 @@ enum intt { enum outt { OUTT_ASCII = 0, OUTT_TREE, +#if 1 + OUTT_HTML, +#endif OUTT_LINT }; @@ -72,6 +75,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; @@ -84,11 +88,17 @@ struct curparse { void *outdata; }; +#if 1 +extern void *html_alloc(void); +extern void html_mdoc(void *, const struct mdoc *); +extern void html_man(void *, const struct man *); +extern void html_free(void *); +#endif 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 *); @@ -161,13 +171,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 +301,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 +342,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 +352,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 +364,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 +411,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 +427,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 +441,14 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if ( ! (curp->outman && curp->outmdoc)) { switch (curp->outtype) { +#if 1 + case (OUTT_HTML): + curp->outdata = html_alloc(); + curp->outman = html_man; + curp->outmdoc = html_mdoc; + curp->outfree = html_free; + break; +#endif case (OUTT_TREE): curp->outman = tree_man; curp->outmdoc = tree_mdoc; @@ -440,11 +467,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 +563,10 @@ toptions(enum outt *tflags, char *arg) *tflags = OUTT_LINT; else if (0 == strcmp(arg, "tree")) *tflags = OUTT_TREE; +#if 1 + else if (0 == strcmp(arg, "html")) + *tflags = OUTT_HTML; +#endif else { warnx("bad argument: -T%s", arg); return(0); @@ -551,14 +580,15 @@ static int foptions(int *fflags, char *arg) { char *v, *o; - char *toks[6]; + 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; @@ -576,6 +606,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; @@ -626,8 +659,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 +676,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); }