version 1.44, 2009/09/21 13:06:13 |
version 1.64, 2010/05/14 17:59:07 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
|
#endif |
|
|
#include <sys/stat.h> |
#include <sys/stat.h> |
|
|
#include <assert.h> |
#include <assert.h> |
#include <err.h> |
|
#include <fcntl.h> |
#include <fcntl.h> |
#include <stdio.h> |
#include <stdio.h> |
|
#include <stdint.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
#include "mdoc.h" |
#include "mdoc.h" |
#include "man.h" |
#include "man.h" |
|
#include "main.h" |
|
|
/* Account for FreeBSD and Linux in our declarations. */ |
#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) |
|
|
#ifdef __linux__ |
/* FIXME: Intel's compiler? LLVM? pcc? */ |
extern int getsubopt(char **, char * const *, char **); |
|
# ifndef __dead |
#if !defined(__GNUC__) || (__GNUC__ < 2) |
# define __dead __attribute__((__noreturn__)) |
# if !defined(lint) |
|
# define __attribute__(x) |
# endif |
# endif |
#elif defined(__dead2) |
#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ |
# ifndef __dead |
|
# define __dead __dead2 |
|
# endif |
|
#endif |
|
|
|
typedef void (*out_mdoc)(void *, const struct mdoc *); |
typedef void (*out_mdoc)(void *, const struct mdoc *); |
typedef void (*out_man)(void *, const struct man *); |
typedef void (*out_man)(void *, const struct man *); |
|
|
OUTT_ASCII = 0, |
OUTT_ASCII = 0, |
OUTT_TREE, |
OUTT_TREE, |
OUTT_HTML, |
OUTT_HTML, |
|
OUTT_XHTML, |
OUTT_LINT |
OUTT_LINT |
}; |
}; |
|
|
Line 69 struct curparse { |
|
Line 72 struct curparse { |
|
#define WARN_WALL (1 << 0) /* All-warnings mask. */ |
#define WARN_WALL (1 << 0) /* All-warnings mask. */ |
#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 FL_IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
#define FL_NIGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ |
#define FL_NIGN_MACRO (1 << 2) /* Don't ignore bad macros. */ |
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
#define FL_IGN_ERRORS (1 << 4) /* Ignore failed parse. */ |
#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 84 struct curparse { |
|
Line 86 struct curparse { |
|
out_man outman; |
out_man outman; |
out_free outfree; |
out_free outfree; |
void *outdata; |
void *outdata; |
char *outopts; |
char outopts[BUFSIZ]; |
}; |
}; |
|
|
extern void *html_alloc(char *); |
#define FL_STRICT FL_NIGN_ESCAPE | \ |
extern void html_mdoc(void *, const struct mdoc *); |
FL_NIGN_MACRO |
extern void html_man(void *, const struct man *); |
|
extern void html_free(void *); |
|
extern void *ascii_alloc(void); |
|
extern void tree_mdoc(void *, const struct mdoc *); |
|
extern void tree_man(void *, const struct man *); |
|
extern void terminal_mdoc(void *, const struct mdoc *); |
|
extern void terminal_man(void *, const struct man *); |
|
extern void terminal_free(void *); |
|
|
|
static int foptions(int *, char *); |
static int foptions(int *, char *); |
static int toptions(enum outt *, char *); |
static int toptions(struct curparse *, 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 mwarn(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 *); |
const char *, struct curparse *); |
static int fdesc(struct buf *, struct buf *, |
static void fdesc(struct buf *, struct buf *, |
struct curparse *); |
struct curparse *); |
static int pset(const char *, int, struct curparse *, |
static int pset(const char *, int, struct curparse *, |
struct man **, struct mdoc **); |
struct man **, struct mdoc **); |
static struct man *man_init(struct curparse *); |
static struct man *man_init(struct curparse *); |
static struct mdoc *mdoc_init(struct curparse *); |
static struct mdoc *mdoc_init(struct curparse *); |
__dead static void version(void); |
static void version(void) __attribute__((noreturn)); |
__dead static void usage(void); |
static void usage(void) __attribute__((noreturn)); |
|
|
extern char *__progname; |
static const char *progname; |
|
static int with_error, with_warning; |
|
|
|
|
int |
int |
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
int c, rc; |
int c; |
struct buf ln, blk; |
struct buf ln, blk; |
struct curparse curp; |
struct curparse curp; |
|
|
bzero(&curp, sizeof(struct curparse)); |
progname = strrchr(argv[0], '/'); |
|
if (progname == NULL) |
|
progname = argv[0]; |
|
else |
|
++progname; |
|
|
|
memset(&curp, 0, sizeof(struct curparse)); |
|
|
curp.inttype = INTT_AUTO; |
curp.inttype = INTT_AUTO; |
curp.outtype = OUTT_ASCII; |
curp.outtype = OUTT_ASCII; |
|
|
/* LINTED */ |
/* LINTED */ |
while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:"))) |
while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:"))) |
switch (c) { |
switch (c) { |
case ('f'): |
case ('f'): |
if ( ! foptions(&curp.fflags, optarg)) |
if ( ! foptions(&curp.fflags, optarg)) |
Line 141 main(int argc, char *argv[]) |
|
Line 141 main(int argc, char *argv[]) |
|
if ( ! moptions(&curp.inttype, optarg)) |
if ( ! moptions(&curp.inttype, optarg)) |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
break; |
break; |
case ('o'): |
case ('O'): |
curp.outopts = optarg; |
(void)strlcat(curp.outopts, optarg, BUFSIZ); |
|
(void)strlcat(curp.outopts, ",", BUFSIZ); |
break; |
break; |
case ('T'): |
case ('T'): |
if ( ! toptions(&curp.outtype, optarg)) |
if ( ! toptions(&curp, optarg)) |
return(EXIT_FAILURE); |
return(EXIT_FAILURE); |
break; |
break; |
case ('W'): |
case ('W'): |
Line 163 main(int argc, char *argv[]) |
|
Line 164 main(int argc, char *argv[]) |
|
argc -= optind; |
argc -= optind; |
argv += optind; |
argv += optind; |
|
|
bzero(&ln, sizeof(struct buf)); |
memset(&ln, 0, sizeof(struct buf)); |
bzero(&blk, sizeof(struct buf)); |
memset(&blk, 0, sizeof(struct buf)); |
|
|
rc = 1; |
|
|
|
if (NULL == *argv) { |
if (NULL == *argv) { |
curp.file = "<stdin>"; |
curp.file = "<stdin>"; |
curp.fd = STDIN_FILENO; |
curp.fd = STDIN_FILENO; |
|
|
c = fdesc(&blk, &ln, &curp); |
fdesc(&blk, &ln, &curp); |
if ( ! (IGN_ERRORS & curp.fflags)) |
|
rc = 1 == c ? 1 : 0; |
|
else |
|
rc = -1 == c ? 0 : 1; |
|
} |
} |
|
|
while (rc && *argv) { |
while (*argv) { |
c = ffile(&blk, &ln, *argv, &curp); |
ffile(&blk, &ln, *argv, &curp); |
if ( ! (IGN_ERRORS & curp.fflags)) |
|
rc = 1 == c ? 1 : 0; |
|
else |
|
rc = -1 == c ? 0 : 1; |
|
|
|
argv++; |
if (with_error && !(curp.fflags & FL_IGN_ERRORS)) |
if (*argv && rc) { |
break; |
if (curp.lastman) |
++argv; |
if ( ! man_reset(curp.lastman)) |
|
rc = 0; |
|
if (curp.lastmdoc) |
|
if ( ! mdoc_reset(curp.lastmdoc)) |
|
rc = 0; |
|
curp.lastman = NULL; |
|
curp.lastmdoc = NULL; |
|
} |
|
} |
} |
|
|
if (blk.buf) |
if (blk.buf) |
Line 205 main(int argc, char *argv[]) |
|
Line 188 main(int argc, char *argv[]) |
|
free(ln.buf); |
free(ln.buf); |
if (curp.outfree) |
if (curp.outfree) |
(*curp.outfree)(curp.outdata); |
(*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 ); |
} |
} |
|
|
|
|
__dead static void |
static void |
version(void) |
version(void) |
{ |
{ |
|
|
(void)printf("%s %s\n", __progname, VERSION); |
(void)printf("%s %s\n", progname, VERSION); |
exit(EXIT_SUCCESS); |
exit(EXIT_SUCCESS); |
} |
} |
|
|
|
|
__dead static void |
static void |
usage(void) |
usage(void) |
{ |
{ |
|
|
(void)fprintf(stderr, "usage: %s [-V] [-foption...] " |
(void)fprintf(stderr, "usage: %s [-V] [-foption] " |
"[-mformat] [-Toutput] [-Werr...]\n", |
"[-mformat] [-Ooption] [-Toutput] " |
__progname); |
"[-Werr] [file...]\n", progname); |
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
|
|
Line 238 static struct man * |
|
Line 217 static struct man * |
|
man_init(struct curparse *curp) |
man_init(struct curparse *curp) |
{ |
{ |
int pflags; |
int pflags; |
struct man *man; |
|
struct man_cb mancb; |
struct man_cb mancb; |
|
|
mancb.man_err = merr; |
mancb.man_err = merr; |
Line 246 man_init(struct curparse *curp) |
|
Line 224 man_init(struct curparse *curp) |
|
|
|
/* Defaults from mandoc.1. */ |
/* Defaults from mandoc.1. */ |
|
|
pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; |
pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE; |
|
|
if (curp->fflags & NO_IGN_MACRO) |
if (curp->fflags & FL_NIGN_MACRO) |
pflags &= ~MAN_IGN_MACRO; |
pflags &= ~MAN_IGN_MACRO; |
if (curp->fflags & NO_IGN_CHARS) |
if (curp->fflags & FL_NIGN_ESCAPE) |
pflags &= ~MAN_IGN_CHARS; |
|
if (curp->fflags & NO_IGN_ESCAPE) |
|
pflags &= ~MAN_IGN_ESCAPE; |
pflags &= ~MAN_IGN_ESCAPE; |
|
|
if (NULL == (man = man_alloc(curp, pflags, &mancb))) |
return(man_alloc(curp, pflags, &mancb)); |
warnx("memory exhausted"); |
|
|
|
return(man); |
|
} |
} |
|
|
|
|
Line 266 static struct mdoc * |
|
Line 239 static struct mdoc * |
|
mdoc_init(struct curparse *curp) |
mdoc_init(struct curparse *curp) |
{ |
{ |
int pflags; |
int pflags; |
struct mdoc *mdoc; |
|
struct mdoc_cb mdoccb; |
struct mdoc_cb mdoccb; |
|
|
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_err = merr; |
Line 274 mdoc_init(struct curparse *curp) |
|
Line 246 mdoc_init(struct curparse *curp) |
|
|
|
/* Defaults from mandoc.1. */ |
/* Defaults from mandoc.1. */ |
|
|
pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; |
pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE; |
|
|
if (curp->fflags & IGN_SCOPE) |
if (curp->fflags & FL_IGN_SCOPE) |
pflags |= MDOC_IGN_SCOPE; |
pflags |= MDOC_IGN_SCOPE; |
if (curp->fflags & NO_IGN_ESCAPE) |
if (curp->fflags & FL_NIGN_ESCAPE) |
pflags &= ~MDOC_IGN_ESCAPE; |
pflags &= ~MDOC_IGN_ESCAPE; |
if (curp->fflags & NO_IGN_MACRO) |
if (curp->fflags & FL_NIGN_MACRO) |
pflags &= ~MDOC_IGN_MACRO; |
pflags &= ~MDOC_IGN_MACRO; |
if (curp->fflags & NO_IGN_CHARS) |
|
pflags &= ~MDOC_IGN_CHARS; |
|
|
|
if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) |
return(mdoc_alloc(curp, pflags, &mdoccb)); |
warnx("memory exhausted"); |
|
|
|
return(mdoc); |
|
} |
} |
|
|
|
|
static int |
static void |
ffile(struct buf *blk, struct buf *ln, |
ffile(struct buf *blk, struct buf *ln, |
const char *file, struct curparse *curp) |
const char *file, struct curparse *curp) |
{ |
{ |
int c; |
|
|
|
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); |
perror(curp->file); |
return(-1); |
with_error = 1; |
|
return; |
} |
} |
|
|
c = fdesc(blk, ln, curp); |
fdesc(blk, ln, curp); |
|
|
if (-1 == close(curp->fd)) |
if (-1 == close(curp->fd)) |
warn("%s", curp->file); |
perror(curp->file); |
|
|
return(c); |
|
} |
} |
|
|
|
|
static int |
static void |
fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) |
fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) |
{ |
{ |
size_t sz; |
size_t sz; |
Line 333 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 298 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
* growable, hence passed in by ptr-ptr. |
* growable, hence passed in by ptr-ptr. |
*/ |
*/ |
|
|
if (-1 == fstat(curp->fd, &st)) |
if (-1 == fstat(curp->fd, &st)) { |
warn("%s", curp->file); |
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; |
sz = st.st_blksize; |
|
|
if (sz > blk->sz) { |
if (sz > blk->sz) { |
blk->buf = realloc(blk->buf, sz); |
void *buf = realloc(blk->buf, sz); |
if (NULL == blk->buf) { |
|
warn("realloc"); |
if (NULL == buf) { |
return(-1); |
perror(NULL); |
|
with_error = 1; |
|
return; |
} |
} |
|
blk->buf = buf; |
blk->sz = sz; |
blk->sz = sz; |
} |
} |
|
|
Line 351 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 322 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); |
perror(curp->file); |
return(-1); |
goto bailout; |
} else if (0 == ssz) |
} else if (0 == ssz) |
break; |
break; |
|
|
Line 363 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 334 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
ln->sz += 256; /* Step-size. */ |
ln->sz += 256; /* Step-size. */ |
ln->buf = realloc(ln->buf, ln->sz); |
ln->buf = realloc(ln->buf, ln->sz); |
if (NULL == ln->buf) { |
if (NULL == ln->buf) { |
warn("realloc"); |
perror(NULL); |
return(-1); |
goto bailout; |
} |
} |
} |
} |
|
|
Line 387 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 358 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
comment = 1; |
comment = 1; |
pos -= 2; |
pos -= 2; |
|
for (; pos > 0; --pos) { |
|
if (ln->buf[pos - 1] != ' ') |
|
break; |
|
if (pos > 2 && ln->buf[pos - 2] == '\\') |
|
break; |
|
} |
continue; |
continue; |
} |
} |
|
|
Line 411 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 388 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(-1); |
goto bailout; |
|
|
pos = comment = 0; |
pos = comment = 0; |
|
|
/* Pass down into parsers. */ |
/* Pass down into parsers. */ |
|
|
if (man && ! man_parseln(man, lnn, ln->buf)) |
if (man && ! man_parseln(man, lnn, ln->buf)) |
return(0); |
goto bailout; |
if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) |
if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) |
return(0); |
goto bailout; |
} |
} |
} |
} |
|
|
/* NOTE a parser may not have been assigned, yet. */ |
/* NOTE a parser may not have been assigned, yet. */ |
|
|
if ( ! (man || mdoc)) { |
if ( ! (man || mdoc)) { |
(void)fprintf(stderr, "%s: not a manual\n", |
fprintf(stderr, "%s: Not a manual\n", curp->file); |
curp->file); |
goto bailout; |
return(0); |
|
} |
} |
|
|
if (mdoc && ! mdoc_endparse(mdoc)) |
if (mdoc && ! mdoc_endparse(mdoc)) |
return(0); |
goto bailout; |
if (man && ! man_endparse(man)) |
if (man && ! man_endparse(man)) |
return(0); |
goto bailout; |
|
|
/* If unset, allocate output dev now (if applicable). */ |
/* If unset, allocate output dev now (if applicable). */ |
|
|
if ( ! (curp->outman && curp->outmdoc)) { |
if ( ! (curp->outman && curp->outmdoc)) { |
switch (curp->outtype) { |
switch (curp->outtype) { |
|
case (OUTT_XHTML): |
|
curp->outdata = xhtml_alloc(curp->outopts); |
|
curp->outman = html_man; |
|
curp->outmdoc = html_mdoc; |
|
curp->outfree = html_free; |
|
break; |
case (OUTT_HTML): |
case (OUTT_HTML): |
curp->outdata = html_alloc(curp->outopts); |
curp->outdata = html_alloc(curp->outopts); |
curp->outman = html_man; |
curp->outman = html_man; |
Line 469 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 451 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
if (mdoc && curp->outmdoc) |
if (mdoc && curp->outmdoc) |
(*curp->outmdoc)(curp->outdata, mdoc); |
(*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; |
} |
} |
|
|
|
|
Line 543 moptions(enum intt *tflags, char *arg) |
|
Line 538 moptions(enum intt *tflags, char *arg) |
|
else if (0 == strcmp(arg, "an")) |
else if (0 == strcmp(arg, "an")) |
*tflags = INTT_MAN; |
*tflags = INTT_MAN; |
else { |
else { |
warnx("bad argument: -m%s", arg); |
fprintf(stderr, "%s: Bad argument\n", arg); |
return(0); |
return(0); |
} |
} |
|
|
Line 552 moptions(enum intt *tflags, char *arg) |
|
Line 547 moptions(enum intt *tflags, char *arg) |
|
|
|
|
|
static int |
static int |
toptions(enum outt *tflags, char *arg) |
toptions(struct curparse *curp, char *arg) |
{ |
{ |
|
|
if (0 == strcmp(arg, "ascii")) |
if (0 == strcmp(arg, "ascii")) |
*tflags = OUTT_ASCII; |
curp->outtype = OUTT_ASCII; |
else if (0 == strcmp(arg, "lint")) |
else if (0 == strcmp(arg, "lint")) { |
*tflags = OUTT_LINT; |
curp->outtype = OUTT_LINT; |
|
curp->wflags |= WARN_WALL; |
|
curp->fflags |= FL_STRICT; |
|
} |
else if (0 == strcmp(arg, "tree")) |
else if (0 == strcmp(arg, "tree")) |
*tflags = OUTT_TREE; |
curp->outtype = OUTT_TREE; |
else if (0 == strcmp(arg, "html")) |
else if (0 == strcmp(arg, "html")) |
*tflags = OUTT_HTML; |
curp->outtype = OUTT_HTML; |
|
else if (0 == strcmp(arg, "xhtml")) |
|
curp->outtype = OUTT_XHTML; |
else { |
else { |
warnx("bad argument: -T%s", arg); |
fprintf(stderr, "%s: Bad argument\n", arg); |
return(0); |
return(0); |
} |
} |
|
|
|
|
foptions(int *fflags, char *arg) |
foptions(int *fflags, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
char *toks[7]; |
const char *toks[8]; |
|
|
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] = "ign-errors"; |
toks[4] = "ign-errors"; |
toks[4] = "strict"; |
toks[5] = "strict"; |
toks[5] = "ign-escape"; |
toks[6] = NULL; |
toks[6] = NULL; |
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, UNCONST(toks), &v)) { |
case (0): |
case (0): |
*fflags |= IGN_SCOPE; |
*fflags |= FL_IGN_SCOPE; |
break; |
break; |
case (1): |
case (1): |
*fflags |= NO_IGN_ESCAPE; |
*fflags |= FL_NIGN_ESCAPE; |
break; |
break; |
case (2): |
case (2): |
*fflags |= NO_IGN_MACRO; |
*fflags |= FL_NIGN_MACRO; |
break; |
break; |
case (3): |
case (3): |
*fflags |= NO_IGN_CHARS; |
*fflags |= FL_IGN_ERRORS; |
break; |
break; |
case (4): |
case (4): |
*fflags |= IGN_ERRORS; |
*fflags |= FL_STRICT; |
break; |
break; |
case (5): |
case (5): |
*fflags |= NO_IGN_ESCAPE | |
*fflags &= ~FL_NIGN_ESCAPE; |
NO_IGN_MACRO | NO_IGN_CHARS; |
|
break; |
break; |
default: |
default: |
warnx("bad argument: -f%s", o); |
fprintf(stderr, "%s: Bad argument\n", o); |
return(0); |
return(0); |
} |
} |
} |
} |
|
|
woptions(int *wflags, char *arg) |
woptions(int *wflags, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
char *toks[3]; |
const char *toks[3]; |
|
|
toks[0] = "all"; |
toks[0] = "all"; |
toks[1] = "error"; |
toks[1] = "error"; |
Line 630 woptions(int *wflags, char *arg) |
|
Line 629 woptions(int *wflags, char *arg) |
|
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
switch (getsubopt(&arg, toks, &v)) { |
switch (getsubopt(&arg, UNCONST(toks), &v)) { |
case (0): |
case (0): |
*wflags |= WARN_WALL; |
*wflags |= WARN_WALL; |
break; |
break; |
Line 638 woptions(int *wflags, char *arg) |
|
Line 637 woptions(int *wflags, char *arg) |
|
*wflags |= WARN_WERR; |
*wflags |= WARN_WERR; |
break; |
break; |
default: |
default: |
warnx("bad argument: -W%s", o); |
fprintf(stderr, "%s: Bad argument\n", o); |
return(0); |
return(0); |
} |
} |
} |
} |
Line 658 merr(void *arg, int line, int col, const char *msg) |
|
Line 657 merr(void *arg, int line, int col, const char *msg) |
|
(void)fprintf(stderr, "%s:%d:%d: error: %s\n", |
(void)fprintf(stderr, "%s:%d:%d: error: %s\n", |
curp->file, line, col + 1, msg); |
curp->file, line, col + 1, msg); |
|
|
|
with_error = 1; |
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 675 mwarn(void *arg, int line, int col, const char *msg) |
|
Line 676 mwarn(void *arg, int line, int col, const char *msg) |
|
(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", |
(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", |
curp->file, line, col + 1, msg); |
curp->file, line, col + 1, msg); |
|
|
if ( ! (curp->wflags & WARN_WERR)) |
with_warning = 1; |
return(1); |
if (curp->wflags & WARN_WERR) { |
|
with_error = 1; |
return(0); |
return(0); |
|
} |
|
|
|
return(1); |
} |
} |
|
|