-/* $Id: main.c,v 1.34 2009/07/04 11:10:36 kristaps Exp $ */
+/* $Id: main.c,v 1.44 2009/09/21 13:06:13 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
# endif
#endif
-typedef int (*out_mdoc)(void *, const struct mdoc *);
-typedef int (*out_man)(void *, const struct man *);
+typedef void (*out_mdoc)(void *, const struct mdoc *);
+typedef void (*out_man)(void *, const struct man *);
typedef void (*out_free)(void *);
struct buf {
enum outt {
OUTT_ASCII = 0,
OUTT_TREE,
+ OUTT_HTML,
OUTT_LINT
};
const char *file; /* Current parse. */
int fd; /* Current parse. */
int wflags;
-#define WARN_WALL 0x03 /* All-warnings mask. */
-#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */
-#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */
+#define WARN_WALL (1 << 0) /* All-warnings mask. */
#define WARN_WERR (1 << 2) /* Warnings->errors. */
int fflags;
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */
#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_CHARS (1 << 3) /* Don't ignore bad chars. */
+#define IGN_ERRORS (1 << 4) /* Ignore failed parse. */
enum intt inttype; /* Input parsers... */
struct man *man;
struct man *lastman;
out_man outman;
out_free outfree;
void *outdata;
+ char *outopts;
};
+extern void *html_alloc(char *);
+extern void html_mdoc(void *, const struct mdoc *);
+extern void html_man(void *, const struct man *);
+extern void html_free(void *);
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 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 moptions(enum intt *, char *);
static int woptions(int *, char *);
static int merr(void *, int, int, const char *);
-static int manwarn(void *, int, int, const char *);
-static int mdocwarn(void *, int, int,
- enum mdoc_warn, const char *);
+static int mwarn(void *, int, int, const char *);
static int ffile(struct buf *, struct buf *,
const char *, struct curparse *);
static int fdesc(struct buf *, struct buf *,
curp.outtype = OUTT_ASCII;
/* LINTED */
- while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
+ while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:")))
switch (c) {
case ('f'):
if ( ! foptions(&curp.fflags, optarg))
if ( ! moptions(&curp.inttype, optarg))
return(EXIT_FAILURE);
break;
+ case ('o'):
+ curp.outopts = optarg;
+ break;
case ('T'):
if ( ! toptions(&curp.outtype, optarg))
return(EXIT_FAILURE);
if (NULL == *argv) {
curp.file = "<stdin>";
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) {
- if ( ! ffile(&blk, &ln, *argv, &curp))
- rc = 0;
+ c = ffile(&blk, &ln, *argv, &curp);
+ if ( ! (IGN_ERRORS & curp.fflags))
+ rc = 1 == c ? 1 : 0;
+ else
+ rc = -1 == c ? 0 : 1;
+
argv++;
if (*argv && rc) {
if (curp.lastman)
struct man_cb mancb;
mancb.man_err = merr;
- mancb.man_warn = manwarn;
+ mancb.man_warn = mwarn;
/* Defaults from mandoc.1. */
struct mdoc_cb mdoccb;
mdoccb.mdoc_err = merr;
- mdoccb.mdoc_warn = mdocwarn;
+ mdoccb.mdoc_warn = mwarn;
/* Defaults from mandoc.1. */
curp->file = file;
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
warn("%s", curp->file);
- return(0);
+ return(-1);
}
c = fdesc(blk, ln, curp);
blk->buf = realloc(blk->buf, sz);
if (NULL == blk->buf) {
warn("realloc");
- return(0);
+ return(-1);
}
blk->sz = sz;
}
for (lnn = pos = comment = 0; ; ) {
if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
warn("%s", curp->file);
- return(0);
+ return(-1);
} else if (0 == ssz)
break;
ln->buf = realloc(ln->buf, ln->sz);
if (NULL == ln->buf) {
warn("realloc");
- return(0);
+ return(-1);
}
}
if ( ! (man || mdoc) && ! pset(ln->buf,
pos, curp, &man, &mdoc))
- return(0);
+ return(-1);
pos = comment = 0;
/* NOTE a parser may not have been assigned, yet. */
if ( ! (man || mdoc)) {
- warnx("%s: not a manual", curp->file);
+ (void)fprintf(stderr, "%s: not a manual\n",
+ curp->file);
return(0);
}
if ( ! (curp->outman && curp->outmdoc)) {
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):
curp->outman = tree_man;
curp->outmdoc = tree_mdoc;
/* Execute the out device, if it exists. */
if (man && curp->outman)
- if ( ! (*curp->outman)(curp->outdata, man))
- return(0);
+ (*curp->outman)(curp->outdata, man);
if (mdoc && curp->outmdoc)
- if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
- return(0);
+ (*curp->outmdoc)(curp->outdata, mdoc);
return(1);
}
*tflags = OUTT_LINT;
else if (0 == strcmp(arg, "tree"))
*tflags = OUTT_TREE;
+ else if (0 == strcmp(arg, "html"))
+ *tflags = OUTT_HTML;
else {
warnx("bad argument: -T%s", arg);
return(0);
foptions(int *fflags, char *arg)
{
char *v, *o;
- char *toks[6];
+ char *toks[7];
toks[0] = "ign-scope";
toks[1] = "no-ign-escape";
toks[2] = "no-ign-macro";
toks[3] = "no-ign-chars";
- toks[4] = "strict";
- toks[5] = NULL;
+ toks[4] = "ign-errors";
+ toks[5] = "strict";
+ toks[6] = NULL;
while (*arg) {
o = arg;
*fflags |= NO_IGN_CHARS;
break;
case (4):
+ *fflags |= IGN_ERRORS;
+ break;
+ case (5):
*fflags |= NO_IGN_ESCAPE |
NO_IGN_MACRO | NO_IGN_CHARS;
break;
woptions(int *wflags, char *arg)
{
char *v, *o;
- char *toks[5];
+ char *toks[3];
toks[0] = "all";
- toks[1] = "compat";
- toks[2] = "syntax";
- toks[3] = "error";
- toks[4] = NULL;
+ toks[1] = "error";
+ toks[2] = NULL;
while (*arg) {
o = arg;
*wflags |= WARN_WALL;
break;
case (1):
- *wflags |= WARN_WCOMPAT;
- break;
- case (2):
- *wflags |= WARN_WSYNTAX;
- break;
- case (3):
*wflags |= WARN_WERR;
break;
default:
struct curparse *curp;
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);
}
static int
-mdocwarn(void *arg, int line, int col,
- enum mdoc_warn type, const char *msg)
+mwarn(void *arg, int line, int col, const char *msg)
{
struct curparse *curp;
- char *wtype;
curp = (struct curparse *)arg;
- wtype = NULL;
- switch (type) {
- case (WARN_COMPAT):
- wtype = "compat";
- if (curp->wflags & WARN_WCOMPAT)
- break;
+ if ( ! (curp->wflags & WARN_WALL))
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);
+ (void)fprintf(stderr, "%s:%d:%d: warning: %s\n",
+ curp->file, line, col + 1, msg);
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)",
- curp->file, line, msg, col);
-
- if ( ! (curp->wflags & WARN_WERR))
- return(1);
-
- warnx("considering warnings as errors");
- return(0);
-}
git.ckatri.com / mandoc.git / blobdiff