=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.92 retrieving revision 1.99 diff -u -p -r1.92 -r1.99 --- mandoc/main.c 2010/06/27 15:52:41 1.92 +++ mandoc/main.c 2010/07/20 14:56:42 1.99 @@ -1,6 +1,7 @@ -/* $Id: main.c,v 1.92 2010/06/27 15:52:41 kristaps Exp $ */ +/* $Id: main.c,v 1.99 2010/07/20 14:56:42 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2010 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,6 +23,7 @@ #include #include +#include #include #include #include @@ -30,7 +32,6 @@ #include #include "mandoc.h" -#include "regs.h" #include "main.h" #include "mdoc.h" #include "man.h" @@ -99,6 +100,9 @@ struct curparse { static const char * const mandocerrs[MANDOCERR_MAX] = { "ok", + + "generic warning", + "text should be uppercase", "sections out of conventional order", "section name repeats", @@ -107,6 +111,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "list type must come first", "bad standard", "bad library", + "tab in non-literal context", "bad escape sequence", "unterminated quoted string", "argument requires the width argument", @@ -117,7 +122,11 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "unknown manual section", "section not in conventional manual section", "end of line whitespace", + "blocks badly nested", "scope open on exit", + + "generic error", + "NAME section must come first", "bad Boolean value", "child violates parent syntax", @@ -137,7 +146,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "bad comment style", "unknown macro will be lost", "line scope broken", - "scope broken", "argument count wrong", "request scope close w/none open", "scope already open", @@ -147,13 +155,17 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "no title in document", "missing list type", "missing display type", + "missing font type", "line argument(s) will be lost", "body argument(s) will be lost", + + "generic fatal error", + "column syntax is inconsistent", - "missing font type", "displays may not be nested", "unsupported display type", - "no scope to rewind: syntax violated", + "blocks badly nested", + "no such block is open", "scope broken, syntax violated", "line scope broken, syntax violated", "argument count wrong, violates syntax", @@ -182,8 +194,8 @@ static void version(void) __attribute__((noreturn)) static int woptions(int *, char *); static const char *progname; -static int with_error; -static int with_warning; +static int with_fatal; +static int with_error; int main(int argc, char *argv[]) @@ -246,7 +258,7 @@ main(int argc, char *argv[]) while (*argv) { ffile(*argv, &curp); - if (with_error && !(curp.fflags & FL_IGN_ERRORS)) + if (with_fatal && !(curp.fflags & FL_IGN_ERRORS)) break; ++argv; } @@ -260,7 +272,7 @@ main(int argc, char *argv[]) if (curp.roff) roff_free(curp.roff); - return((with_warning || with_error) ? + return((with_fatal || with_error) ? EXIT_FAILURE : EXIT_SUCCESS); } @@ -338,7 +350,7 @@ ffile(const char *file, struct curparse *curp) curp->file = file; if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { perror(curp->file); - with_error = 1; + with_fatal = 1; return; } @@ -379,7 +391,7 @@ read_whole_file(struct curparse *curp, struct buf *fb, if (-1 == fstat(curp->fd, &st)) { perror(curp->file); - with_error = 1; + with_fatal = 1; return(0); } @@ -394,7 +406,7 @@ read_whole_file(struct curparse *curp, struct buf *fb, if (st.st_size >= (1U << 31)) { fprintf(stderr, "%s: input too large\n", curp->file); - with_error = 1; + with_fatal = 1; return(0); } *with_mmap = 1; @@ -438,7 +450,7 @@ read_whole_file(struct curparse *curp, struct buf *fb, free(fb->buf); fb->buf = NULL; - with_error = 1; + with_fatal = 1; return(0); } @@ -481,6 +493,26 @@ fdesc(struct curparse *curp) ++lnn; break; } + + /* + * Warn about bogus characters. If you're using + * non-ASCII encoding, you're screwing your + * readers. Since I'd rather this not happen, + * I'll be helpful and drop these characters so + * we don't display gibberish. Note to manual + * writers: use special characters. + */ + + if ( ! isgraph((u_char)blk.buf[i]) && + ! isblank((u_char)blk.buf[i])) { + if ( ! mmsg(MANDOCERR_BADCHAR, curp, + lnn_start, pos, + "ignoring byte")) + goto bailout; + i++; + continue; + } + /* Trailing backslash is like a plain character. */ if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) { if (pos >= (int)ln.sz) @@ -599,7 +631,7 @@ fdesc(struct curparse *curp) curp->outfree = ascii_free; break; case (OUTT_PS): - curp->outdata = ps_alloc(); + curp->outdata = ps_alloc(curp->outopts); curp->outfree = ps_free; break; default: @@ -654,7 +686,7 @@ fdesc(struct curparse *curp) return; bailout: - with_error = 1; + with_fatal = 1; goto cleanup; } @@ -839,30 +871,37 @@ static int mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) { struct curparse *cp; + const char *level; + int rc; cp = (struct curparse *)arg; + level = NULL; + rc = 1; - if (t <= MANDOCERR_ERROR) { - if ( ! (cp->wflags & WARN_WALL)) + if (t >= MANDOCERR_FATAL) { + with_fatal = 1; + level = "FATAL"; + rc = 0; + } else { + if ( ! (WARN_WALL & cp->wflags)) return(1); - with_warning = 1; - } else - with_error = 1; + if (t >= MANDOCERR_ERROR) { + with_error = 1; + level = "ERROR"; + } + if (WARN_WERR & cp->wflags) { + with_fatal = 1; + rc = 0; + } + } - fprintf(stderr, "%s:%d:%d: %s", cp->file, - ln, col + 1, mandocerrs[t]); - + fprintf(stderr, "%s:%d:%d:", cp->file, ln, col + 1); + if (level) + fprintf(stderr, " %s:", level); + fprintf(stderr, " %s", mandocerrs[t]); if (msg) fprintf(stderr, ": %s", msg); - fputc('\n', stderr); - /* This is superfluous, but whatever. */ - if (t > MANDOCERR_ERROR) - return(0); - if (cp->wflags & WARN_WERR) { - with_error = 1; - return(0); - } - return(1); + return(rc); }