-/* $Id: main.c,v 1.22 2009/04/03 11:08:39 kristaps Exp $ */
+/* $Id: main.c,v 1.76 2010/05/16 10:59:36 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/mman.h>
#include <sys/stat.h>
#include <assert.h>
-#include <err.h>
#include <fcntl.h>
#include <stdio.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "mandoc.h"
#include "mdoc.h"
#include "man.h"
+#include "roff.h"
+#include "main.h"
-/* Account for FreeBSD and Linux in our declarations. */
+#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a))
-#ifdef __linux__
-extern int getsubopt(char **, char * const *, char **);
-# ifndef __dead
-# define __dead __attribute__((__noreturn__))
-# endif
-#elif defined(__dead2)
-# ifndef __dead
-# define __dead __dead2
+/* FIXME: Intel's compiler? LLVM? pcc? */
+
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# if !defined(lint)
+# define __attribute__(x)
# endif
-#endif
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
-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_XHTML,
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. */
+ /* FIXME: set by max error */
+#define WARN_WALL (1 << 0) /* All-warnings mask. */
#define WARN_WERR (1 << 2) /* Warnings->errors. */
- int fflags; /* Per-intt flags. */
- enum intt inttype; /* Input parsers. */
+ int fflags;
+#define FL_IGN_SCOPE (1 << 0) /* Ignore scope errors. */
+#define FL_NIGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */
+#define FL_NIGN_MACRO (1 << 2) /* Don't ignore bad macros. */
+#define FL_IGN_ERRORS (1 << 4) /* Ignore failed parse. */
+#define FL_STRICT FL_NIGN_ESCAPE | \
+ FL_NIGN_MACRO
+ enum intt inttype; /* Input parsers... */
struct man *man;
- struct man *lastman;
struct mdoc *mdoc;
- struct mdoc *lastmdoc;
- enum outt outtype; /* Output devices. */
+ struct roff *roff;
+ enum outt outtype; /* Output devices... */
out_mdoc outmdoc;
out_man outman;
out_free outfree;
void *outdata;
+ char outopts[BUFSIZ];
};
-#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */
-#define IGN_ESCAPE (1 << 1) /* Ignore bad escapes. */
-#define IGN_MACRO (1 << 2) /* Ignore unknown macros. */
-#define NO_IGN_MACRO (1 << 3)
-
-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 void fdesc(struct curparse *);
+static void ffile(const char *, struct curparse *);
static int foptions(int *, char *);
-static int toptions(enum outt *, char *);
+static struct man *man_init(struct curparse *);
+static struct mdoc *mdoc_init(struct curparse *);
+static struct roff *roff_init(struct curparse *);
+static int merr(void *, int, int, const char *); /* DEPRECATED */
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 fstdin(struct buf *, struct buf *,
- struct curparse *);
-static int ffile(struct buf *, struct buf *,
- const char *, struct curparse *);
-static int fdesc(struct buf *, struct buf *,
- struct curparse *);
+static int mwarn(void *, int, int, const char *); /* DEPRECATED */
+static int mmsg(enum mandocerr, void *,
+ int, int, const char *);
static int pset(const char *, int, struct curparse *,
struct man **, struct mdoc **);
-static struct man *man_init(struct curparse *);
-static struct mdoc *mdoc_init(struct curparse *);
-__dead static void version(void);
-__dead static void usage(void);
-
-extern char *__progname;
+static int toptions(struct curparse *, char *);
+static void usage(void) __attribute__((noreturn));
+static void version(void) __attribute__((noreturn));
+static int woptions(int *, char *);
+static const char *progname;
+static int with_error;
+static int with_warning;
int
main(int argc, char *argv[])
{
- int c, rc;
- struct buf ln, blk;
+ int c;
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.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))
- return(0);
+ return(EXIT_FAILURE);
break;
case ('m'):
if ( ! moptions(&curp.inttype, optarg))
- return(0);
+ return(EXIT_FAILURE);
+ break;
+ case ('O'):
+ (void)strlcat(curp.outopts, optarg, BUFSIZ);
+ (void)strlcat(curp.outopts, ",", BUFSIZ);
break;
case ('T'):
- if ( ! toptions(&curp.outtype, optarg))
- return(0);
+ if ( ! toptions(&curp, optarg))
+ return(EXIT_FAILURE);
break;
case ('W'):
if ( ! woptions(&curp.wflags, optarg))
- return(0);
+ return(EXIT_FAILURE);
break;
case ('V'):
version();
argc -= optind;
argv += optind;
- /* Configure buffers. */
-
- bzero(&ln, sizeof(struct buf));
- bzero(&blk, sizeof(struct buf));
-
- rc = 1;
-
- if (NULL == *argv)
- if ( ! fstdin(&blk, &ln, &curp))
- rc = 0;
-
- while (rc && *argv) {
- if ( ! ffile(&blk, &ln, *argv, &curp))
- rc = 0;
- argv++;
- if (*argv && rc) {
- if (curp.lastman)
- if ( ! man_reset(curp.lastman))
- rc = 0;
- if (curp.lastmdoc)
- if ( ! mdoc_reset(curp.lastmdoc))
- rc = 0;
- curp.lastman = NULL;
- curp.lastmdoc = NULL;
- }
+ if (NULL == *argv) {
+ curp.file = "<stdin>";
+ curp.fd = STDIN_FILENO;
+
+ fdesc(&curp);
+ }
+
+ while (*argv) {
+ ffile(*argv, &curp);
+
+ if (with_error && !(curp.fflags & FL_IGN_ERRORS))
+ break;
+ ++argv;
}
- if (blk.buf)
- free(blk.buf);
- if (ln.buf)
- free(ln.buf);
if (curp.outfree)
(*curp.outfree)(curp.outdata);
if (curp.mdoc)
mdoc_free(curp.mdoc);
if (curp.man)
man_free(curp.man);
+ if (curp.roff)
+ roff_free(curp.roff);
- return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
+ return((with_warning || with_error) ?
+ EXIT_FAILURE : EXIT_SUCCESS);
}
-__dead static void
+static void
version(void)
{
- (void)printf("%s %s\n", __progname, VERSION);
+ (void)printf("%s %s\n", progname, VERSION);
exit(EXIT_SUCCESS);
}
-__dead static void
+static void
usage(void)
{
- (void)fprintf(stderr, "usage: %s [-V] [-foption...] "
- "[-mformat] [-Toutput] [-Werr...]\n",
- __progname);
+ (void)fprintf(stderr, "usage: %s [-V] [-foption] "
+ "[-mformat] [-Ooption] [-Toutput] "
+ "[-Werr] [file...]\n", progname);
exit(EXIT_FAILURE);
}
man_init(struct curparse *curp)
{
int pflags;
- struct man *man;
struct man_cb mancb;
mancb.man_err = merr;
- mancb.man_warn = manwarn;
+ mancb.man_warn = mwarn;
- pflags = MAN_IGN_MACRO; /* XXX */
+ /* Defaults from mandoc.1. */
- if (curp->fflags & NO_IGN_MACRO)
+ pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
+
+ if (curp->fflags & FL_NIGN_MACRO)
pflags &= ~MAN_IGN_MACRO;
+ if (curp->fflags & FL_NIGN_ESCAPE)
+ pflags &= ~MAN_IGN_ESCAPE;
+
+ return(man_alloc(curp, pflags, &mancb));
+}
- if (NULL == (man = man_alloc(curp, pflags, &mancb)))
- warnx("memory exhausted");
- return(man);
+static struct roff *
+roff_init(struct curparse *curp)
+{
+
+ return(roff_alloc(mmsg, curp));
}
mdoc_init(struct curparse *curp)
{
int pflags;
- struct mdoc *mdoc;
struct mdoc_cb mdoccb;
- mdoccb.mdoc_msg = NULL;
mdoccb.mdoc_err = merr;
- mdoccb.mdoc_warn = mdocwarn;
-
- pflags = 0; /* XXX */
-
- if (curp->fflags & IGN_SCOPE)
- pflags |= MDOC_IGN_SCOPE;
- if (curp->fflags & IGN_ESCAPE)
- pflags |= MDOC_IGN_ESCAPE;
- if (curp->fflags & IGN_MACRO)
- pflags |= MDOC_IGN_MACRO;
+ mdoccb.mdoc_warn = mwarn;
- if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb)))
- warnx("memory allocated");
-
- return(mdoc);
-}
+ /* Defaults from mandoc.1. */
+ pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
-static int
-fstdin(struct buf *blk, struct buf *ln, struct curparse *curp)
-{
+ if (curp->fflags & FL_IGN_SCOPE)
+ pflags |= MDOC_IGN_SCOPE;
+ if (curp->fflags & FL_NIGN_ESCAPE)
+ pflags &= ~MDOC_IGN_ESCAPE;
+ if (curp->fflags & FL_NIGN_MACRO)
+ pflags &= ~MDOC_IGN_MACRO;
- curp->file = "<stdin>";
- curp->fd = STDIN_FILENO;
- return(fdesc(blk, ln, curp));
+ return(mdoc_alloc(curp, pflags, &mdoccb));
}
-static int
-ffile(struct buf *blk, struct buf *ln,
- const char *file, struct curparse *curp)
+static void
+ffile(const char *file, struct curparse *curp)
{
- int c;
curp->file = file;
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
- warn("%s", curp->file);
- return(0);
+ perror(curp->file);
+ with_error = 1;
+ return;
}
- c = fdesc(blk, ln, curp);
+ fdesc(curp);
if (-1 == close(curp->fd))
- warn("%s", curp->file);
+ perror(curp->file);
+}
+
- return(c);
+static int
+resize_buf(struct buf *buf, size_t initial)
+{
+ void *tmp;
+ size_t sz;
+
+ if (buf->sz == 0)
+ sz = initial;
+ else
+ sz = 2 * buf->sz;
+ tmp = realloc(buf->buf, sz);
+ if (NULL == tmp) {
+ perror(NULL);
+ return(0);
+ }
+ buf->buf = tmp;
+ buf->sz = sz;
+ return(1);
}
static int
-fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
+read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
{
- size_t sz;
- ssize_t ssz;
struct stat st;
- int j, i, pos, lnn;
- struct man *man;
- struct mdoc *mdoc;
+ size_t off;
+ ssize_t ssz;
- sz = BUFSIZ;
- man = NULL;
- mdoc = NULL;
+ if (-1 == fstat(curp->fd, &st)) {
+ perror(curp->file);
+ with_error = 1;
+ return(0);
+ }
/*
- * Two buffers: ln and buf. buf is the input buffer optimised
- * here for each file's block size. ln is a line buffer. Both
- * growable, hence passed in by ptr-ptr.
+ * If we're a regular file, try just reading in the whole entry
+ * via mmap(). This is faster than reading it into blocks, and
+ * since each file is only a few bytes to begin with, I'm not
+ * concerned that this is going to tank any machines.
*/
- if (-1 == fstat(curp->fd, &st))
- warnx("%s", curp->file);
- else if ((size_t)st.st_blksize > sz)
- sz = st.st_blksize;
-
- if (sz > blk->sz) {
- blk->buf = realloc(blk->buf, sz);
- if (NULL == blk->buf) {
- warn("realloc");
+ if (S_ISREG(st.st_mode)) {
+ if (st.st_size >= (1U << 31)) {
+ fprintf(stderr, "%s: input too large\n",
+ curp->file);
+ with_error = 1;
return(0);
}
- blk->sz = sz;
+ *with_mmap = 1;
+ fb->sz = (size_t)st.st_size;
+ fb->buf = mmap(NULL, fb->sz, PROT_READ,
+ MAP_FILE, curp->fd, 0);
+ if (fb->buf != MAP_FAILED)
+ return(1);
}
- /* Fill buf with file blocksize. */
+ /*
+ * If this isn't a regular file (like, say, stdin), then we must
+ * go the old way and just read things in bit by bit.
+ */
- for (lnn = 0, pos = 0; ; ) {
- if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
- warn("%s", curp->file);
- return(0);
- } else if (0 == ssz)
+ *with_mmap = 0;
+ off = 0;
+ fb->sz = 0;
+ fb->buf = NULL;
+ for (;;) {
+ if (off == fb->sz) {
+ if (fb->sz == (1U << 31)) {
+ fprintf(stderr, "%s: input too large\n",
+ curp->file);
+ break;
+ }
+ if (! resize_buf(fb, 65536))
+ break;
+ }
+ ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off);
+ if (ssz == 0) {
+ fb->sz = off;
+ return(1);
+ }
+ if (ssz == -1) {
+ perror(curp->file);
break;
+ }
+ off += (size_t)ssz;
+ }
- /* Parse the read block into partial or full lines. */
+ free(fb->buf);
+ fb->buf = NULL;
+ with_error = 1;
+ return(0);
+}
- for (i = 0; i < (int)ssz; i++) {
- if (pos >= (int)ln->sz) {
- ln->sz += 256; /* Step-size. */
- ln->buf = realloc(ln->buf, ln->sz);
- if (NULL == ln->buf) {
- warn("realloc");
- return(0);
- }
- }
- if ('\n' != blk->buf[i]) {
- ln->buf[pos++] = blk->buf[i];
- continue;
- }
+static void
+fdesc(struct curparse *curp)
+{
+ struct buf ln, blk;
+ int i, pos, lnn, lnn_start, with_mmap, of;
+ enum rofferr re;
+ struct man *man;
+ struct mdoc *mdoc;
+ struct roff *roff;
- /* Check for CPP-escaped newline. */
+ man = NULL;
+ mdoc = NULL;
+ roff = NULL;
+ memset(&ln, 0, sizeof(struct buf));
- if (pos > 0 && '\\' == ln->buf[pos - 1]) {
- for (j = pos - 1; j >= 0; j--)
- if ('\\' != ln->buf[j])
- break;
+ /*
+ * Two buffers: ln and buf. buf is the input file and may be
+ * memory mapped. ln is a line buffer and grows on-demand.
+ */
- if ( ! ((pos - j) % 2)) {
- pos--;
- lnn++;
- continue;
+ if ( ! read_whole_file(curp, &blk, &with_mmap))
+ return;
+
+ if (NULL == curp->roff)
+ curp->roff = roff_init(curp);
+ if (NULL == (roff = curp->roff))
+ goto bailout;
+
+ for (i = 0, lnn = 1; i < (int)blk.sz;) {
+ pos = 0;
+ lnn_start = lnn;
+ while (i < (int)blk.sz) {
+ if ('\n' == blk.buf[i]) {
+ ++i;
+ ++lnn;
+ break;
+ }
+ /* Trailing backslash is like a plain character. */
+ if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
+ if (pos >= (int)ln.sz)
+ if (! resize_buf(&ln, 256))
+ goto bailout;
+ ln.buf[pos++] = blk.buf[i++];
+ continue;
+ }
+ /* Found an escape and at least one other character. */
+ if ('\n' == blk.buf[i + 1]) {
+ /* Escaped newlines are skipped over */
+ i += 2;
+ ++lnn;
+ continue;
+ }
+ if ('"' == blk.buf[i + 1]) {
+ i += 2;
+ /* Comment, skip to end of line */
+ for (; i < (int)blk.sz; ++i) {
+ if ('\n' == blk.buf[i]) {
+ ++i;
+ ++lnn;
+ break;
+ }
+ }
+ /* Backout trailing whitespaces */
+ for (; pos > 0; --pos) {
+ if (ln.buf[pos - 1] != ' ')
+ break;
+ if (pos > 2 && ln.buf[pos - 2] == '\\')
+ break;
}
+ break;
}
+ /* Some other escape sequence, copy and continue. */
+ if (pos + 1 >= (int)ln.sz)
+ if (! resize_buf(&ln, 256))
+ goto bailout;
- ln->buf[pos] = 0;
- lnn++;
-
- /*
- * If no manual parser has been assigned, then
- * try to assign one in pset(), which may do
- * nothing at all. After this, parse the manual
- * line accordingly.
- */
-
- if ( ! (man || mdoc) && ! pset(ln->buf,
- pos, curp, &man, &mdoc))
- return(0);
-
- pos = 0;
-
- if (man && ! man_parseln(man, lnn, ln->buf))
- return(0);
- if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
- return(0);
+ ln.buf[pos++] = blk.buf[i++];
+ ln.buf[pos++] = blk.buf[i++];
}
+
+ if (pos >= (int)ln.sz)
+ if (! resize_buf(&ln, 256))
+ goto bailout;
+ ln.buf[pos] = '\0';
+
+ /*
+ * A significant amount of complexity is contained by
+ * the roff preprocessor. It's line-oriented but can be
+ * expressed on one line, so we need at times to
+ * readjust our starting point and re-run it. The roff
+ * preprocessor can also readjust the buffers with new
+ * data, so we pass them in wholesale.
+ */
+
+ of = 0;
+ do {
+ re = roff_parseln(roff, lnn_start,
+ &ln.buf, &ln.sz, of, &of);
+ } while (ROFF_RERUN == re);
+
+ if (ROFF_IGN == re)
+ continue;
+ else if (ROFF_ERR == re)
+ goto bailout;
+
+ /*
+ * If input parsers have not been allocated, do so now.
+ * We keep these instanced betwen parsers, but set them
+ * locally per parse routine since we can use different
+ * parsers with each one.
+ */
+
+ if ( ! (man || mdoc))
+ if ( ! pset(ln.buf + of, pos - of, curp, &man, &mdoc))
+ goto bailout;
+
+ /* Lastly, push down into the parsers themselves. */
+
+ if (man && ! man_parseln(man, lnn_start, ln.buf, of))
+ goto bailout;
+ if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf, of))
+ goto bailout;
}
- /* Note that a parser may not have been assigned, yet. */
+ /* NOTE a parser may not have been assigned, yet. */
if ( ! (man || mdoc)) {
- warnx("%s: not a manual", curp->file);
- return(0);
+ fprintf(stderr, "%s: Not a manual\n", curp->file);
+ goto bailout;
}
+ /* Clean up the parse routine ASTs. */
+
if (mdoc && ! mdoc_endparse(mdoc))
- return(0);
+ goto bailout;
if (man && ! man_endparse(man))
- return(0);
+ goto bailout;
+ if (roff && ! roff_endparse(roff))
+ goto bailout;
- /*
- * If an output device hasn't been allocated, see if we should
- * do so now. Note that not all outtypes have functions, so
- * this switch statement may be superfluous, but it's
- * low-overhead enough not to matter very much.
- */
+ /* If unset, allocate output dev now (if applicable). */
if ( ! (curp->outman && curp->outmdoc)) {
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):
+ 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;
case (OUTT_LINT):
break;
default:
- curp->outdata = ascii_alloc();
+ curp->outdata = ascii_alloc(80);
curp->outman = terminal_man;
curp->outmdoc = terminal_mdoc;
curp->outfree = terminal_free;
/* 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);
+
+ cleanup:
+ if (mdoc)
+ mdoc_reset(mdoc);
+ if (man)
+ man_reset(man);
+ if (roff)
+ roff_reset(roff);
+ if (ln.buf)
+ free(ln.buf);
+ if (with_mmap)
+ munmap(blk.buf, blk.sz);
+ else
+ free(blk.buf);
- return(1);
+ return;
+
+ bailout:
+ with_error = 1;
+ goto cleanup;
}
pset(const char *buf, int pos, struct curparse *curp,
struct man **man, struct mdoc **mdoc)
{
+ int i;
/*
* Try to intuit which kind of manual parser should be used. If
* passed in by command-line (-man, -mdoc), then use that
* explicitly. If passed as -mandoc, then try to guess from the
- * line: either skip comments, use -mdoc when finding `.Dt', or
+ * line: either skip dot-lines, use -mdoc when finding `.Dt', or
* default to -man, which is more lenient.
*/
- if (pos >= 3 && 0 == memcmp(buf, ".\\\"", 3))
- return(1);
+ if ('.' == buf[0] || '\'' == buf[0]) {
+ for (i = 1; buf[i]; i++)
+ if (' ' != buf[i] && '\t' != buf[i])
+ break;
+ if (0 == buf[i])
+ return(1);
+ }
switch (curp->inttype) {
case (INTT_MDOC):
curp->mdoc = mdoc_init(curp);
if (NULL == (*mdoc = curp->mdoc))
return(0);
- curp->lastmdoc = *mdoc;
return(1);
case (INTT_MAN):
if (NULL == curp->man)
curp->man = man_init(curp);
if (NULL == (*man = curp->man))
return(0);
- curp->lastman = *man;
return(1);
default:
break;
curp->mdoc = mdoc_init(curp);
if (NULL == (*mdoc = curp->mdoc))
return(0);
- curp->lastmdoc = *mdoc;
return(1);
}
curp->man = man_init(curp);
if (NULL == (*man = curp->man))
return(0);
- curp->lastman = *man;
return(1);
}
else if (0 == strcmp(arg, "an"))
*tflags = INTT_MAN;
else {
- warnx("bad argument: -m%s", arg);
+ fprintf(stderr, "%s: Bad argument\n", arg);
return(0);
}
static int
-toptions(enum outt *tflags, char *arg)
+toptions(struct curparse *curp, char *arg)
{
if (0 == strcmp(arg, "ascii"))
- *tflags = OUTT_ASCII;
- else if (0 == strcmp(arg, "lint"))
- *tflags = OUTT_LINT;
+ curp->outtype = OUTT_ASCII;
+ else if (0 == strcmp(arg, "lint")) {
+ curp->outtype = OUTT_LINT;
+ curp->wflags |= WARN_WALL;
+ curp->fflags |= FL_STRICT;
+ }
else if (0 == strcmp(arg, "tree"))
- *tflags = OUTT_TREE;
+ curp->outtype = OUTT_TREE;
+ else if (0 == strcmp(arg, "html"))
+ curp->outtype = OUTT_HTML;
+ else if (0 == strcmp(arg, "xhtml"))
+ curp->outtype = OUTT_XHTML;
else {
- warnx("bad argument: -T%s", arg);
+ fprintf(stderr, "%s: Bad argument\n", arg);
return(0);
}
}
-/*
- * Parse out the options for [-fopt...] setting compiler options. These
- * can be comma-delimited or called again.
- */
static int
foptions(int *fflags, char *arg)
{
- char *v;
- char *toks[5];
+ char *v, *o;
+ const char *toks[8];
toks[0] = "ign-scope";
- toks[1] = "ign-escape";
- toks[2] = "ign-macro";
- toks[3] = "no-ign-macro";
- toks[4] = NULL;
-
- while (*arg)
- switch (getsubopt(&arg, toks, &v)) {
+ toks[1] = "no-ign-escape";
+ toks[2] = "no-ign-macro";
+ toks[3] = "ign-errors";
+ toks[4] = "strict";
+ toks[5] = "ign-escape";
+ toks[6] = NULL;
+
+ while (*arg) {
+ o = arg;
+ switch (getsubopt(&arg, UNCONST(toks), &v)) {
case (0):
- *fflags |= IGN_SCOPE;
+ *fflags |= FL_IGN_SCOPE;
break;
case (1):
- *fflags |= IGN_ESCAPE;
+ *fflags |= FL_NIGN_ESCAPE;
break;
case (2):
- *fflags |= IGN_MACRO;
+ *fflags |= FL_NIGN_MACRO;
break;
case (3):
- *fflags |= NO_IGN_MACRO;
+ *fflags |= FL_IGN_ERRORS;
+ break;
+ case (4):
+ *fflags |= FL_STRICT;
+ break;
+ case (5):
+ *fflags &= ~FL_NIGN_ESCAPE;
break;
default:
- warnx("bad argument: -f%s", arg);
+ fprintf(stderr, "%s: Bad argument\n", o);
return(0);
}
+ }
return(1);
}
-/*
- * Parse out the options for [-Werr...], which sets warning modes.
- * These can be comma-delimited or called again.
- */
static int
woptions(int *wflags, char *arg)
{
- char *v;
- char *toks[5];
+ char *v, *o;
+ const 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)
- switch (getsubopt(&arg, toks, &v)) {
+ while (*arg) {
+ o = arg;
+ switch (getsubopt(&arg, UNCONST(toks), &v)) {
case (0):
*wflags |= WARN_WALL;
break;
case (1):
- *wflags |= WARN_WCOMPAT;
- break;
- case (2):
- *wflags |= WARN_WSYNTAX;
- break;
- case (3):
*wflags |= WARN_WERR;
break;
default:
- warnx("bad argument: -W%s", arg);
+ fprintf(stderr, "%s: Bad argument\n", o);
return(0);
}
+ }
return(1);
}
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);
+
+ with_error = 1;
+
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;
- return(1);
- case (WARN_SYNTAX):
- wtype = "syntax";
- if (curp->wflags & WARN_WSYNTAX)
- break;
+ if ( ! (curp->wflags & WARN_WALL))
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);
+ with_warning = 1;
+ if (curp->wflags & WARN_WERR) {
+ with_error = 1;
+ return(0);
+ }
- warnx("%s: considering warnings as errors",
- __progname);
- return(0);
+ return(1);
}
+static const char * const mandocerrs[MANDOCERR_MAX] = {
+ "ok",
+ "multi-line scope open on exit",
+ "request for scope closure when no matching scope is open",
+ "line arguments will be lost",
+ "memory exhausted"
+};
+/*
+ * XXX: this is experimental code that will eventually become the
+ * generic means of covering all warnings and errors!
+ */
+/* ARGSUSED */
static int
-manwarn(void *arg, int line, int col, const char *msg)
+mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg)
{
- struct curparse *curp;
+#if 0
+ struct curparse *cp;
- curp = (struct curparse *)arg;
+ cp = (struct curparse *)arg;
- if ( ! (curp->wflags & WARN_WSYNTAX))
- return(1);
+ fprintf(stderr, "%s:%d:%d: %s", cp->file,
+ ln, col + 1, mandocerrs[t]);
- warnx("%s:%d: syntax warning: %s (column %d)",
- curp->file, line, msg, col);
+ if (msg)
+ fprintf(stderr, ": %s", msg);
- if ( ! (curp->wflags & WARN_WERR))
- return(1);
-
- warnx("%s: considering warnings as errors",
- __progname);
- return(0);
+ fputc('\n', stderr);
+#endif
+ return(1);
}
git.ckatri.com / mandoc.git / blobdiff