Improvements to the xml part.

[mandoc.git] / mdocml.c

diff --git a/mdocml.c b/mdocml.c
index 9d48fee7d0bca3c1b06f58da27fb772cbda1c805..1b8dcc6772d25ce4a1d82b83fd209b6e147459f9 100644 (file)
--- a/mdocml.c
+++ b/mdocml.c
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.11 2008/11/25 12:14:02 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.15 2008/12/02 00:10:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -58,11 +58,17 @@ main(int argc, char *argv[])
 
        (void)memset(&args, 0, sizeof(struct md_args));
        
-       while (-1 != (c = getopt(argc, argv, "o:")))
+       while (-1 != (c = getopt(argc, argv, "o:vW")))
                switch (c) {
                case ('o'):
                        out = optarg;
                        break;
+               case ('v'):
+                       args.verbosity++;
+                       break;
+               case ('W'):
+                       args.warnings |= MD_WARN_ALL;
+                       break;
                default:
                        usage();
                        return(1);
@@ -74,8 +80,6 @@ main(int argc, char *argv[])
        if (1 == argc)
                in = *argv++;
 
-       args.type = MD_DUMMY;
-
        return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
@@ -102,6 +106,9 @@ leave_io(const struct md_buf *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);
 }
@@ -184,7 +191,7 @@ begin_bufs(const struct md_args *args,
        if (-1 == fstat(in->fd, &stin)) {
                warn("%s", in->name);
                return(1);
-       } else if (0 == stin.st_size) {
+       } 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)) {
@@ -213,5 +220,5 @@ usage(void)
 {
        extern char     *__progname;
 
-       (void)printf("usage: %s [-o outfile] [infile]\n", __progname);
+       (void)printf("usage: %s [-vW] [-o outfile] [infile]\n", __progname);
 }