===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- mandoc/main.c	2009/06/18 10:32:00	1.31
+++ mandoc/main.c	2009/06/27 09:03:03	1.32
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.31 2009/06/18 10:32:00 kristaps Exp $ */
+/*	$Id: main.c,v 1.32 2009/06/27 09:03:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -132,19 +132,19 @@ main(int argc, char *argv[])
 		switch (c) {
 		case ('f'):
 			if ( ! foptions(&curp.fflags, optarg))
-				return(0);
+				return(EXIT_FAILURE);
 			break;
 		case ('m'):
 			if ( ! moptions(&curp.inttype, optarg))
-				return(0);
+				return(EXIT_FAILURE);
 			break;
 		case ('T'):
 			if ( ! toptions(&curp.outtype, optarg))
-				return(0);
+				return(EXIT_FAILURE);
 			break;
 		case ('W'):
 			if ( ! woptions(&curp.wflags, optarg))
-				return(0);
+				return(EXIT_FAILURE);
 			break;
 		case ('V'):
 			version();
@@ -318,7 +318,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	 */
 
 	if (-1 == fstat(curp->fd, &st))
-		warnx("%s", curp->file);
+		warn("%s", curp->file);
 	else if ((size_t)st.st_blksize > sz)
 		sz = st.st_blksize;
 
@@ -581,7 +581,7 @@ foptions(int *fflags, char *arg)
 			 	   NO_IGN_MACRO | NO_IGN_CHARS;
 			break;
 		default:
-			warnx("bad argument: -f%s", arg);
+			warnx("bad argument: -f%s", suboptarg);
 			return(0);
 		}
 
@@ -616,7 +616,7 @@ woptions(int *wflags, char *arg)
 			*wflags |= WARN_WERR;
 			break;
 		default:
-			warnx("bad argument: -W%s", arg);
+			warnx("bad argument: -W%s", suboptarg);
 			return(0);
 		}