version 1.30, 2009/06/16 20:22:23 |
version 1.51, 2009/10/27 08:26:11 |
|
|
#include <err.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" |
|
|
|
#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) |
|
|
/* Account for FreeBSD and Linux in our declarations. */ |
/* Account for FreeBSD and Linux in our declarations. */ |
|
|
#ifdef __linux__ |
#ifdef __linux__ |
extern int getsubopt(char **, char * const *, char **); |
extern int getsubopt(char **, char * const *, char **); |
|
extern size_t strlcat(char *, const char *, size_t); |
# ifndef __dead |
# ifndef __dead |
# define __dead __attribute__((__noreturn__)) |
# define __dead __attribute__((__noreturn__)) |
# endif |
# endif |
Line 40 extern int getsubopt(char **, char * const *, char |
|
Line 45 extern int getsubopt(char **, char * const *, char |
|
# endif |
# endif |
#endif |
#endif |
|
|
typedef int (*out_mdoc)(void *, const struct mdoc *); |
typedef void (*out_mdoc)(void *, const struct mdoc *); |
typedef int (*out_man)(void *, const struct man *); |
typedef void (*out_man)(void *, const struct man *); |
typedef void (*out_free)(void *); |
typedef void (*out_free)(void *); |
|
|
struct buf { |
struct buf { |
|
|
enum outt { |
enum outt { |
OUTT_ASCII = 0, |
OUTT_ASCII = 0, |
OUTT_TREE, |
OUTT_TREE, |
|
OUTT_HTML, |
OUTT_LINT |
OUTT_LINT |
}; |
}; |
|
|
Line 65 struct curparse { |
|
Line 71 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 84 struct curparse { |
|
Line 89 struct curparse { |
|
out_man outman; |
out_man outman; |
out_free outfree; |
out_free outfree; |
void *outdata; |
void *outdata; |
|
char outopts[BUFSIZ]; |
}; |
}; |
|
|
extern void *ascii_alloc(void); |
|
extern int tree_mdoc(void *, const struct mdoc *); |
|
extern int tree_man(void *, const struct man *); |
|
extern int terminal_mdoc(void *, const struct mdoc *); |
|
extern int 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(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 122 main(int argc, char *argv[]) |
|
Line 119 main(int argc, char *argv[]) |
|
struct buf ln, blk; |
struct buf ln, blk; |
struct curparse curp; |
struct curparse curp; |
|
|
bzero(&curp, sizeof(struct curparse)); |
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:VW:T:"))) |
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)) |
return(0); |
return(EXIT_FAILURE); |
break; |
break; |
case ('m'): |
case ('m'): |
if ( ! moptions(&curp.inttype, optarg)) |
if ( ! moptions(&curp.inttype, optarg)) |
return(0); |
return(EXIT_FAILURE); |
break; |
break; |
|
case ('O'): |
|
(void)strlcat(curp.outopts, optarg, BUFSIZ); |
|
(void)strlcat(curp.outopts, ",", BUFSIZ); |
|
break; |
case ('T'): |
case ('T'): |
if ( ! toptions(&curp.outtype, optarg)) |
if ( ! toptions(&curp.outtype, optarg)) |
return(0); |
return(EXIT_FAILURE); |
break; |
break; |
case ('W'): |
case ('W'): |
if ( ! woptions(&curp.wflags, optarg)) |
if ( ! woptions(&curp.wflags, optarg)) |
return(0); |
return(EXIT_FAILURE); |
break; |
break; |
case ('V'): |
case ('V'): |
version(); |
version(); |
Line 157 main(int argc, char *argv[]) |
|
Line 158 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; |
rc = 1; |
|
|
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) |
|
|
{ |
{ |
|
|
(void)fprintf(stderr, "usage: %s [-V] [-foption...] " |
(void)fprintf(stderr, "usage: %s [-V] [-foption...] " |
"[-mformat] [-Toutput] [-Werr...]\n", |
"[-mformat] [-Ooption] [-Toutput] " |
__progname); |
"[-Werr...]\n", __progname); |
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
|
|
Line 228 man_init(struct curparse *curp) |
|
Line 237 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. */ |
|
|
pflags = MAN_IGN_MACRO; |
pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; |
|
|
if (curp->fflags & NO_IGN_MACRO) |
if (curp->fflags & NO_IGN_MACRO) |
pflags &= ~MAN_IGN_MACRO; |
pflags &= ~MAN_IGN_MACRO; |
|
if (curp->fflags & NO_IGN_CHARS) |
|
pflags &= ~MAN_IGN_CHARS; |
|
if (curp->fflags & NO_IGN_ESCAPE) |
|
pflags &= ~MAN_IGN_ESCAPE; |
|
|
if (NULL == (man = man_alloc(curp, pflags, &mancb))) |
if (NULL == (man = man_alloc(curp, pflags, &mancb))) |
warnx("memory exhausted"); |
warnx("memory exhausted"); |
Line 252 mdoc_init(struct curparse *curp) |
|
Line 265 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 283 ffile(struct buf *blk, struct buf *ln, |
|
Line 296 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 316 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 329 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
*/ |
*/ |
|
|
if (-1 == fstat(curp->fd, &st)) |
if (-1 == fstat(curp->fd, &st)) |
warnx("%s", curp->file); |
warn("%s", curp->file); |
else if ((size_t)st.st_blksize > sz) |
else if ((size_t)st.st_blksize > sz) |
sz = st.st_blksize; |
sz = st.st_blksize; |
|
|
Line 324 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 337 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 334 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 347 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 346 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 359 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 393 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 406 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 409 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 422 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\n", |
|
curp->file); |
return(0); |
return(0); |
} |
} |
|
|
Line 422 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 436 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
if ( ! (curp->outman && curp->outmdoc)) { |
if ( ! (curp->outman && curp->outmdoc)) { |
switch (curp->outtype) { |
switch (curp->outtype) { |
|
case (OUTT_HTML): |
|
curp->outdata = html_alloc(curp->outopts); |
|
curp->outman = html_man; |
|
curp->outmdoc = html_mdoc; |
|
curp->outfree = html_free; |
|
break; |
case (OUTT_TREE): |
case (OUTT_TREE): |
curp->outman = tree_man; |
curp->outman = tree_man; |
curp->outmdoc = tree_mdoc; |
curp->outmdoc = tree_mdoc; |
Line 440 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 460 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
|
|
if (man && curp->outman) |
if (man && curp->outman) |
if ( ! (*curp->outman)(curp->outdata, man)) |
(*curp->outman)(curp->outdata, man); |
return(0); |
|
if (mdoc && curp->outmdoc) |
if (mdoc && curp->outmdoc) |
if ( ! (*curp->outmdoc)(curp->outdata, mdoc)) |
(*curp->outmdoc)(curp->outdata, mdoc); |
return(0); |
|
|
|
return(1); |
return(1); |
} |
} |
Line 538 toptions(enum outt *tflags, char *arg) |
|
Line 556 toptions(enum outt *tflags, char *arg) |
|
*tflags = OUTT_LINT; |
*tflags = OUTT_LINT; |
else if (0 == strcmp(arg, "tree")) |
else if (0 == strcmp(arg, "tree")) |
*tflags = OUTT_TREE; |
*tflags = OUTT_TREE; |
|
else if (0 == strcmp(arg, "html")) |
|
*tflags = OUTT_HTML; |
else { |
else { |
warnx("bad argument: -T%s", arg); |
warnx("bad argument: -T%s", arg); |
return(0); |
return(0); |
Line 550 toptions(enum outt *tflags, char *arg) |
|
Line 570 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]; |
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] = "no-ign-chars"; |
toks[4] = "strict"; |
toks[4] = "ign-errors"; |
toks[5] = NULL; |
toks[5] = "strict"; |
|
toks[6] = "ign-escape"; |
|
toks[7] = NULL; |
|
|
while (*arg) |
while (*arg) { |
switch (getsubopt(&arg, toks, &v)) { |
o = arg; |
|
switch (getsubopt(&arg, UNCONST(toks), &v)) { |
case (0): |
case (0): |
*fflags |= IGN_SCOPE; |
*fflags |= IGN_SCOPE; |
break; |
break; |
Line 575 foptions(int *fflags, char *arg) |
|
Line 598 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; |
|
case (6): |
|
*fflags &= ~NO_IGN_ESCAPE; |
|
break; |
default: |
default: |
warnx("bad argument: -f%s", arg); |
warnx("bad argument: -f%s", o); |
return(0); |
return(0); |
} |
} |
|
} |
|
|
return(1); |
return(1); |
} |
} |
Line 590 foptions(int *fflags, char *arg) |
|
Line 620 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]; |
const 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) { |
switch (getsubopt(&arg, toks, &v)) { |
o = arg; |
|
switch (getsubopt(&arg, UNCONST(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", arg); |
warnx("bad argument: -W%s", o); |
return(0); |
return(0); |
} |
} |
|
} |
|
|
return(1); |
return(1); |
} |
} |
Line 629 merr(void *arg, int line, int col, const char *msg) |
|
Line 653 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); |
|
|
|
|
(void)fprintf(stderr, "%s:%d:%d: error: %s\n", |
|
curp->file, line, col + 1, msg); |
|
|
return(0); |
return(0); |
} |
} |
|
|
|
|
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); |
(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", |
warnx("%s:%d: %s warning: %s (column %d)", |
curp->file, line, col + 1, msg); |
curp->file, line, wtype, msg, col); |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
return(1); |
return(1); |
|
|
warnx("considering warnings as errors"); |
|
return(0); |
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)", |
|
curp->file, line, msg, col); |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
|
return(1); |
|
|
|
warnx("considering warnings as errors"); |
|
return(0); |
|
} |
|