=================================================================== RCS file: /cvs/mandoc/Attic/libmdocml.c,v retrieving revision 1.3 retrieving revision 1.19 diff -u -p -r1.3 -r1.19 --- mandoc/Attic/libmdocml.c 2008/11/22 20:15:34 1.3 +++ mandoc/Attic/libmdocml.c 2008/12/08 16:29:57 1.19 @@ -1,4 +1,4 @@ -/* $Id: libmdocml.c,v 1.3 2008/11/22 20:15:34 kristaps Exp $ */ +/* $Id: libmdocml.c,v 1.19 2008/12/08 16:29:57 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -17,6 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include #include @@ -25,58 +26,17 @@ #include #include "libmdocml.h" +#include "private.h" -#define BUFFER_LINE BUFSIZ +static int md_run_enter(const struct md_args *, + struct md_mbuf *, struct md_rbuf *, void *); +static int md_run_leave(const struct md_args *, struct md_mbuf *, + struct md_rbuf *, int, void *); -struct md_rbuf { - int fd; - char *name; - char *buf; - size_t bufsz; - size_t line; -}; +static ssize_t md_buf_fill(struct md_rbuf *); +static int md_buf_flush(struct md_mbuf *); -struct md_mbuf { - int fd; - char *name; - char *buf; - size_t bufsz; - size_t pos; -}; -typedef int (*md_line) (const struct md_args *, struct md_mbuf *, - const struct md_rbuf *, - const char *, size_t); -typedef int (*md_init) (const struct md_args *, struct md_mbuf *); -typedef int (*md_exit) (const struct md_args *, struct md_mbuf *); - -static int md_line_dummy(const struct md_args *, - struct md_mbuf *, - const struct md_rbuf *, - const char *, size_t); - -static int md_line_html4_strict(const struct md_args *, - struct md_mbuf *, - const struct md_rbuf *, - const char *, size_t); -static int md_init_html4_strict(const struct md_args *, - struct md_mbuf *); -static int md_exit_html4_strict(const struct md_args *, - struct md_mbuf *); - -static int md_run_enter(const struct md_args *, - struct md_mbuf *, struct md_rbuf *); -static int md_run_leave(const struct md_args *, - struct md_mbuf *, - struct md_rbuf *, int); - -static ssize_t md_buf_fill(struct md_rbuf *); -static int md_buf_flush(struct md_mbuf *); -static int md_buf_putchar(struct md_mbuf *, char); -static int md_buf_puts(struct md_mbuf *, - const char *, size_t); - - static ssize_t md_buf_fill(struct md_rbuf *in) { @@ -94,8 +54,7 @@ md_buf_fill(struct md_rbuf *in) } -static int -md_buf_flush(struct md_mbuf *buf) +static int md_buf_flush(struct md_mbuf *buf) { ssize_t sz; @@ -121,14 +80,25 @@ md_buf_flush(struct md_mbuf *buf) } -static int +int md_buf_putchar(struct md_mbuf *buf, char c) { + + assert(buf); return(md_buf_puts(buf, &c, 1)); } -static int +int +md_buf_putstring(struct md_mbuf *buf, const char *p) +{ + + assert(buf); + return(md_buf_puts(buf, p, strlen(p))); +} + + +int md_buf_puts(struct md_mbuf *buf, const char *p, size_t sz) { size_t ssz; @@ -158,8 +128,8 @@ md_buf_puts(struct md_mbuf *buf, const char *p, size_t static int -md_run_leave(const struct md_args *args, - struct md_mbuf *mbuf, struct md_rbuf *rbuf, int c) +md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, + struct md_rbuf *rbuf, int c, void *data) { assert(args); assert(mbuf); @@ -167,18 +137,18 @@ md_run_leave(const struct md_args *args, /* Run exiters. */ switch (args->type) { - case (MD_HTML4_STRICT): - if ( ! md_exit_html4_strict(args, mbuf)) - return(-1); + case (MD_HTML): + if ( ! md_exit_html(data, -1 == c ? 0 : 1)) + c = -1; break; - case (MD_DUMMY): - break; default: - abort(); + if ( ! md_exit_xml(data, -1 == c ? 0 : 1)) + c = -1; + break; } /* Make final flush of buffer. */ - if ( ! md_buf_flush(mbuf)) + if (-1 != c && ! md_buf_flush(mbuf)) return(-1); return(c); @@ -186,12 +156,12 @@ md_run_leave(const struct md_args *args, static int -md_run_enter(const struct md_args *args, - struct md_mbuf *mbuf, struct md_rbuf *rbuf) +md_run_enter(const struct md_args *args, struct md_mbuf *mbuf, + struct md_rbuf *rbuf, void *p) { ssize_t sz, i; - char line[BUFFER_LINE]; size_t pos; + char line[MD_LINE]; md_line fp; assert(args); @@ -200,48 +170,47 @@ md_run_enter(const struct md_args *args, /* Function ptrs to line-parsers. */ switch (args->type) { - case (MD_HTML4_STRICT): - fp = md_line_html4_strict; + case (MD_HTML): + fp = md_line_html; break; - case (MD_DUMMY): - fp = md_line_dummy; - break; default: - abort(); + fp = md_line_xml; + break; } - /* LINTED */ - for (pos = 0; ; ) { - if (-1 == (sz = md_buf_fill(rbuf))) - return(-1); - else if (0 == sz) - break; + pos = 0; - for (i = 0; i < sz; i++) { - if ('\n' == rbuf->buf[i]) { - if ( ! (*fp)(args, mbuf, rbuf, line, pos)) - return(-1); - rbuf->line++; - pos = 0; - continue; - } +again: + if (-1 == (sz = md_buf_fill(rbuf))) { + return(md_run_leave(args, mbuf, rbuf, -1, p)); + } else if (0 == sz && 0 != pos) { + warnx("%s: no newline at end of file", rbuf->name); + return(md_run_leave(args, mbuf, rbuf, -1, p)); + } else if (0 == sz) + return(md_run_leave(args, mbuf, rbuf, 0, p)); - if (pos < BUFFER_LINE) { + for (i = 0; i < sz; i++) { + if ('\n' != rbuf->buf[i]) { + if (pos < MD_LINE) { /* LINTED */ - line[pos++] = rbuf->buf[i]; + rbuf->linebuf[pos++] = rbuf->buf[i]; continue; } - warnx("%s: line %zu too long", rbuf->name, rbuf->line); - return(-1); + return(md_run_leave(args, mbuf, rbuf, -1, p)); } + + rbuf->linebuf[(int)pos] = 0; + (void)memcpy(line, rbuf->linebuf, sizeof(line)); + if ( ! (*fp)(p, line)) + return(md_run_leave(args, mbuf, rbuf, -1, p)); + rbuf->line++; + pos = 0; } - if (0 != pos && ! (*fp)(args, mbuf, rbuf, line, pos)) - return(-1); - - return(md_run_leave(args, mbuf, rbuf, 0)); + goto again; + /* NOTREACHED */ } @@ -251,6 +220,7 @@ md_run(const struct md_args *args, { struct md_mbuf mbuf; struct md_rbuf rbuf; + void *data; assert(args); assert(in); @@ -264,70 +234,14 @@ md_run(const struct md_args *args, /* Run initialisers. */ switch (args->type) { - case (MD_HTML4_STRICT): - if ( ! md_init_html4_strict(args, &mbuf)) - return(-1); + case (MD_HTML): + data = md_init_html(args, &mbuf, &rbuf); break; - case (MD_DUMMY): - break; default: - abort(); + data = md_init_xml(args, &mbuf, &rbuf); + break; } /* Go into mainline. */ - return(md_run_enter(args, &mbuf, &rbuf)); -} - - -static int -md_line_dummy(const struct md_args *args, struct md_mbuf *out, - const struct md_rbuf *in, const char *buf, size_t sz) -{ - - assert(buf); - assert(out); - assert(in); - assert(args); - - if ( ! md_buf_puts(out, buf, sz)) - return(0); - if ( ! md_buf_putchar(out, '\n')) - return(0); - - return(1); -} - - -static int -md_exit_html4_strict(const struct md_args *args, struct md_mbuf *p) -{ - - assert(p); - assert(args); - return(1); -} - - -static int -md_init_html4_strict(const struct md_args *args, struct md_mbuf *p) -{ - - assert(p); - assert(args); - return(1); -} - - -static int -md_line_html4_strict(const struct md_args *args, struct md_mbuf *out, - const struct md_rbuf *in, const char *buf, size_t sz) -{ - - assert(args); - assert(buf); - assert(out); - assert(in); - (void)sz; - - return(1); + return(md_run_enter(args, &mbuf, &rbuf, data)); }