version 1.90, 2010/06/26 15:22:19 |
version 1.96, 2010/07/02 12:54:33 |
Line 88 struct curparse { |
|
Line 88 struct curparse { |
|
struct man *man; /* man parser */ |
struct man *man; /* man parser */ |
struct mdoc *mdoc; /* mdoc parser */ |
struct mdoc *mdoc; /* mdoc parser */ |
struct roff *roff; /* roff parser (!NULL) */ |
struct roff *roff; /* roff parser (!NULL) */ |
|
struct regset regs; /* roff registers */ |
enum outt outtype; /* which output to use */ |
enum outt outtype; /* which output to use */ |
out_mdoc outmdoc; /* mdoc output ptr */ |
out_mdoc outmdoc; /* mdoc output ptr */ |
out_man outman; /* man output ptr */ |
out_man outman; /* man output ptr */ |
Line 98 struct curparse { |
|
Line 99 struct curparse { |
|
|
|
static const char * const mandocerrs[MANDOCERR_MAX] = { |
static const char * const mandocerrs[MANDOCERR_MAX] = { |
"ok", |
"ok", |
|
|
|
"generic warning", |
|
|
"text should be uppercase", |
"text should be uppercase", |
"sections out of conventional order", |
"sections out of conventional order", |
"section name repeats", |
"section name repeats", |
Line 116 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 120 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"unknown manual section", |
"unknown manual section", |
"section not in conventional manual section", |
"section not in conventional manual section", |
"end of line whitespace", |
"end of line whitespace", |
|
"blocks badly nested", |
"scope open on exit", |
"scope open on exit", |
|
|
|
"generic error", |
|
|
"NAME section must come first", |
"NAME section must come first", |
"bad Boolean value", |
"bad Boolean value", |
"child violates parent syntax", |
"child violates parent syntax", |
Line 136 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 144 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"bad comment style", |
"bad comment style", |
"unknown macro will be lost", |
"unknown macro will be lost", |
"line scope broken", |
"line scope broken", |
"scope broken", |
|
"argument count wrong", |
"argument count wrong", |
"request scope close w/none open", |
"request scope close w/none open", |
"scope already open", |
"scope already open", |
Line 146 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 153 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"no title in document", |
"no title in document", |
"missing list type", |
"missing list type", |
"missing display type", |
"missing display type", |
|
"missing font type", |
"line argument(s) will be lost", |
"line argument(s) will be lost", |
"body argument(s) will be lost", |
"body argument(s) will be lost", |
|
|
|
"generic fatal error", |
|
|
"column syntax is inconsistent", |
"column syntax is inconsistent", |
"missing font type", |
|
"displays may not be nested", |
"displays may not be nested", |
"unsupported display type", |
"unsupported display type", |
"no scope to rewind: syntax violated", |
"blocks badly nested", |
|
"no such block is open", |
"scope broken, syntax violated", |
"scope broken, syntax violated", |
"line scope broken, syntax violated", |
"line scope broken, syntax violated", |
"argument count wrong, violates syntax", |
"argument count wrong, violates syntax", |
Line 181 static void version(void) __attribute__((noreturn)) |
|
Line 192 static void version(void) __attribute__((noreturn)) |
|
static int woptions(int *, char *); |
static int woptions(int *, char *); |
|
|
static const char *progname; |
static const char *progname; |
static int with_error; |
static int with_fatal; |
static int with_warning; |
static int with_error; |
|
|
int |
int |
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
Line 245 main(int argc, char *argv[]) |
|
Line 256 main(int argc, char *argv[]) |
|
while (*argv) { |
while (*argv) { |
ffile(*argv, &curp); |
ffile(*argv, &curp); |
|
|
if (with_error && !(curp.fflags & FL_IGN_ERRORS)) |
if (with_fatal && !(curp.fflags & FL_IGN_ERRORS)) |
break; |
break; |
++argv; |
++argv; |
} |
} |
Line 259 main(int argc, char *argv[]) |
|
Line 270 main(int argc, char *argv[]) |
|
if (curp.roff) |
if (curp.roff) |
roff_free(curp.roff); |
roff_free(curp.roff); |
|
|
return((with_warning || with_error) ? |
return((with_fatal || with_error) ? |
EXIT_FAILURE : EXIT_SUCCESS); |
EXIT_FAILURE : EXIT_SUCCESS); |
} |
} |
|
|
Line 298 man_init(struct curparse *curp) |
|
Line 309 man_init(struct curparse *curp) |
|
if (curp->fflags & FL_NIGN_ESCAPE) |
if (curp->fflags & FL_NIGN_ESCAPE) |
pflags &= ~MAN_IGN_ESCAPE; |
pflags &= ~MAN_IGN_ESCAPE; |
|
|
return(man_alloc(curp, pflags, mmsg)); |
return(man_alloc(&curp->regs, curp, pflags, mmsg)); |
} |
} |
|
|
|
|
Line 306 static struct roff * |
|
Line 317 static struct roff * |
|
roff_init(struct curparse *curp) |
roff_init(struct curparse *curp) |
{ |
{ |
|
|
return(roff_alloc(mmsg, curp)); |
return(roff_alloc(&curp->regs, mmsg, curp)); |
} |
} |
|
|
|
|
Line 326 mdoc_init(struct curparse *curp) |
|
Line 337 mdoc_init(struct curparse *curp) |
|
if (curp->fflags & FL_NIGN_MACRO) |
if (curp->fflags & FL_NIGN_MACRO) |
pflags &= ~MDOC_IGN_MACRO; |
pflags &= ~MDOC_IGN_MACRO; |
|
|
return(mdoc_alloc(curp, pflags, mmsg)); |
return(mdoc_alloc(&curp->regs, curp, pflags, mmsg)); |
} |
} |
|
|
|
|
Line 337 ffile(const char *file, struct curparse *curp) |
|
Line 348 ffile(const char *file, struct curparse *curp) |
|
curp->file = file; |
curp->file = file; |
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { |
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { |
perror(curp->file); |
perror(curp->file); |
with_error = 1; |
with_fatal = 1; |
return; |
return; |
} |
} |
|
|
Line 378 read_whole_file(struct curparse *curp, struct buf *fb, |
|
Line 389 read_whole_file(struct curparse *curp, struct buf *fb, |
|
|
|
if (-1 == fstat(curp->fd, &st)) { |
if (-1 == fstat(curp->fd, &st)) { |
perror(curp->file); |
perror(curp->file); |
with_error = 1; |
with_fatal = 1; |
return(0); |
return(0); |
} |
} |
|
|
Line 393 read_whole_file(struct curparse *curp, struct buf *fb, |
|
Line 404 read_whole_file(struct curparse *curp, struct buf *fb, |
|
if (st.st_size >= (1U << 31)) { |
if (st.st_size >= (1U << 31)) { |
fprintf(stderr, "%s: input too large\n", |
fprintf(stderr, "%s: input too large\n", |
curp->file); |
curp->file); |
with_error = 1; |
with_fatal = 1; |
return(0); |
return(0); |
} |
} |
*with_mmap = 1; |
*with_mmap = 1; |
Line 437 read_whole_file(struct curparse *curp, struct buf *fb, |
|
Line 448 read_whole_file(struct curparse *curp, struct buf *fb, |
|
|
|
free(fb->buf); |
free(fb->buf); |
fb->buf = NULL; |
fb->buf = NULL; |
with_error = 1; |
with_fatal = 1; |
return(0); |
return(0); |
} |
} |
|
|
Line 451 fdesc(struct curparse *curp) |
|
Line 462 fdesc(struct curparse *curp) |
|
struct man *man; |
struct man *man; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct roff *roff; |
struct roff *roff; |
struct regset regs; |
|
|
|
man = NULL; |
man = NULL; |
mdoc = NULL; |
mdoc = NULL; |
roff = NULL; |
roff = NULL; |
|
|
memset(&ln, 0, sizeof(struct buf)); |
memset(&ln, 0, sizeof(struct buf)); |
memset(®s, 0, sizeof(struct regset)); |
|
|
|
/* |
/* |
* Two buffers: ln and buf. buf is the input file and may be |
* Two buffers: ln and buf. buf is the input file and may be |
Line 540 fdesc(struct curparse *curp) |
|
Line 550 fdesc(struct curparse *curp) |
|
|
|
of = 0; |
of = 0; |
do { |
do { |
re = roff_parseln(roff, ®s, lnn_start, |
re = roff_parseln(roff, lnn_start, |
&ln.buf, &ln.sz, of, &of); |
&ln.buf, &ln.sz, of, &of); |
} while (ROFF_RERUN == re); |
} while (ROFF_RERUN == re); |
|
|
Line 599 fdesc(struct curparse *curp) |
|
Line 609 fdesc(struct curparse *curp) |
|
curp->outfree = ascii_free; |
curp->outfree = ascii_free; |
break; |
break; |
case (OUTT_PS): |
case (OUTT_PS): |
curp->outdata = ps_alloc(); |
curp->outdata = ps_alloc(curp->outopts); |
curp->outfree = ps_free; |
curp->outfree = ps_free; |
break; |
break; |
default: |
default: |
Line 637 fdesc(struct curparse *curp) |
|
Line 647 fdesc(struct curparse *curp) |
|
(*curp->outmdoc)(curp->outdata, mdoc); |
(*curp->outmdoc)(curp->outdata, mdoc); |
|
|
cleanup: |
cleanup: |
|
memset(&curp->regs, 0, sizeof(struct regset)); |
if (mdoc) |
if (mdoc) |
mdoc_reset(mdoc); |
mdoc_reset(mdoc); |
if (man) |
if (man) |
Line 653 fdesc(struct curparse *curp) |
|
Line 664 fdesc(struct curparse *curp) |
|
return; |
return; |
|
|
bailout: |
bailout: |
with_error = 1; |
with_fatal = 1; |
goto cleanup; |
goto cleanup; |
} |
} |
|
|
|
|
mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) |
mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) |
{ |
{ |
struct curparse *cp; |
struct curparse *cp; |
|
const char *level; |
|
int rc; |
|
|
cp = (struct curparse *)arg; |
cp = (struct curparse *)arg; |
|
level = NULL; |
|
rc = 1; |
|
|
if (t <= MANDOCERR_ERROR) { |
if (t >= MANDOCERR_FATAL) { |
if ( ! (cp->wflags & WARN_WALL)) |
with_fatal = 1; |
|
level = "FATAL"; |
|
rc = 0; |
|
} else { |
|
if ( ! (WARN_WALL & cp->wflags)) |
return(1); |
return(1); |
with_warning = 1; |
if (t >= MANDOCERR_ERROR) { |
} else |
with_error = 1; |
with_error = 1; |
level = "ERROR"; |
|
} |
|
if (WARN_WERR & cp->wflags) { |
|
with_fatal = 1; |
|
rc = 0; |
|
} |
|
} |
|
|
fprintf(stderr, "%s:%d:%d: %s", cp->file, |
fprintf(stderr, "%s:%d:%d:", cp->file, ln, col + 1); |
ln, col + 1, mandocerrs[t]); |
if (level) |
|
fprintf(stderr, " %s:", level); |
|
fprintf(stderr, " %s", mandocerrs[t]); |
if (msg) |
if (msg) |
fprintf(stderr, ": %s", msg); |
fprintf(stderr, ": %s", msg); |
|
|
fputc('\n', stderr); |
fputc('\n', stderr); |
|
|
/* This is superfluous, but whatever. */ |
return(rc); |
if (t > MANDOCERR_ERROR) |
|
return(0); |
|
if (cp->wflags & WARN_WERR) { |
|
with_error = 1; |
|
return(0); |
|
} |
|
return(1); |
|
} |
} |