Backed out PUNCT changes (again).

[mandoc.git] / mdocml.c

diff --git a/mdocml.c b/mdocml.c
index 91c6cc388adfa7ecb524271d74d68331b00af6c7..1bcff4597b659f76c6a3573fa36cfe5e8f93e6a2 100644 (file)
--- a/mdocml.c
+++ b/mdocml.c
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.9 2008/11/23 23:12:47 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.14 2008/11/28 11:21:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -55,14 +55,19 @@ main(int argc, char *argv[])
        extern int       optind;
 
        out = in = NULL;
+
+       (void)memset(&args, 0, sizeof(struct md_args));
        
-       while (-1 != (c = getopt(argc, argv, "vo:")))
+       while (-1 != (c = getopt(argc, argv, "o:vW")))
                switch (c) {
                case ('o'):
                        out = optarg;
                        break;
                case ('v'):
-                       args.dbg++;
+                       args.verbosity++;
+                       break;
+               case ('W'):
+                       args.warnings |= MD_WARN_ALL;
                        break;
                default:
                        usage();
@@ -75,8 +80,6 @@ main(int argc, char *argv[])
        if (1 == argc)
                in = *argv++;
 
-       args.type = MD_HTML4_STRICT;
-
        return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
@@ -185,7 +188,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)) {
@@ -214,6 +217,5 @@ usage(void)
 {
        extern char     *__progname;
 
-       (void)printf("usage: %s [-v] [-o outfile] [infile]\n", 
-                       __progname);
+       (void)printf("usage: %s [-vW] [-o outfile] [infile]\n", __progname);
 }