-/* $Id: main.c,v 1.91 2010/06/26 15:36:37 kristaps Exp $ */
+/* $Id: main.c,v 1.100 2010/07/25 11:44:31 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <sys/stat.h>
#include <assert.h>
+#include <ctype.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdint.h>
#include <unistd.h>
#include "mandoc.h"
-#include "regs.h"
#include "main.h"
#include "mdoc.h"
#include "man.h"
OUTT_HTML,
OUTT_XHTML,
OUTT_LINT,
- OUTT_PS
+ OUTT_PS,
+ OUTT_PDF
};
struct curparse {
struct man *man; /* man parser */
struct mdoc *mdoc; /* mdoc parser */
struct roff *roff; /* roff parser (!NULL) */
+ struct regset regs; /* roff registers */
enum outt outtype; /* which output to use */
out_mdoc outmdoc; /* mdoc output ptr */
out_man outman; /* man output ptr */
static const char * const mandocerrs[MANDOCERR_MAX] = {
"ok",
+
+ "generic warning",
+
"text should be uppercase",
"sections out of conventional order",
"section name repeats",
"list type must come first",
"bad standard",
"bad library",
+ "tab in non-literal context",
"bad escape sequence",
"unterminated quoted string",
"argument requires the width argument",
"unknown manual section",
"section not in conventional manual section",
"end of line whitespace",
+ "blocks badly nested",
"scope open on exit",
+
+ "generic error",
+
"NAME section must come first",
"bad Boolean value",
"child violates parent syntax",
"bad comment style",
"unknown macro will be lost",
"line scope broken",
- "scope broken",
"argument count wrong",
"request scope close w/none open",
"scope already open",
"no title in document",
"missing list type",
"missing display type",
+ "missing font type",
"line argument(s) will be lost",
"body argument(s) will be lost",
+
+ "generic fatal error",
+
"column syntax is inconsistent",
- "missing font type",
"displays may not be nested",
"unsupported display type",
- "no scope to rewind: syntax violated",
+ "blocks badly nested",
+ "no such block is open",
"scope broken, syntax violated",
"line scope broken, syntax violated",
"argument count wrong, violates syntax",
static int woptions(int *, char *);
static const char *progname;
-static int with_error;
-static int with_warning;
+static int with_fatal;
+static int with_error;
int
main(int argc, char *argv[])
while (*argv) {
ffile(*argv, &curp);
- if (with_error && !(curp.fflags & FL_IGN_ERRORS))
+ if (with_fatal && !(curp.fflags & FL_IGN_ERRORS))
break;
++argv;
}
if (curp.roff)
roff_free(curp.roff);
- return((with_warning || with_error) ?
+ return((with_fatal || with_error) ?
EXIT_FAILURE : EXIT_SUCCESS);
}
if (curp->fflags & FL_NIGN_ESCAPE)
pflags &= ~MAN_IGN_ESCAPE;
- return(man_alloc(curp, pflags, mmsg));
+ return(man_alloc(&curp->regs, curp, pflags, mmsg));
}
roff_init(struct curparse *curp)
{
- return(roff_alloc(mmsg, curp));
+ return(roff_alloc(&curp->regs, mmsg, curp));
}
if (curp->fflags & FL_NIGN_MACRO)
pflags &= ~MDOC_IGN_MACRO;
- return(mdoc_alloc(curp, pflags, mmsg));
+ return(mdoc_alloc(&curp->regs, curp, pflags, mmsg));
}
curp->file = file;
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
perror(curp->file);
- with_error = 1;
+ with_fatal = 1;
return;
}
if (-1 == fstat(curp->fd, &st)) {
perror(curp->file);
- with_error = 1;
+ with_fatal = 1;
return(0);
}
if (st.st_size >= (1U << 31)) {
fprintf(stderr, "%s: input too large\n",
curp->file);
- with_error = 1;
+ with_fatal = 1;
return(0);
}
*with_mmap = 1;
free(fb->buf);
fb->buf = NULL;
- with_error = 1;
+ with_fatal = 1;
return(0);
}
struct man *man;
struct mdoc *mdoc;
struct roff *roff;
- struct regset regs;
man = NULL;
mdoc = NULL;
roff = NULL;
+
memset(&ln, 0, sizeof(struct buf));
- memset(®s, 0, sizeof(struct regset));
/*
* Two buffers: ln and buf. buf is the input file and may be
++lnn;
break;
}
+
+ /*
+ * Warn about bogus characters. If you're using
+ * non-ASCII encoding, you're screwing your
+ * readers. Since I'd rather this not happen,
+ * I'll be helpful and drop these characters so
+ * we don't display gibberish. Note to manual
+ * writers: use special characters.
+ */
+
+ if ( ! isgraph((u_char)blk.buf[i]) &&
+ ! isblank((u_char)blk.buf[i])) {
+ if ( ! mmsg(MANDOCERR_BADCHAR, curp,
+ lnn_start, pos,
+ "ignoring byte"))
+ goto bailout;
+ i++;
+ continue;
+ }
+
/* Trailing backslash is like a plain character. */
if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
if (pos >= (int)ln.sz)
of = 0;
do {
- re = roff_parseln(roff, ®s, lnn_start,
+ re = roff_parseln(roff, lnn_start,
&ln.buf, &ln.sz, of, &of);
} while (ROFF_RERUN == re);
/* Lastly, push down into the parsers themselves. */
- if (man && ! man_parseln(man, ®s, lnn_start, ln.buf, of))
+ if (man && ! man_parseln(man, lnn_start, ln.buf, of))
goto bailout;
- if (mdoc && ! mdoc_parseln(mdoc, ®s, lnn_start, ln.buf, of))
+ if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf, of))
goto bailout;
}
curp->outdata = ascii_alloc(curp->outopts);
curp->outfree = ascii_free;
break;
+ case (OUTT_PDF):
+ curp->outdata = pdf_alloc(curp->outopts);
+ curp->outfree = pspdf_free;
+ break;
case (OUTT_PS):
- curp->outdata = ps_alloc();
- curp->outfree = ps_free;
+ curp->outdata = ps_alloc(curp->outopts);
+ curp->outfree = pspdf_free;
break;
default:
break;
curp->outman = tree_man;
curp->outmdoc = tree_mdoc;
break;
+ case (OUTT_PDF):
+ /* FALLTHROUGH */
case (OUTT_ASCII):
/* FALLTHROUGH */
case (OUTT_PS):
(*curp->outmdoc)(curp->outdata, mdoc);
cleanup:
+ memset(&curp->regs, 0, sizeof(struct regset));
if (mdoc)
mdoc_reset(mdoc);
if (man)
return;
bailout:
- with_error = 1;
+ with_fatal = 1;
goto cleanup;
}
curp->outtype = OUTT_XHTML;
else if (0 == strcmp(arg, "ps"))
curp->outtype = OUTT_PS;
+ else if (0 == strcmp(arg, "pdf"))
+ curp->outtype = OUTT_PDF;
else {
fprintf(stderr, "%s: Bad argument\n", arg);
return(0);
mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg)
{
struct curparse *cp;
+ const char *level;
+ int rc;
cp = (struct curparse *)arg;
-
- if (t <= MANDOCERR_ERROR) {
- if ( ! (cp->wflags & WARN_WALL))
+ level = NULL;
+ rc = 1;
+
+ if (t >= MANDOCERR_FATAL) {
+ with_fatal = 1;
+ level = "FATAL";
+ rc = 0;
+ } else {
+ if ( ! (WARN_WALL & cp->wflags))
return(1);
- with_warning = 1;
- } else
- with_error = 1;
-
- fprintf(stderr, "%s:%d:%d: %s", cp->file,
- ln, col + 1, mandocerrs[t]);
+ if (t >= MANDOCERR_ERROR) {
+ with_error = 1;
+ level = "ERROR";
+ }
+ if (WARN_WERR & cp->wflags) {
+ with_fatal = 1;
+ rc = 0;
+ }
+ }
+ fprintf(stderr, "%s:%d:%d:", cp->file, ln, col + 1);
+ if (level)
+ fprintf(stderr, " %s:", level);
+ fprintf(stderr, " %s", mandocerrs[t]);
if (msg)
fprintf(stderr, ": %s", msg);
-
fputc('\n', stderr);
- /* This is superfluous, but whatever. */
- if (t > MANDOCERR_ERROR)
- return(0);
- if (cp->wflags & WARN_WERR) {
- with_error = 1;
- return(0);
- }
- return(1);
+ return(rc);
}
git.ckatri.com / mandoc.git / blobdiff