Considerable improvements across the board.

[mandoc.git] / libmdocml.c

diff --git a/libmdocml.c b/libmdocml.c
index 5f1e1e8d2fa369781003f1f8d859f00f2de6e6e2..2bd5dfa77ba2f28f5dbc647baa82049b75d7350c 100644 (file)
--- a/libmdocml.c
+++ b/libmdocml.c
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.1 2008/11/22 14:53:29 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.6 2008/11/23 22:30:53 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -16,6 +16,234 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */

+#include <assert.h>
+#include <fcntl.h>
+#include <err.h>
+#include <stdio.h>

 #include <stdlib.h>
 #include <stdlib.h>

+#include <string.h>
+#include <unistd.h>

 
 #include "libmdocml.h"
 
 #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 *);
+static ssize_t  md_buf_fill(struct md_rbuf *);
+static int      md_buf_flush(struct md_mbuf *);
+
+
+static ssize_t
+md_buf_fill(struct md_rbuf *in)
+{
+       ssize_t          ssz;
+
+       assert(in);
+       assert(in->buf);
+       assert(in->bufsz > 0);
+       assert(in->name);
+
+       if (-1 == (ssz = read(in->fd, in->buf, in->bufsz))) 
+               warn("%s", in->name);
+
+       return(ssz);
+}
+
+
+static int
+md_buf_flush(struct md_mbuf *buf)
+{
+       ssize_t          sz;
+
+       assert(buf);
+       assert(buf->buf);
+       assert(buf->name);
+
+       if (0 == buf->pos)
+               return(1);
+
+       sz = write(buf->fd, buf->buf, buf->pos);
+
+       if (-1 == sz) {
+               warn("%s", buf->name);
+               return(0);
+       } else if ((size_t)sz != buf->pos) {
+               warnx("%s: short write", buf->name);
+               return(0);
+       }
+
+       buf->pos = 0;
+       return(1);
+}
+
+
+int
+md_buf_putchar(struct md_mbuf *buf, char c)
+{
+       return(md_buf_puts(buf, &c, 1));
+}
+
+
+int
+md_buf_putstring(struct md_mbuf *buf, const char *p)
+{
+       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;
+
+       assert(p);
+       assert(buf);
+       assert(buf->buf);
+
+       /* LINTED */
+       while (buf->pos + sz > buf->bufsz) {
+               ssz = buf->bufsz - buf->pos;
+               (void)memcpy(/* LINTED */
+                               buf->buf + buf->pos, p, ssz);
+               p += (long)ssz;
+               sz -= ssz;
+               buf->pos += ssz;
+
+               if ( ! md_buf_flush(buf))
+                       return(0);
+       }
+
+       (void)memcpy(/* LINTED */
+                       buf->buf + buf->pos, p, sz);
+       buf->pos += sz;
+       return(1);
+}
+
+
+static int
+md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, 
+               struct md_rbuf *rbuf, int c, void *data)
+{
+       assert(args);
+       assert(mbuf);
+       assert(rbuf);
+
+       /* Run exiters. */
+       switch (args->type) {
+       case (MD_HTML4_STRICT):
+               if ( ! md_exit_html4_strict(args, mbuf, rbuf, c, data))
+                       return(-1);
+               break;
+       case (MD_DUMMY):
+               break;
+       default:
+               abort();
+       }
+
+       /* Make final flush of buffer. */
+       if ( ! md_buf_flush(mbuf))
+               return(-1);
+
+       return(c);
+}
+
+
+static int
+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;
+       md_line          fp;
+
+       assert(args);
+       assert(mbuf);
+       assert(rbuf); 
+
+       /* Function ptrs to line-parsers. */
+       switch (args->type) {
+       case (MD_HTML4_STRICT):
+               fp = md_line_html4_strict;
+               break;
+       case (MD_DUMMY):
+               fp = md_line_dummy;
+               break;
+       default:
+               abort();
+       }
+
+       /* LINTED */
+       for (pos = 0; ; ) {
+               if (-1 == (sz = md_buf_fill(rbuf)))
+                       return(md_run_leave(args, mbuf, rbuf, -1, p));
+               else if (0 == sz)
+                       break;
+
+               for (i = 0; i < sz; i++) {
+                       if ('\n' == rbuf->buf[i]) {
+                               if ( ! (*fp)(args, mbuf, rbuf, line, pos, p))
+                                       return(md_run_leave(args, mbuf, rbuf,
+                                                               -1, p));
+                               rbuf->line++;
+                               pos = 0;
+                               continue;
+                       }
+
+                       if (pos < BUFFER_LINE) {
+                               /* LINTED */
+                               line[pos++] = rbuf->buf[i];
+                               continue;
+                       }
+
+                       warnx("%s: line %zu too long",
+                                       rbuf->name, rbuf->line);
+                       return(md_run_leave(args, mbuf, rbuf, -1, p));
+               }
+       }
+
+       if (0 != pos && ! (*fp)(args, mbuf, rbuf, line, pos, p))
+               return(md_run_leave(args, mbuf, rbuf, -1, p));
+
+       return(md_run_leave(args, mbuf, rbuf, 0, p));
+}
+
+
+int
+md_run(const struct md_args *args,
+               const struct md_buf *out, const struct md_buf *in)
+{
+       struct md_mbuf   mbuf;
+       struct md_rbuf   rbuf;
+       void            *data;
+
+       assert(args);
+       assert(in);
+       assert(out); 
+
+       (void)memcpy(&mbuf, out, sizeof(struct md_buf));
+       (void)memcpy(&rbuf, in, sizeof(struct md_buf));
+
+       mbuf.pos = 0;
+       rbuf.line = 1;
+       data = NULL;
+
+       /* Run initialisers. */
+       switch (args->type) {
+       case (MD_HTML4_STRICT):
+               if ( ! md_init_html4_strict(args, &mbuf, &rbuf, &data))
+                       return(-1);
+               break;
+       case (MD_DUMMY):
+               break;
+       default:
+               abort();
+       }
+
+       /* Go into mainline. */
+       return(md_run_enter(args, &mbuf, &rbuf, data));
+}