-/* $Id: main.c,v 1.129 2011/01/01 15:45:18 kristaps Exp $ */
+/* $Id: main.c,v 1.151 2011/03/16 15:28:35 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 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
#endif
#define REPARSE_LIMIT 1000
-#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a))
/* FIXME: Intel's compiler? LLVM? pcc? */
};
struct curparse {
- const char *file; /* Current parse. */
- int fd; /* Current parse. */
- int line; /* Line number in the file. */
- enum mandoclevel wlevel; /* Ignore messages below this. */
- int wstop; /* Stop after a file with a warning. */
+ enum mandoclevel exit_status; /* status of all file parses */
+ const char *file; /* current file-name */
+ enum mandoclevel file_status; /* error status of current parse */
+ int fd; /* current file-descriptor */
+ int line; /* line number in the file */
+ enum mandoclevel wlevel; /* ignore messages below this */
+ int wstop; /* stop after a file with a warning */
enum intt inttype; /* which parser to use */
struct man *pman; /* persistent man parser */
struct mdoc *pmdoc; /* persistent mdoc parser */
"no title in document",
"document title should be all caps",
"unknown manual section",
- "cannot parse date argument",
+ "date missing, using today's date",
+ "cannot parse date, using it verbatim",
"prologue macros out of order",
"duplicate prologue macro",
"macro not allowed in prologue",
/* related to macros and nesting */
"skipping obsolete macro",
"skipping paragraph macro",
+ "skipping no-space macro",
"blocks badly nested",
"child violates parent syntax",
"nested displays are not portable",
/* related to missing macro arguments */
"skipping empty macro",
+ "argument count wrong",
"missing display type",
"list type must come first",
"tag lists require a width argument",
"missing font type",
+ "skipping end of block that is not open",
/* related to bad macro arguments */
"skipping argument",
"bad comment style",
"unknown escape sequence",
"unterminated quoted string",
-
+
"generic error",
+ /* related to tables */
"bad table syntax",
"bad table option",
"bad table layout",
"no table layout cells specified",
"no table data cells specified",
+ "ignore data in cell",
+ "data block still open",
+ "ignoring extra data cells",
+
"input stack limit exceeded, infinite loop?",
"skipping bad character",
+ "escaped character not allowed in a name",
"skipping text before the first section header",
"skipping unknown macro",
- "NOT IMPLEMENTED: skipping request",
+ "NOT IMPLEMENTED, please use groff: skipping request",
"line scope broken",
"argument count wrong",
"skipping end of block that is not open",
static int woptions(struct curparse *, char *);
static const char *progname;
-static enum mandoclevel file_status = MANDOCLEVEL_OK;
-static enum mandoclevel exit_status = MANDOCLEVEL_OK;
int
main(int argc, char *argv[])
curp.inttype = INTT_AUTO;
curp.outtype = OUTT_ASCII;
curp.wlevel = MANDOCLEVEL_FATAL;
+ curp.exit_status = MANDOCLEVEL_OK;
/* LINTED */
while (-1 != (c = getopt(argc, argv, "m:O:T:VW:")))
while (*argv) {
ffile(*argv, &curp);
- if (MANDOCLEVEL_OK != exit_status && curp.wstop)
+ if (MANDOCLEVEL_OK != curp.exit_status && curp.wstop)
break;
++argv;
}
if (curp.roff)
roff_free(curp.roff);
- return((int)exit_status);
+ return((int)curp.exit_status);
}
if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
perror(curp->file);
- exit_status = MANDOCLEVEL_SYSERR;
+ curp->exit_status = MANDOCLEVEL_SYSERR;
return;
}
if (-1 == (fd = open(file, O_RDONLY, 0))) {
perror(file);
- file_status = MANDOCLEVEL_SYSERR;
+ curp->file_status = MANDOCLEVEL_SYSERR;
return(0);
}
if (-1 == close(fd))
perror(file);
- return(MANDOCLEVEL_FATAL > file_status ? 1 : 0);
+ return(MANDOCLEVEL_FATAL > curp->file_status ? 1 : 0);
}
curp->mdoc = NULL;
curp->man = NULL;
- file_status = MANDOCLEVEL_OK;
+ curp->file_status = MANDOCLEVEL_OK;
/* Make sure the mandotory roff parser is initialised. */
pdesc(curp);
- if (MANDOCLEVEL_FATAL <= file_status)
+ if (MANDOCLEVEL_FATAL <= curp->file_status)
goto cleanup;
/* NOTE a parser may not have been assigned, yet. */
if ( ! (curp->man || curp->mdoc)) {
fprintf(stderr, "%s: Not a manual\n", curp->file);
- file_status = MANDOCLEVEL_FATAL;
+ curp->file_status = MANDOCLEVEL_FATAL;
goto cleanup;
}
/* Clean up the parse routine ASTs. */
if (curp->mdoc && ! mdoc_endparse(curp->mdoc)) {
- assert(MANDOCLEVEL_FATAL <= file_status);
+ assert(MANDOCLEVEL_FATAL <= curp->file_status);
goto cleanup;
}
if (curp->man && ! man_endparse(curp->man)) {
- assert(MANDOCLEVEL_FATAL <= file_status);
+ assert(MANDOCLEVEL_FATAL <= curp->file_status);
goto cleanup;
}
assert(curp->roff);
- if ( ! roff_endparse(curp->roff)) {
- assert(MANDOCLEVEL_FATAL <= file_status);
- goto cleanup;
- }
+ roff_endparse(curp->roff);
/*
* With -Wstop and warnings or errors of at least
* the requested level, do not produce output.
*/
- if (MANDOCLEVEL_OK != file_status && curp->wstop)
+ if (MANDOCLEVEL_OK != curp->file_status && curp->wstop)
goto cleanup;
/* If unset, allocate output dev now (if applicable). */
assert(curp->roff);
roff_reset(curp->roff);
- if (exit_status < file_status)
- exit_status = file_status;
+ if (curp->exit_status < curp->file_status)
+ curp->exit_status = curp->file_status;
return;
}
*/
if ( ! read_whole_file(curp, &blk, &with_mmap)) {
- file_status = MANDOCLEVEL_SYSERR;
+ curp->file_status = MANDOCLEVEL_SYSERR;
return;
}
free(blk.buf);
}
+/*
+ * Main parse routine for an opened file. This is called for each
+ * opened file and simply loops around the full input file, possibly
+ * nesting (i.e., with `so').
+ */
static void
parsebuf(struct curparse *curp, struct buf blk, int start)
{
+ const struct tbl_span *span;
struct buf ln;
enum rofferr rr;
int i, of, rc;
int lnn; /* line number in the real file */
unsigned char c;
- /*
- * Main parse routine for an opened file. This is called for
- * each opened file and simply loops around the full input file,
- * possibly nesting (i.e., with `so').
- */
-
memset(&ln, 0, sizeof(struct buf));
lnn = curp->line;
}
while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+
+ /*
+ * When finding an unescaped newline character,
+ * leave the character loop to process the line.
+ * Skip a preceding carriage return, if any.
+ */
+
+ if ('\r' == blk.buf[i] && i + 1 < (int)blk.sz &&
+ '\n' == blk.buf[i + 1])
+ ++i;
if ('\n' == blk.buf[i]) {
++i;
++lnn;
continue;
}
- /* Found escape & at least one other char. */
+ /*
+ * Found escape and at least one other character.
+ * When it's a newline character, skip it.
+ * When there is a carriage return in between,
+ * skip that one as well.
+ */
+ if ('\r' == blk.buf[i + 1] && i + 2 < (int)blk.sz &&
+ '\n' == blk.buf[i + 2])
+ ++i;
if ('\n' == blk.buf[i + 1]) {
i += 2;
- /* Escaped newlines are skipped over */
++lnn;
continue;
}
pos = 0;
continue;
case (ROFF_APPEND):
- pos = strlen(ln.buf);
+ pos = (int)strlen(ln.buf);
continue;
case (ROFF_RERUN):
goto rerun;
pos = 0;
continue;
case (ROFF_ERR):
- assert(MANDOCLEVEL_FATAL <= file_status);
+ assert(MANDOCLEVEL_FATAL <= curp->file_status);
break;
case (ROFF_SO):
if (pfile(ln.buf + of, curp)) {
break;
}
+ /*
+ * If we encounter errors in the recursive parsebuf()
+ * call, make sure we don't continue parsing.
+ */
+
+ if (MANDOCLEVEL_FATAL <= curp->file_status)
+ break;
+
/*
* If input parsers have not been allocated, do so now.
* We keep these instanced betwen parsers, but set them
* currently open parse. Since we only get here if
* there does exist data (see tbl_data.c), we're
* guaranteed that something's been allocated.
+ * Do the same for ROFF_EQN.
*/
- if (ROFF_TBL == rr) {
- assert(curp->man || curp->mdoc);
- if (curp->man)
- man_addspan(curp->man, roff_span(curp->roff));
- else
- mdoc_addspan(curp->mdoc, roff_span(curp->roff));
+ rc = -1;
- } else if (curp->man || curp->mdoc) {
+ if (ROFF_TBL == rr)
+ while (NULL != (span = roff_span(curp->roff))) {
+ rc = curp->man ?
+ man_addspan(curp->man, span) :
+ mdoc_addspan(curp->mdoc, span);
+ if (0 == rc)
+ break;
+ }
+ else if (ROFF_EQN == rr)
+ rc = curp->mdoc ?
+ mdoc_addeqn(curp->mdoc,
+ roff_eqn(curp->roff)) :
+ man_addeqn(curp->man,
+ roff_eqn(curp->roff));
+ else if (curp->man || curp->mdoc)
rc = curp->man ?
man_parseln(curp->man,
curp->line, ln.buf, of) :
mdoc_parseln(curp->mdoc,
curp->line, ln.buf, of);
- if ( ! rc) {
- assert(MANDOCLEVEL_FATAL <= file_status);
- break;
- }
+ if (0 == rc) {
+ assert(MANDOCLEVEL_FATAL <= curp->file_status);
+ break;
}
/* Temporary buffers typically are not full. */
fprintf(stderr, ": %s", msg);
fputc('\n', stderr);
- if (file_status < level)
- file_status = level;
+ if (cp->file_status < level)
+ cp->file_status = level;
return(level < MANDOCLEVEL_FATAL);
}
git.ckatri.com / mandoc.git / blobdiff