=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.60 retrieving revision 1.64 diff -u -p -r1.60 -r1.64 --- mandoc/main.c 2010/03/22 20:43:00 1.60 +++ mandoc/main.c 2010/05/14 17:59:07 1.64 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.60 2010/03/22 20:43:00 kristaps Exp $ */ +/* $Id: main.c,v 1.64 2010/05/14 17:59:07 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -75,7 +75,6 @@ struct curparse { #define FL_IGN_SCOPE (1 << 0) /* Ignore scope errors. */ #define FL_NIGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ #define FL_NIGN_MACRO (1 << 2) /* Don't ignore bad macros. */ -#define FL_NIGN_CHARS (1 << 3) /* Don't ignore bad chars. */ #define FL_IGN_ERRORS (1 << 4) /* Ignore failed parse. */ enum intt inttype; /* Input parsers... */ struct man *man; @@ -91,8 +90,7 @@ struct curparse { }; #define FL_STRICT FL_NIGN_ESCAPE | \ - FL_NIGN_MACRO | \ - FL_NIGN_CHARS + FL_NIGN_MACRO static int foptions(int *, char *); static int toptions(struct curparse *, char *); @@ -100,9 +98,9 @@ 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 *, +static void ffile(struct buf *, struct buf *, const char *, struct curparse *); -static int fdesc(struct buf *, struct buf *, +static void fdesc(struct buf *, struct buf *, struct curparse *); static int pset(const char *, int, struct curparse *, struct man **, struct mdoc **); @@ -112,12 +110,12 @@ static void version(void) __attribute__((noreturn)) static void usage(void) __attribute__((noreturn)); static const char *progname; +static int with_error, with_warning; - int main(int argc, char *argv[]) { - int c, rc; + int c; struct buf ln, blk; struct curparse curp; @@ -169,35 +167,19 @@ main(int argc, char *argv[]) memset(&ln, 0, sizeof(struct buf)); memset(&blk, 0, sizeof(struct buf)); - rc = 1; - if (NULL == *argv) { curp.file = ""; curp.fd = STDIN_FILENO; - c = fdesc(&blk, &ln, &curp); - if ( ! (FL_IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; + fdesc(&blk, &ln, &curp); } - while (rc && *argv) { - c = ffile(&blk, &ln, *argv, &curp); - if ( ! (FL_IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; + while (*argv) { + ffile(&blk, &ln, *argv, &curp); - argv++; - if (*argv && rc) { - if (curp.lastman) - man_reset(curp.lastman); - if (curp.lastmdoc) - mdoc_reset(curp.lastmdoc); - curp.lastman = NULL; - curp.lastmdoc = NULL; - } + if (with_error && !(curp.fflags & FL_IGN_ERRORS)) + break; + ++argv; } if (blk.buf) @@ -206,12 +188,8 @@ main(int argc, char *argv[]) free(ln.buf); if (curp.outfree) (*curp.outfree)(curp.outdata); - if (curp.mdoc) - mdoc_free(curp.mdoc); - if (curp.man) - man_free(curp.man); - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); + return((with_warning || with_error) ? EXIT_FAILURE : EXIT_SUCCESS ); } @@ -228,9 +206,9 @@ static void usage(void) { - (void)fprintf(stderr, "usage: %s [-V] [-foption...] " + (void)fprintf(stderr, "usage: %s [-V] [-foption] " "[-mformat] [-Ooption] [-Toutput] " - "[-Werr...]\n", progname); + "[-Werr] [file...]\n", progname); exit(EXIT_FAILURE); } @@ -246,12 +224,10 @@ man_init(struct curparse *curp) /* Defaults from mandoc.1. */ - pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; + pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE; if (curp->fflags & FL_NIGN_MACRO) pflags &= ~MAN_IGN_MACRO; - if (curp->fflags & FL_NIGN_CHARS) - pflags &= ~MAN_IGN_CHARS; if (curp->fflags & FL_NIGN_ESCAPE) pflags &= ~MAN_IGN_ESCAPE; @@ -270,7 +246,7 @@ mdoc_init(struct curparse *curp) /* Defaults from mandoc.1. */ - pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; + pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE; if (curp->fflags & FL_IGN_SCOPE) pflags |= MDOC_IGN_SCOPE; @@ -278,35 +254,31 @@ mdoc_init(struct curparse *curp) pflags &= ~MDOC_IGN_ESCAPE; if (curp->fflags & FL_NIGN_MACRO) pflags &= ~MDOC_IGN_MACRO; - if (curp->fflags & FL_NIGN_CHARS) - pflags &= ~MDOC_IGN_CHARS; return(mdoc_alloc(curp, pflags, &mdoccb)); } -static int +static void 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))) { perror(curp->file); - return(-1); + with_error = 1; + return; } - c = fdesc(blk, ln, curp); + fdesc(blk, ln, curp); if (-1 == close(curp->fd)) perror(curp->file); - - return(c); } -static int +static void fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) { size_t sz; @@ -326,17 +298,23 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse * growable, hence passed in by ptr-ptr. */ - if (-1 == fstat(curp->fd, &st)) + if (-1 == fstat(curp->fd, &st)) { perror(curp->file); - else if ((size_t)st.st_blksize > sz) + with_error = 1; + return; + } + if ((size_t)st.st_blksize > sz) sz = st.st_blksize; if (sz > blk->sz) { - blk->buf = realloc(blk->buf, sz); - if (NULL == blk->buf) { + void *buf = realloc(blk->buf, sz); + + if (NULL == buf) { perror(NULL); - exit(EXIT_FAILURE); + with_error = 1; + return; } + blk->buf = buf; blk->sz = sz; } @@ -345,7 +323,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse for (lnn = pos = comment = 0; ; ) { if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { perror(curp->file); - return(-1); + goto bailout; } else if (0 == ssz) break; @@ -357,7 +335,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse ln->buf = realloc(ln->buf, ln->sz); if (NULL == ln->buf) { perror(NULL); - return(EXIT_FAILURE); + goto bailout; } } @@ -380,6 +358,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse comment = 1; pos -= 2; + for (; pos > 0; --pos) { + if (ln->buf[pos - 1] != ' ') + break; + if (pos > 2 && ln->buf[pos - 2] == '\\') + break; + } continue; } @@ -404,16 +388,16 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if ( ! (man || mdoc) && ! pset(ln->buf, pos, curp, &man, &mdoc)) - return(-1); + goto bailout; pos = comment = 0; /* Pass down into parsers. */ if (man && ! man_parseln(man, lnn, ln->buf)) - return(0); + goto bailout; if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) - return(0); + goto bailout; } } @@ -421,13 +405,13 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if ( ! (man || mdoc)) { fprintf(stderr, "%s: Not a manual\n", curp->file); - return(0); + goto bailout; } if (mdoc && ! mdoc_endparse(mdoc)) - return(0); + goto bailout; if (man && ! man_endparse(man)) - return(0); + goto bailout; /* If unset, allocate output dev now (if applicable). */ @@ -467,7 +451,20 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if (mdoc && curp->outmdoc) (*curp->outmdoc)(curp->outdata, mdoc); - return(1); + cleanup: + if (curp->mdoc) { + mdoc_free(curp->mdoc); + curp->mdoc = NULL; + } + if (curp->man) { + man_free(curp->man); + curp->man = NULL; + } + return; + + bailout: + with_error = 1; + goto cleanup; } @@ -584,11 +581,10 @@ foptions(int *fflags, char *arg) 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[3] = "ign-errors"; + toks[4] = "strict"; + toks[5] = "ign-escape"; + toks[6] = NULL; while (*arg) { o = arg; @@ -603,15 +599,12 @@ foptions(int *fflags, char *arg) *fflags |= FL_NIGN_MACRO; break; case (3): - *fflags |= FL_NIGN_CHARS; - break; - case (4): *fflags |= FL_IGN_ERRORS; break; - case (5): + case (4): *fflags |= FL_STRICT; break; - case (6): + case (5): *fflags &= ~FL_NIGN_ESCAPE; break; default: @@ -664,6 +657,8 @@ merr(void *arg, int line, int col, const char *msg) (void)fprintf(stderr, "%s:%d:%d: error: %s\n", curp->file, line, col + 1, msg); + with_error = 1; + return(0); } @@ -681,9 +676,12 @@ mwarn(void *arg, int line, int col, const char *msg) (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", curp->file, line, col + 1, msg); - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - return(0); + with_warning = 1; + if (curp->wflags & WARN_WERR) { + with_error = 1; + return(0); + } + + return(1); }