version 1.33, 2009/07/04 09:01:55 |
version 1.37, 2009/07/06 13:08:12 |
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. */ |
Line 98 static int toptions(enum outt *, char *); |
|
Line 96 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, |
|
enum mdoc_warn, 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 228 man_init(struct curparse *curp) |
|
Line 224 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 256 mdoc_init(struct curparse *curp) |
|
Line 252 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 554 toptions(enum outt *tflags, char *arg) |
|
Line 550 toptions(enum outt *tflags, char *arg) |
|
static int |
static int |
foptions(int *fflags, char *arg) |
foptions(int *fflags, char *arg) |
{ |
{ |
char *v; |
char *v, *o; |
char *toks[6]; |
char *toks[6]; |
|
|
toks[0] = "ign-scope"; |
toks[0] = "ign-scope"; |
Line 564 foptions(int *fflags, char *arg) |
|
Line 560 foptions(int *fflags, char *arg) |
|
toks[4] = "strict"; |
toks[4] = "strict"; |
toks[5] = NULL; |
toks[5] = NULL; |
|
|
while (*arg) |
while (*arg) { |
|
o = arg; |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, toks, &v)) { |
case (0): |
case (0): |
*fflags |= IGN_SCOPE; |
*fflags |= IGN_SCOPE; |
Line 583 foptions(int *fflags, char *arg) |
|
Line 580 foptions(int *fflags, char *arg) |
|
NO_IGN_MACRO | NO_IGN_CHARS; |
NO_IGN_MACRO | NO_IGN_CHARS; |
break; |
break; |
default: |
default: |
warnx("bad argument: -f%s", suboptarg); |
warnx("bad argument: -f%s", o); |
return(0); |
return(0); |
} |
} |
|
} |
|
|
return(1); |
return(1); |
} |
} |
Line 594 foptions(int *fflags, char *arg) |
|
Line 592 foptions(int *fflags, char *arg) |
|
static int |
static int |
woptions(int *wflags, char *arg) |
woptions(int *wflags, char *arg) |
{ |
{ |
char *v; |
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; |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, toks, &v)) { |
case (0): |
case (0): |
*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: |
warnx("bad argument: -W%s", suboptarg); |
warnx("bad argument: -W%s", o); |
return(0); |
return(0); |
} |
} |
|
} |
|
|
return(1); |
return(1); |
} |
} |
Line 633 merr(void *arg, int line, int col, const char *msg) |
|
Line 625 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)", |
warnx("%s:%d: error: %s (column %d)", |
curp->file, line, msg, col); |
curp->file, line, msg, col); |
|
|
Line 641 merr(void *arg, int line, int col, const char *msg) |
|
Line 634 merr(void *arg, int line, int col, const char *msg) |
|
|
|
|
|
static int |
static int |
mdocwarn(void *arg, int line, int col, |
mwarn(void *arg, int line, int col, const char *msg) |
enum mdoc_warn type, const char *msg) |
|
{ |
{ |
struct curparse *curp; |
struct curparse *curp; |
char *wtype; |
|
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
wtype = NULL; |
|
|
|
switch (type) { |
if ( ! (curp->wflags & WARN_WALL)) |
case (WARN_COMPAT): |
|
wtype = "compat"; |
|
if (curp->wflags & WARN_WCOMPAT) |
|
break; |
|
return(1); |
return(1); |
case (WARN_SYNTAX): |
|
wtype = "syntax"; |
|
if (curp->wflags & WARN_WSYNTAX) |
|
break; |
|
return(1); |
|
} |
|
|
|
assert(wtype); |
|
warnx("%s:%d: %s warning: %s (column %d)", |
|
curp->file, line, wtype, msg, col); |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
|
return(1); |
|
|
|
warnx("considering warnings as errors"); |
|
return(0); |
|
} |
|
|
|
|
|
static int |
|
manwarn(void *arg, int line, int col, const char *msg) |
|
{ |
|
struct curparse *curp; |
|
|
|
curp = (struct curparse *)arg; |
|
|
|
if ( ! (curp->wflags & WARN_WSYNTAX)) |
|
return(1); |
|
|
|
warnx("%s:%d: syntax warning: %s (column %d)", |
warnx("%s:%d: syntax warning: %s (column %d)", |
curp->file, line, msg, col); |
curp->file, line, msg, col); |
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
return(1); |
return(1); |
|
|
warnx("considering warnings as errors"); |
warnx("considering warnings as errors"); |
return(0); |
return(0); |
} |
} |
|
|