Removed escape-deprecation note (better solution in progress, schwarze@openbsd.org).

Using EXIT_FAILURE for parse errors (nicm@openbsd.org).
Fixed use of warn/warnx (nicm@openbsd.org).
Fixed use of getsubopt (nicm@openbsd.org).

2 files changed, 7 insertions, 15 deletions

diff --git a/main.c b/main.c
index dd7df9fe..3f6edeb8 100644
--- a/main.c
+++ b/main.c
@@ -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 *curp)
 	 */
 
 	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);
 		}
 
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 3aa69cb2..139fa875 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -55,7 +55,6 @@ enum	mwarn {
 	WNOWIDTH,
 	WMISSWIDTH,
 	WESCAPE,
-	WDEPESC,
 	WDEPCOL,
 	WWRONGMSEC,
 	WSECOOO,
@@ -486,9 +485,6 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
 	case (WESCAPE):
 		p = "invalid escape sequence";
 		break;
-	case (WDEPESC):
-		p = "deprecated special-character escape";
-		break;
 	case (WNOLINE):
 		p = "suggested no line arguments";
 		break;
@@ -728,10 +724,6 @@ check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 
 		c = mdoc_isescape(p);
 		if (c) {
-			/* See if form is deprecated. */
-			if ('*' == p[1]) 
-				if ( ! pwarn(mdoc, line, pos, WDEPESC))
-					return(0);
 			p += (int)c - 1;
 			continue;
 		}