=================================================================== RCS file: /cvs/mandoc/Attic/mmain.c,v retrieving revision 1.1 retrieving revision 1.10 diff -u -p -r1.1 -r1.10 --- mandoc/Attic/mmain.c 2009/02/22 22:58:39 1.1 +++ mandoc/Attic/mmain.c 2009/03/09 13:04:01 1.10 @@ -1,4 +1,4 @@ - /* $Id: mmain.c,v 1.1 2009/02/22 22:58:39 kristaps Exp $ */ + /* $Id: mmain.c,v 1.10 2009/03/09 13:04:01 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -30,7 +30,7 @@ #include "mmain.h" -#define MD_LINE_SZ (256) /* Max input line size. */ +#define MD_LINE_SZ (256) /* Input line step-size. */ struct mmain { int warn; /* Warning flags. */ @@ -41,14 +41,16 @@ struct mmain { int dbg; /* Debug level. */ struct mdoc *mdoc; /* Active parser. */ char *buf; /* Input buffer. */ - u_long bufsz; /* Input buffer size. */ - char in[MAXPATHLEN]; /* Input file name. */ + size_t bufsz; /* Input buffer size. */ + char *in; /* Input file name. */ int fdin; /* Input file desc. */ + int pflags; /* Parse flags. */ }; extern char *__progname; -static int getsopts(struct mmain *, char *); +static int optswarn(struct mmain *, char *); +static int optsopt(struct mmain *, char *); static int parse(struct mmain *); static void msg_msg(void *, int, int, const char *); static int msg_err(void *, int, int, const char *); @@ -57,18 +59,26 @@ static int msg_warn(void *, int, int, #ifdef __linux__ extern int getsubopt(char **, char *const *, char **); +extern size_t strlcpy(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); #endif +/* + * Print our and our caller's usage message. + */ void mmain_usage(const char *help) { - warnx("usage: %s %s%s[-v] [-Wwarn...] [infile]", __progname, + warnx("usage: %s %s%s[-v] [-foption...] [-Wwarn...] [infile]", __progname, help ? help : "", help ? " " : ""); } +/* + * Allocate the convenience library and initialise some values. + */ struct mmain * mmain_alloc(void) { @@ -77,67 +87,77 @@ mmain_alloc(void) if (NULL == (p = calloc(1, sizeof(struct mmain)))) err(1, "malloc"); - (void)strlcpy(p->in, "-", MAXPATHLEN); + p->in = "-"; p->fdin = STDIN_FILENO; return(p); } +/* + * Parse command-line options. Accepts a small (<28 char) opstring "u" + * parameter (e.g. "ho:") or NULL, a corresponding "help" string (e.g. + * "[-h] [-o output]" or NULL, a callback function for parsed arguments + * and an opaque pointer argument for that function. + */ int -mmain_isopt(int c) +mmain_getopt(struct mmain *p, int argc, char *argv[], + const char *help, const char *u, void *arg, + int (*getopt_cb)(void *, int, const char *)) { - - switch (c) { - case ('v'): - /* FALLTHROUGH */ - case ('W'): - return(1); - default: - break; - } - return(0); -} + int c; + char opts[32]; /* XXX */ + size_t sz; + extern int optind; -int -mmain_getopt(struct mmain *p, int argc, - char *argv[], const char *help) -{ - int c; + sz = strlcpy(opts, "VvW:f:", 32); + assert(sz < 32); - while (-1 != (c = getopt(argc, argv, ":vW:"))) + if (u) { + sz = strlcat(opts, u, 32); + assert(sz < 32); + } + + optind = 1; + + /* LINTED */ + while (-1 != (c = getopt(argc, argv, opts))) switch (c) { + case ('f'): + if ( ! optsopt(p, optarg)) + return(-1); + break; case ('v'): p->dbg++; break; + case ('V'): + (void)printf("%s %s\n", __progname, VERSION); + return(0); case ('W'): - if ( ! getsopts(p, optarg)) - return(0); + if ( ! optswarn(p, optarg)) + return(-1); break; case ('?'): - break; - default: mmain_usage(help); - return(0); + return(-1); + default: + assert(getopt_cb); + if ((*getopt_cb)(arg, c, optarg)) + break; + return(-1); } argv += optind; - argc -= optind; + if ((argc -= optind) > 0) + p->in = *argv++; - if (0 == argc) - return(1); - - if (strlcpy(p->in, *argv++, MAXPATHLEN) < MAXPATHLEN) - return(1); - - warnx("filename too long"); - return(0); + return(1); } -__dead void -mmain_exit(struct mmain *p, int code) +dead_pre void +mmain_exit(struct mmain *p, int code) { if (p->mdoc) @@ -170,7 +190,7 @@ mmain_mdoc(struct mmain *p) warn("%s", p->in); p->bufsz = BUFSIZ; } else - p->bufsz = MAX(st.st_blksize, BUFSIZ); + p->bufsz = (size_t)MAX(st.st_blksize, BUFSIZ); p->buf = malloc(p->bufsz); if (NULL == p->buf) @@ -178,7 +198,7 @@ mmain_mdoc(struct mmain *p) /* Allocate the parser. */ - p->mdoc = mdoc_alloc(p, &cb); + p->mdoc = mdoc_alloc(p, p->pflags, &cb); /* Parse the input file. */ @@ -194,9 +214,36 @@ mmain_mdoc(struct mmain *p) static int -getsopts(struct mmain *p, char *arg) +optsopt(struct mmain *p, char *arg) { char *v; + char *toks[] = { "ign-scope", "ign-escape", + "ign-macro", NULL }; + + while (*arg) + switch (getsubopt(&arg, toks, &v)) { + case (0): + p->pflags |= MDOC_IGN_SCOPE; + break; + case (1): + p->pflags |= MDOC_IGN_ESCAPE; + break; + case (2): + p->pflags |= MDOC_IGN_MACRO; + break; + default: + warnx("unknown -f argument"); + return(0); + } + + return(1); +} + + +static int +optswarn(struct mmain *p, char *arg) +{ + char *v; char *toks[] = { "all", "compat", "syntax", "error", NULL }; @@ -215,6 +262,7 @@ getsopts(struct mmain *p, char *arg) p->warn |= MD_WARN_ERR; break; default: + warnx("unknown -W argument"); return(0); } @@ -225,47 +273,57 @@ getsopts(struct mmain *p, char *arg) static int parse(struct mmain *p) { - ssize_t sz, i; - size_t pos; - char line[MD_LINE_SZ]; - int lnn; + ssize_t sz; + int j, i, pos, len, lnn; + char *ln; - /* - * This is a little more complicated than fgets. TODO: have - * some benchmarks that show it's faster (note that I want to - * check many, many manuals simultaneously, so speed is - * important). Fill a buffer (sized to the block size) with a - * single read, then parse \n-terminated lines into a line - * buffer, which is passed to the parser. Hard-code the line - * buffer to a particular size -- a reasonable assumption. - */ - - for (lnn = 1, pos = 0; ; ) { + for (ln = NULL, lnn = 1, len = pos = 0; ; ) { if (-1 == (sz = read(p->fdin, p->buf, p->bufsz))) { warn("%s", p->in); return(0); } else if (0 == sz) break; - for (i = 0; i < sz; i++) { + for (i = 0; i < (int)sz; i++) { + if (pos >= len) { + len += MD_LINE_SZ; + ln = realloc(ln, (size_t)len); + if (NULL == ln) + err(1, "realloc"); + } + if ('\n' != p->buf[i]) { - if (pos < sizeof(line)) { - line[(int)pos++] = p->buf[(int)i]; + ln[pos++] = p->buf[i]; + continue; + } + + /* Check for escaped newline. */ + + if (pos > 0 && '\\' == ln[pos - 1]) { + for (j = pos - 1; j >= 0; j--) + if ('\\' != ln[j]) + break; + + if ( ! ((pos - j) % 2)) { + pos--; + lnn++; continue; } - warnx("%s: line %d too long", p->in, lnn); - return(0); } - - line[(int)pos] = 0; - if ( ! mdoc_parseln(p->mdoc, lnn, line)) - return(0); + ln[pos] = 0; + if ( ! mdoc_parseln(p->mdoc, lnn, ln)) + return(0); lnn++; pos = 0; } } + if (pos > 0) + warnx("%s: file not eof-terminated", p->in); + + if (ln) + free(ln); return(mdoc_endparse(p->mdoc)); }