version 1.35, 2009/07/06 09:21:24 |
version 1.40, 2009/07/27 19:43:02 |
Line 65 struct curparse { |
|
Line 65 struct curparse { |
|
const char *file; /* Current parse. */ |
const char *file; /* Current parse. */ |
int fd; /* Current parse. */ |
int fd; /* Current parse. */ |
int wflags; |
int wflags; |
#define WARN_WALL 0x03 /* All-warnings mask. */ |
#define WARN_WALL (1 << 0) /* All-warnings mask. */ |
#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ |
|
#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ |
|
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
int fflags; |
int fflags; |
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
#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_MACRO (1 << 2) /* Don't ignore bad macros. */ |
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
|
#define IGN_ERRORS (1 << 4) /* Ignore failed parse. */ |
enum intt inttype; /* Input parsers... */ |
enum intt inttype; /* Input parsers... */ |
struct man *man; |
struct man *man; |
struct man *lastman; |
struct man *lastman; |
Line 98 static int toptions(enum outt *, char *); |
|
Line 97 static int toptions(enum outt *, char *); |
|
static int moptions(enum intt *, char *); |
static int moptions(enum intt *, char *); |
static int woptions(int *, char *); |
static int woptions(int *, char *); |
static int merr(void *, int, int, const char *); |
static int merr(void *, int, int, const char *); |
static int manwarn(void *, int, int, const char *); |
static int mwarn(void *, int, int, const char *); |
static int mdocwarn(void *, int, int, const char *); |
|
static int ffile(struct buf *, struct buf *, |
static int ffile(struct buf *, struct buf *, |
const char *, struct curparse *); |
const char *, struct curparse *); |
static int fdesc(struct buf *, struct buf *, |
static int fdesc(struct buf *, struct buf *, |
Line 164 main(int argc, char *argv[]) |
|
Line 162 main(int argc, char *argv[]) |
|
if (NULL == *argv) { |
if (NULL == *argv) { |
curp.file = "<stdin>"; |
curp.file = "<stdin>"; |
curp.fd = STDIN_FILENO; |
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) { |
while (rc && *argv) { |
if ( ! ffile(&blk, &ln, *argv, &curp)) |
c = ffile(&blk, &ln, *argv, &curp); |
rc = 0; |
if ( ! (IGN_ERRORS & curp.fflags)) |
|
rc = 1 == c ? 1 : 0; |
|
else |
|
rc = -1 == c ? 0 : 1; |
|
|
argv++; |
argv++; |
if (*argv && rc) { |
if (*argv && rc) { |
if (curp.lastman) |
if (curp.lastman) |
Line 227 man_init(struct curparse *curp) |
|
Line 233 man_init(struct curparse *curp) |
|
struct man_cb mancb; |
struct man_cb mancb; |
|
|
mancb.man_err = merr; |
mancb.man_err = merr; |
mancb.man_warn = manwarn; |
mancb.man_warn = mwarn; |
|
|
/* Defaults from mandoc.1. */ |
/* Defaults from mandoc.1. */ |
|
|
Line 255 mdoc_init(struct curparse *curp) |
|
Line 261 mdoc_init(struct curparse *curp) |
|
struct mdoc_cb mdoccb; |
struct mdoc_cb mdoccb; |
|
|
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_warn = mdocwarn; |
mdoccb.mdoc_warn = mwarn; |
|
|
/* Defaults from mandoc.1. */ |
/* Defaults from mandoc.1. */ |
|
|
Line 286 ffile(struct buf *blk, struct buf *ln, |
|
Line 292 ffile(struct buf *blk, struct buf *ln, |
|
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))) { |
warn("%s", curp->file); |
warn("%s", curp->file); |
return(0); |
return(-1); |
} |
} |
|
|
c = fdesc(blk, ln, curp); |
c = fdesc(blk, ln, curp); |
Line 327 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 333 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
blk->buf = realloc(blk->buf, sz); |
blk->buf = realloc(blk->buf, sz); |
if (NULL == blk->buf) { |
if (NULL == blk->buf) { |
warn("realloc"); |
warn("realloc"); |
return(0); |
return(-1); |
} |
} |
blk->sz = sz; |
blk->sz = sz; |
} |
} |
Line 337 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 343 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
for (lnn = pos = comment = 0; ; ) { |
for (lnn = pos = comment = 0; ; ) { |
if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { |
if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { |
warn("%s", curp->file); |
warn("%s", curp->file); |
return(0); |
return(-1); |
} else if (0 == ssz) |
} else if (0 == ssz) |
break; |
break; |
|
|
Line 349 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 355 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
ln->buf = realloc(ln->buf, ln->sz); |
ln->buf = realloc(ln->buf, ln->sz); |
if (NULL == ln->buf) { |
if (NULL == ln->buf) { |
warn("realloc"); |
warn("realloc"); |
return(0); |
return(-1); |
} |
} |
} |
} |
|
|
Line 396 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 402 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
if ( ! (man || mdoc) && ! pset(ln->buf, |
if ( ! (man || mdoc) && ! pset(ln->buf, |
pos, curp, &man, &mdoc)) |
pos, curp, &man, &mdoc)) |
return(0); |
return(-1); |
|
|
pos = comment = 0; |
pos = comment = 0; |
|
|
Line 412 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 418 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
/* NOTE a parser may not have been assigned, yet. */ |
/* NOTE a parser may not have been assigned, yet. */ |
|
|
if ( ! (man || mdoc)) { |
if ( ! (man || mdoc)) { |
warnx("%s: not a manual", curp->file); |
(void)fprintf(stderr, "%s: not a manual", curp->file); |
return(0); |
return(0); |
} |
} |
|
|
Line 444 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 450 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
if (man && curp->outman) |
if (man && curp->outman) |
if ( ! (*curp->outman)(curp->outdata, man)) |
if ( ! (*curp->outman)(curp->outdata, man)) |
return(0); |
return(-1); |
if (mdoc && curp->outmdoc) |
if (mdoc && curp->outmdoc) |
if ( ! (*curp->outmdoc)(curp->outdata, mdoc)) |
if ( ! (*curp->outmdoc)(curp->outdata, mdoc)) |
return(0); |
return(-1); |
|
|
return(1); |
return(1); |
} |
} |
|
|
foptions(int *fflags, char *arg) |
foptions(int *fflags, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
char *toks[6]; |
char *toks[7]; |
|
|
toks[0] = "ign-scope"; |
toks[0] = "ign-scope"; |
toks[1] = "no-ign-escape"; |
toks[1] = "no-ign-escape"; |
toks[2] = "no-ign-macro"; |
toks[2] = "no-ign-macro"; |
toks[3] = "no-ign-chars"; |
toks[3] = "no-ign-chars"; |
toks[4] = "strict"; |
toks[4] = "ign-errors"; |
toks[5] = NULL; |
toks[5] = "strict"; |
|
toks[6] = NULL; |
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
Line 579 foptions(int *fflags, char *arg) |
|
Line 586 foptions(int *fflags, char *arg) |
|
*fflags |= NO_IGN_CHARS; |
*fflags |= NO_IGN_CHARS; |
break; |
break; |
case (4): |
case (4): |
|
*fflags |= IGN_ERRORS; |
|
break; |
|
case (5): |
*fflags |= NO_IGN_ESCAPE | |
*fflags |= NO_IGN_ESCAPE | |
NO_IGN_MACRO | NO_IGN_CHARS; |
NO_IGN_MACRO | NO_IGN_CHARS; |
break; |
break; |
|
|
woptions(int *wflags, char *arg) |
woptions(int *wflags, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
char *toks[5]; |
char *toks[3]; |
|
|
toks[0] = "all"; |
toks[0] = "all"; |
toks[1] = "compat"; |
toks[1] = "error"; |
toks[2] = "syntax"; |
toks[2] = NULL; |
toks[3] = "error"; |
|
toks[4] = NULL; |
|
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
Line 611 woptions(int *wflags, char *arg) |
|
Line 619 woptions(int *wflags, char *arg) |
|
*wflags |= WARN_WALL; |
*wflags |= WARN_WALL; |
break; |
break; |
case (1): |
case (1): |
*wflags |= WARN_WCOMPAT; |
|
break; |
|
case (2): |
|
*wflags |= WARN_WSYNTAX; |
|
break; |
|
case (3): |
|
*wflags |= WARN_WERR; |
*wflags |= WARN_WERR; |
break; |
break; |
default: |
default: |
Line 636 merr(void *arg, int line, int col, const char *msg) |
|
Line 638 merr(void *arg, int line, int col, const char *msg) |
|
struct curparse *curp; |
struct curparse *curp; |
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
warnx("%s:%d: error: %s (column %d)", |
|
curp->file, line, msg, col); |
|
|
|
return(0); |
(void)fprintf(stderr, "%s:%d:%d: error: %s\n", |
} |
curp->file, line, col + 1, msg); |
|
|
|
|
static int |
|
mdocwarn(void *arg, int line, int col, const char *msg) |
|
{ |
|
struct curparse *curp; |
|
|
|
curp = (struct curparse *)arg; |
|
|
|
warnx("%s:%d: warning: %s (column %d)", |
|
curp->file, line, msg, col); |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
|
return(1); |
|
|
|
warnx("considering warnings as errors"); |
|
return(0); |
return(0); |
} |
} |
|
|
|
|
static int |
static int |
manwarn(void *arg, int line, int col, const char *msg) |
mwarn(void *arg, int line, int col, const char *msg) |
{ |
{ |
struct curparse *curp; |
struct curparse *curp; |
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
|
|
if ( ! (curp->wflags & WARN_WSYNTAX)) |
if ( ! (curp->wflags & WARN_WALL)) |
return(1); |
return(1); |
|
|
warnx("%s:%d: syntax warning: %s (column %d)", |
(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", |
curp->file, line, msg, col); |
curp->file, line, col + 1, msg); |
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
return(1); |
return(1); |
|
|
warnx("considering warnings as errors"); |
|
return(0); |
return(0); |
} |
} |
|
|