===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- mandoc/Attic/mdocml.c	2008/11/22 16:55:02	1.2
+++ mandoc/Attic/mdocml.c	2008/11/23 11:05:25	1.6
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.2 2008/11/22 16:55:02 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.6 2008/11/23 11:05:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,50 +30,30 @@
 
 #include "libmdocml.h"
 
-struct md_file {
-	int		 fd;
-	const char	*name;
-};
+#define	BUFFER_IN_DEF	BUFSIZ
+#define	BUFFER_OUT_DEF	BUFSIZ
 
-struct md_buf {
-	struct md_file	*file;
-	char		*buf;
-	size_t		 bufsz;
-	size_t		 line;
-};
-
-struct md_mbuf {
-	struct md_buf	*buf;
-	size_t		 pos;
-};
-
 static void		 usage(void);
+static int		 begin_io(const struct md_args *, 
+				char *, char *);
+static int		 leave_io(const struct md_buf *, 
+				const struct md_buf *, int);
+static int		 begin_bufs(const struct md_args *,
+				struct md_buf *, struct md_buf *);
+static int		 leave_bufs(const struct md_buf *, 
+				const struct md_buf *, int);
 
-static int		 md_begin(const char *, const char *);
-static int		 md_begin_io(const char *, const char *);
-static int		 md_begin_bufs(struct md_file *, struct md_file *);
-static int		 md_run(struct md_buf *, struct md_buf *);
-static int		 md_line(struct md_mbuf *, const struct md_buf *,
-				const char *, size_t);
-
-static ssize_t		 md_buf_fill(struct md_buf *);
-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);
-
-
 int
 main(int argc, char *argv[])
 {
 	int		 c;
 	char		*out, *in;
+	struct md_args	 args;
 
 	extern char	*optarg;
 	extern int	 optind;
 
-	out = NULL;
+	out = in = NULL;
 	
 	while (-1 != (c = getopt(argc, argv, "o:")))
 		switch (c) {
@@ -86,74 +66,33 @@ main(int argc, char *argv[])
 		}
 
 	argv += optind;
-	if (1 != (argc -= optind)) {
-		usage();
-		return(1);
-	}
+	argc -= optind;
 
-	argc--;
-	in = *argv++;
+	if (1 == argc)
+		in = *argv++;
 
-	return(md_begin(out, in));
-}
+	args.type = MD_HTML4_STRICT;
 
-
-static int
-md_begin(const char *out, const char *in)
-{
-	char		 buf[MAXPATHLEN];
-
-	assert(in);
-	if (out)
-		return(md_begin_io(out, in));
-
-	if (strlcpy(buf, in, MAXPATHLEN) >= MAXPATHLEN)
-		warnx("output filename too long");
-	else if (strlcat(buf, ".html", MAXPATHLEN) >= MAXPATHLEN)
-		warnx("output filename too long");
-	else 
-		return(md_begin_io(buf, in));
-
-	return(1);
+	return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
 
 static int
-md_begin_io(const char *out, const char *in)
+leave_io(const struct md_buf *out, 
+		const struct md_buf *in, int c)
 {
-	int		 c;
-	struct md_file	 fin, fout;
-
 	assert(out);
 	assert(in);
 
-	/* TODO: accept "-" as both input and output. */
-
-	fin.name = in;
-
-	if (-1 == (fin.fd = open(fin.name, O_RDONLY, 0))) {
-		warn("%s", fin.name);
-		return(1);
-	}
-
-	fout.name = out;
-
-	fout.fd = open(fout.name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (-1 == fout.fd) {
-		warn("%s", fout.name);
-		if (-1 == close(fin.fd))
-			warn("%s", fin.name);
-		return(1);
-	}
-
-	c = md_begin_bufs(&fout, &fin);
-
-	if (-1 == close(fin.fd)) {
-		warn("%s", in);
+	if (-1 != in->fd && -1 == close(in->fd)) {
+		assert(in->name);
+		warn("%s", in->name);
 		c = 1;
 	}
-	if (-1 == close(fout.fd)) {
-		warn("%s", out);
+	if (-1 != out->fd && STDOUT_FILENO != out->fd &&
+			-1 == close(out->fd)) {
+		assert(out->name);
+		warn("%s", out->name);
 		c = 1;
 	}
 
@@ -162,208 +101,96 @@ md_begin_io(const char *out, const char *in)
 
 
 static int
-md_begin_bufs(struct md_file *out, struct md_file *in)
+begin_io(const struct md_args *args, char *out, char *in)
 {
-	struct stat	 stin, stout;
-	struct md_buf	 inbuf, outbuf;
-	int		 c;
+	struct md_buf	 fi;
+	struct md_buf	 fo;
 
-	assert(in);
+#define	FI_FL	O_RDONLY
+#define	FO_FL	O_WRONLY|O_CREAT|O_TRUNC
+
+	assert(args);
 	assert(out);
+	assert(in);
 
-	if (-1 == fstat(in->fd, &stin)) {
-		warn("fstat: %s", in->name);
-		return(1);
-	} else if (-1 == fstat(out->fd, &stout)) {
-		warn("fstat: %s", out->name);
-		return(1);
-	}
+	bzero(&fi, sizeof(struct md_buf));
+	bzero(&fo, sizeof(struct md_buf));
 
-	inbuf.file = in;
-	inbuf.line = 1;
-	/*inbuf.bufsz = MAX(stin.st_blksize, BUFSIZ);*/
-	inbuf.bufsz = 256;
+	fi.fd = STDIN_FILENO;
+	fo.fd = STDOUT_FILENO;
 
-	outbuf.file = out;
-	outbuf.line = 1;
-	/*outbuf.bufsz = MAX(stout.st_blksize, BUFSIZ);*/
-	outbuf.bufsz = 256;
+	fi.name = in;
+	fo.name = out;
 
-	if (NULL == (inbuf.buf = malloc(inbuf.bufsz))) {
-		warn("malloc");
-		return(1);
-	} else if (NULL == (outbuf.buf = malloc(outbuf.bufsz))) {
-		warn("malloc");
-		free(inbuf.buf);
-		return(1);
-	}
+	if (0 != strncmp(fi.name, "-", 1))
+		if (-1 == (fi.fd = open(fi.name, FI_FL, 0))) {
+			warn("%s", fi.name);
+			return(leave_io(&fo, &fi, 1));
+		}
 
-	c = md_run(&outbuf, &inbuf);
+	if (0 != strncmp(fo.name, "-", 1)) 
+		if (-1 == (fo.fd = open(fo.name, FO_FL, 0644))) {
+			warn("%s", fo.name);
+			return(leave_io(&fo, &fi, 1));
+		}
 
-	free(inbuf.buf);
-	free(outbuf.buf);
-
-	return(c);
+	return(leave_io(&fo, &fi, begin_bufs(args, &fo, &fi)));
 }
 
 
-static ssize_t
-md_buf_fill(struct md_buf *in)
+static int
+leave_bufs(const struct md_buf *out, 
+		const struct md_buf *in, int c)
 {
-	ssize_t		 ssz;
-
+	assert(out);
 	assert(in);
-	assert(in->file);
-	assert(in->buf);
-	assert(in->bufsz > 0);
-	assert(in->file->name);
-
-	if (-1 == (ssz = read(in->file->fd, in->buf, in->bufsz))) 
-		warn("%s", in->file->name);
-	else
-		(void)printf("%s: filled %zd bytes\n",
-				in->file->name, ssz);
-
-	return(ssz);
+	if (out->buf)
+		free(out->buf);
+	if (in->buf)
+		free(in->buf);
+	return(c);
 }
 
 
 static int
-md_run(struct md_buf *out, struct md_buf *in)
+begin_bufs(const struct md_args *args, 
+		struct md_buf *out, struct md_buf *in)
 {
-	struct md_mbuf	 mbuf;
-	ssize_t		 sz, i;
-	char		 line[BUFSIZ];
-	size_t		 pos;
+	struct stat	 stin, stout;
+	int		 c;
 
+	assert(args);
 	assert(in);
-	assert(out); 
+	assert(out);
 
-	mbuf.buf = out;
-	mbuf.pos = 0;
-
-	/* LINTED */
-	for (pos = 0; ; ) {
-		if (-1 == (sz = md_buf_fill(in)))
-			return(1);
-		else if (0 == sz)
-			break;
-
-		for (i = 0; i < sz; i++) {
-			if ('\n' == in->buf[i]) {
-				if (md_line(&mbuf, in, line, pos))
-					return(1);
-				in->line++;
-				pos = 0;
-				continue;
-			}
-
-			if (pos < BUFSIZ) {
-				/* LINTED */
-				line[pos++] = in->buf[i];
-				continue;
-			}
-
-			warnx("%s: line %zu too long",
-					in->file->name, in->line);
-			return(1);
-		}
-	}
-
-	if (0 != pos && md_line(&mbuf, in, line, pos))
+	if (-1 == fstat(in->fd, &stin)) {
+		warn("%s", in->name);
 		return(1);
-
-	return(md_buf_flush(&mbuf) ? 0 : 1);
-}
-
-
-static int
-md_buf_flush(struct md_mbuf *buf)
-{
-	ssize_t		 sz;
-
-	assert(buf);
-	assert(buf->buf);
-	assert(buf->buf->file);
-	assert(buf->buf->buf);
-	assert(buf->buf->file->name);
-
-	(void)printf("%s: flushing %zu bytes\n",
-			buf->buf->file->name, buf->pos);
-
-	if (0 == buf->pos)
+	} else if (-1 == fstat(out->fd, &stout)) {
+		warn("%s", out->name);
 		return(1);
-
-	sz = write(buf->buf->file->fd, buf->buf->buf, buf->pos);
-
-	if (-1 == sz) {
-		warn("%s", buf->buf->file->name);
-		return(0);
-	} else if ((size_t)sz != buf->pos) {
-		warnx("%s: short write", buf->buf->file->name);
-		return(0);
 	}
 
-	buf->pos = 0;
-	return(1);
-}
+	in->bufsz = MAX(stin.st_blksize, BUFFER_IN_DEF);
+	out->bufsz = MAX(stout.st_blksize, BUFFER_OUT_DEF);
 
-
-static int
-md_buf_putchar(struct md_mbuf *buf, char c)
-{
-	return(md_buf_puts(buf, &c, 1));
-}
-
-
-static int
-md_buf_puts(struct md_mbuf *buf, const char *p, size_t sz)
-{
-	size_t		 ssz;
-
-	assert(p);
-	assert(buf);
-	assert(buf->buf);
-
-	while (buf->pos + sz > buf->buf->bufsz) {
-		ssz = buf->buf->bufsz - buf->pos;
-		(void)memcpy(buf->buf->buf + buf->pos, p, ssz);
-		p += ssz;
-		sz -= ssz;
-		buf->pos += ssz;
-
-		if ( ! md_buf_flush(buf))
-			return(0);
+	if (NULL == (in->buf = malloc(in->bufsz))) {
+		warn("malloc");
+		return(leave_bufs(out, in, 1));
+	} else if (NULL == (out->buf = malloc(out->bufsz))) {
+		warn("malloc");
+		return(leave_bufs(out, in, 1));
 	}
 
-	(void)memcpy(buf->buf->buf + buf->pos, p, sz);
-	buf->pos += sz;
-	return(1);
+	c = md_run(args, out, in);
+	return(leave_bufs(out, in, -1 == c ? 1 : 0));
 }
 
 
-static int
-md_line(struct md_mbuf *out, const struct md_buf *in,
-		const char *buf, size_t sz)
-{
-
-	assert(buf);
-	assert(out);
-	assert(in);
-
-	if ( ! md_buf_puts(out, buf, sz))
-		return(1);
-	if ( ! md_buf_putchar(out, '\n'))
-		return(1);
-
-	return(0);
-}
-
-
 static void
 usage(void)
 {
 	extern char	*__progname;
 
-	(void)printf("usage: %s [-o outfile] infile\n", __progname);
+	(void)printf("usage: %s [-o outfile] [infile]\n", __progname);
 }