=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v retrieving revision 1.29 retrieving revision 1.30 diff -c -r1.29 -r1.30 *** src/usr.bin/mandoc/main.c 2010/05/15 22:00:22 1.29 --- src/usr.bin/mandoc/main.c 2010/05/16 00:54:03 1.30 *************** *** 1,4 **** ! /* $Id: main.c,v 1.29 2010/05/15 22:00:22 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * --- 1,4 ---- ! /* $Id: main.c,v 1.30 2010/05/16 00:54:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * *************** *** 26,33 **** --- 26,35 ---- #include #include + #include "mandoc.h" #include "mdoc.h" #include "man.h" + #include "roff.h" #include "main.h" #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) *************** *** 59,64 **** --- 61,67 ---- const char *file; /* Current parse. */ int fd; /* Current parse. */ int wflags; + /* FIXME: set by max error */ #define WARN_WALL (1 << 0) /* All-warnings mask. */ #define WARN_WERR (1 << 2) /* Warnings->errors. */ int fflags; *************** *** 71,76 **** --- 74,80 ---- enum intt inttype; /* Input parsers... */ struct man *man; struct mdoc *mdoc; + struct roff *roff; enum outt outtype; /* Output devices... */ out_mdoc outmdoc; out_man outman; *************** *** 84,92 **** static int foptions(int *, char *); static struct man *man_init(struct curparse *); static struct mdoc *mdoc_init(struct curparse *); ! static int merr(void *, int, int, const char *); static int moptions(enum intt *, char *); ! static int mwarn(void *, int, int, const char *); static int pset(const char *, int, struct curparse *, struct man **, struct mdoc **); static int toptions(struct curparse *, char *); --- 88,99 ---- static int foptions(int *, 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 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 int toptions(struct curparse *, char *); *************** *** 166,171 **** --- 173,184 ---- 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((with_warning || with_error) ? EXIT_FAILURE : EXIT_SUCCESS); *************** *** 214,219 **** --- 227,240 ---- } + static struct roff * + roff_init(struct curparse *curp) + { + + return(roff_alloc(mmsg, curp)); + } + + static struct mdoc * mdoc_init(struct curparse *curp) { *************** *** 305,311 **** return(0); } *with_mmap = 1; ! fb->sz = st.st_size; fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_FILE, curp->fd, 0); if (fb->buf != MAP_FAILED) --- 326,332 ---- return(0); } *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) *************** *** 331,337 **** if (! resize_buf(fb, 65536)) break; } ! ssz = read(curp->fd, fb->buf + off, fb->sz - off); if (ssz == 0) { fb->sz = off; return(1); --- 352,358 ---- 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); *************** *** 340,346 **** perror(curp->file); break; } ! off += ssz; } free(fb->buf); --- 361,367 ---- perror(curp->file); break; } ! off += (size_t)ssz; } free(fb->buf); *************** *** 355,365 **** --- 376,389 ---- { struct buf ln, blk; int i, pos, lnn, lnn_start, with_mmap; + enum rofferr re; struct man *man; struct mdoc *mdoc; + struct roff *roff; man = NULL; mdoc = NULL; + roff = NULL; memset(&ln, 0, sizeof(struct buf)); /* *************** *** 367,375 **** * memory mapped. ln is a line buffer and grows on-demand. */ ! if (!read_whole_file(curp, &blk, &with_mmap)) return; for (i = 0, lnn = 1; i < (int)blk.sz;) { pos = 0; lnn_start = lnn; --- 391,404 ---- * memory mapped. ln is a line buffer and grows on-demand. */ ! 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; *************** *** 425,432 **** if (pos >= (int)ln.sz) if (! resize_buf(&ln, 256)) goto bailout; ! ln.buf[pos] = 0; /* If unset, assign parser in pset(). */ if ( ! (man || mdoc) && ! pset(ln.buf, pos, curp, &man, &mdoc)) --- 454,467 ---- if (pos >= (int)ln.sz) if (! resize_buf(&ln, 256)) goto bailout; ! ln.buf[pos] = '\0'; + re = roff_parseln(roff, lnn_start, &ln.buf, &ln.sz); + if (ROFF_IGN == re) + continue; + else if (ROFF_ERR == re) + goto bailout; + /* If unset, assign parser in pset(). */ if ( ! (man || mdoc) && ! pset(ln.buf, pos, curp, &man, &mdoc)) *************** *** 434,442 **** /* Pass down into parsers. */ ! if (man && ! man_parseln(man, lnn, ln.buf)) goto bailout; ! if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf)) goto bailout; } --- 469,477 ---- /* Pass down into parsers. */ ! if (man && ! man_parseln(man, lnn_start, ln.buf)) goto bailout; ! if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf)) goto bailout; } *************** *** 451,456 **** --- 486,493 ---- goto bailout; if (man && ! man_endparse(man)) goto bailout; + if (roff && ! roff_endparse(roff)) + goto bailout; /* If unset, allocate output dev now (if applicable). */ *************** *** 491,510 **** (*curp->outmdoc)(curp->outdata, mdoc); cleanup: ! if (curp->mdoc) { ! mdoc_free(curp->mdoc); ! curp->mdoc = NULL; ! } ! if (curp->man) { ! man_free(curp->man); ! curp->man = NULL; ! } if (ln.buf) free(ln.buf); if (with_mmap) munmap(blk.buf, blk.sz); else free(blk.buf); return; bailout: --- 528,546 ---- (*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; bailout: *************** *** 726,728 **** --- 762,795 ---- 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 + mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) + { + #if 0 + struct curparse *cp; + + cp = (struct curparse *)arg; + + fprintf(stderr, "%s:%d:%d: %s", cp->file, + ln, col + 1, mandocerrs[t]); + + if (msg) + fprintf(stderr, ": %s", msg); + + fputc('\n', stderr); + #endif + return(1); + }