===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.215
retrieving revision 1.217
diff -u -p -r1.215 -r1.217
--- mandoc/main.c	2015/01/15 04:26:39	1.215
+++ mandoc/main.c	2015/01/20 21:16:51	1.217
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.215 2015/01/15 04:26:39 schwarze Exp $ */
+/*	$Id: main.c,v 1.217 2015/01/20 21:16:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <sys/types.h>
+#include <sys/param.h>	/* MACHINE */
 
 #include <assert.h>
 #include <ctype.h>
@@ -328,6 +329,10 @@ main(int argc, char *argv[])
 			argv++;
 			argc--;
 		}
+		if (search.arch == NULL)
+			search.arch = getenv("MACHINE");
+		if (search.arch == NULL)
+			search.arch = MACHINE;
 	}
 
 	rc = MANDOCLEVEL_OK;
@@ -884,14 +889,15 @@ static int
 woptions(struct curparse *curp, char *arg)
 {
 	char		*v, *o;
-	const char	*toks[6];
+	const char	*toks[7];
 
 	toks[0] = "stop";
 	toks[1] = "all";
 	toks[2] = "warning";
 	toks[3] = "error";
-	toks[4] = "fatal";
-	toks[5] = NULL;
+	toks[4] = "unsupp";
+	toks[5] = "fatal";
+	toks[6] = NULL;
 
 	while (*arg) {
 		o = arg;
@@ -908,6 +914,9 @@ woptions(struct curparse *curp, char *arg)
 			curp->wlevel = MANDOCLEVEL_ERROR;
 			break;
 		case 4:
+			curp->wlevel = MANDOCLEVEL_UNSUPP;
+			break;
+		case 5:
 			curp->wlevel = MANDOCLEVEL_BADARG;
 			break;
 		default: