===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.4
retrieving revision 1.19
diff -u -p -r1.4 -r1.19
--- mandoc/Attic/mdocml.c	2008/11/22 18:34:06	1.4
+++ mandoc/Attic/mdocml.c	2008/12/09 17:09:12	1.19
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.4 2008/11/22 18:34:06 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.19 2008/12/09 17:09:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,51 +30,116 @@
 
 #include "libmdocml.h"
 
-#define	BUFFER_IN_DEF	BUFSIZ
-#define	BUFFER_OUT_DEF	BUFSIZ
+#define	BUFFER_IN_DEF	BUFSIZ	 /* See begin_bufs. */
+#define	BUFFER_OUT_DEF	BUFSIZ	 /* See begin_bufs. */
 
-static void		 usage(void);
-static int		 begin_io(const char *, const char *);
-static int		 leave_io(const struct md_mbuf *, 
-				const struct md_rbuf *, int);
-static int		 begin_bufs(struct md_mbuf *, struct md_rbuf *);
-static int		 leave_bufs(const struct md_mbuf *, 
-				const struct md_rbuf *, int);
+#ifdef	DEBUG
+#define	CSS		"mdocml.css"
+#else
+#define	CSS		"/usr/local/share/mdocml/mdocml.css"
+#endif
 
+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);
+
+#ifdef __linux__
+extern	int		 getsubopt(char **, char *const *, char **);
+#endif
+
 int
 main(int argc, char *argv[])
 {
 	int		 c;
-	char		*out, *in;
+	char		*out, *in, *opts, *v;
+	struct md_args	 args;
+#define ALL     	 0
+#define ERROR     	 1
+	char		*toks[] = { "all", "error", NULL };
 
 	extern char	*optarg;
 	extern int	 optind;
 
 	out = in = NULL;
-	
-	while (-1 != (c = getopt(argc, argv, "o:")))
+
+	(void)memset(&args, 0, sizeof(struct md_args));
+
+	args.type = MD_XML;
+
+	while (-1 != (c = getopt(argc, argv, "c:ef:o:vW:")))
 		switch (c) {
+		case ('c'):
+			if (args.type != MD_HTML)
+				errx(1, "-c only valid for -fhtml");
+			args.params.html.css = optarg;
+			break;
+		case ('e'):
+			if (args.type != MD_HTML)
+				errx(1, "-e only valid for -fhtml");
+			args.params.html.flags |= HTML_CSS_EMBED;
+			break;
+		case ('f'):
+			if (0 == strcmp(optarg, "html"))
+				args.type = MD_HTML;
+			else if (0 == strcmp(optarg, "xml"))
+				args.type = MD_XML;
+			else
+				errx(1, "invalid filter type");
+			break;
 		case ('o'):
 			out = optarg;
 			break;
+		case ('v'):
+			args.verbosity++;
+			break;
+		case ('W'):
+			opts = optarg;
+			while (*opts) 
+				switch (getsubopt(&opts, toks, &v)) {
+				case (ALL):
+					args.warnings |= MD_WARN_ALL;
+					break;
+				case (ERROR):
+					args.warnings |= MD_WARN_ERROR;
+					break;
+				default:
+					usage();
+					return(1);
+				}
+			break;
 		default:
 			usage();
 			return(1);
 		}
 
+	if (MD_HTML == args.type)
+		if (NULL == args.params.html.css) 
+			args.params.html.css = CSS;
+
 	argv += optind;
 	argc -= optind;
 
 	if (1 == argc)
 		in = *argv++;
 
-	return(begin_io(out ? out : "-", in ? in : "-"));
+	return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
 
+/* 
+ * Close out file descriptors opened in begin_io.  If the descriptor
+ * refers to stdin/stdout, then do nothing.
+ */
 static int
-leave_io(const struct md_mbuf *out, 
-		const struct md_rbuf *in, int c)
+leave_io(const struct md_buf *out, 
+		const struct md_buf *in, int c)
 {
 	assert(out);
 	assert(in);
@@ -90,25 +155,33 @@ leave_io(const struct md_mbuf *out, 
 		warn("%s", out->name);
 		c = 1;
 	}
+	if (1 == c && STDOUT_FILENO != out->fd)
+		if (-1 == unlink(out->name))
+			warn("%s", out->name);
 
 	return(c);
 }
 
 
+/*
+ * Open file descriptors or assign stdin/stdout, if dictated by the "-"
+ * token instead of a filename.
+ */
 static int
-begin_io(const char *out, const char *in)
+begin_io(const struct md_args *args, char *out, char *in)
 {
-	struct md_rbuf	 fi;
-	struct md_mbuf	 fo;
+	struct md_buf	 fi;
+	struct md_buf	 fo;
 
 #define	FI_FL	O_RDONLY
 #define	FO_FL	O_WRONLY|O_CREAT|O_TRUNC
 
+	assert(args);
 	assert(out);
 	assert(in);
 
-	bzero(&fi, sizeof(struct md_rbuf));
-	bzero(&fo, sizeof(struct md_mbuf));
+	bzero(&fi, sizeof(struct md_buf));
+	bzero(&fo, sizeof(struct md_buf));
 
 	fi.fd = STDIN_FILENO;
 	fo.fd = STDOUT_FILENO;
@@ -128,13 +201,16 @@ begin_io(const char *out, const char *in)
 			return(leave_io(&fo, &fi, 1));
 		}
 
-	return(leave_io(&fo, &fi, begin_bufs(&fo, &fi)));
+	return(leave_io(&fo, &fi, begin_bufs(args, &fo, &fi)));
 }
 
 
+/*
+ * Free buffers allocated in begin_bufs.
+ */
 static int
-leave_bufs(const struct md_mbuf *out, 
-		const struct md_rbuf *in, int c)
+leave_bufs(const struct md_buf *out, 
+		const struct md_buf *in, int c)
 {
 	assert(out);
 	assert(in);
@@ -146,17 +222,27 @@ leave_bufs(const struct md_mbuf *out, 
 }
 
 
+/*
+ * Allocate buffers to the maximum of either the input file's blocksize
+ * or BUFFER_IN_DEF/BUFFER_OUT_DEF, which should be around BUFSIZE.
+ */
 static int
-begin_bufs(struct md_mbuf *out, struct md_rbuf *in)
+begin_bufs(const struct md_args *args, 
+		struct md_buf *out, struct md_buf *in)
 {
 	struct stat	 stin, stout;
+	int		 c;
 
+	assert(args);
 	assert(in);
 	assert(out);
 
 	if (-1 == fstat(in->fd, &stin)) {
 		warn("%s", in->name);
 		return(1);
+	} else if (STDIN_FILENO != in->fd && 0 == stin.st_size) {
+		warnx("%s: empty file", in->name);
+		return(1);
 	} else if (-1 == fstat(out->fd, &stout)) {
 		warn("%s", out->name);
 		return(1);
@@ -173,7 +259,8 @@ begin_bufs(struct md_mbuf *out, struct md_rbuf *in)
 		return(leave_bufs(out, in, 1));
 	}
 
-	return(leave_bufs(out, in, md_run(MD_DUMMY, out, in)));
+	c = md_run(args, out, in);
+	return(leave_bufs(out, in, -1 == c ? 1 : 0));
 }
 
 
@@ -182,5 +269,8 @@ usage(void)
 {
 	extern char	*__progname;
 
-	(void)printf("usage: %s [-o outfile] [infile]\n", __progname);
+	(void)fprintf(stderr, "usage: %s [-v] [-Wwarn...]  "
+			"[-f filter] [-o outfile] [infile]\n", 
+			__progname);
 }
+