===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.338
retrieving revision 1.342
diff -u -p -r1.338 -r1.342
--- mandoc/mdoc_validate.c	2017/06/11 20:03:02	1.338
+++ mandoc/mdoc_validate.c	2017/06/24 18:58:33	1.342
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.338 2017/06/11 20:03:02 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.342 2017/06/24 18:58:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -1709,7 +1709,7 @@ post_bl(POST_ARGS)
 		nchild = nnext;
 	}
 
-	if (mdoc->meta.os_e != MDOC_OS_NETBSD)
+	if (mdoc->meta.os_e != MANDOC_OS_NETBSD)
 		return;
 
 	prev_Er = NULL;
@@ -1728,11 +1728,12 @@ post_bl(POST_ARGS)
 			if (order > 0)
 				mandoc_vmsg(MANDOCERR_ER_ORDER,
 				    mdoc->parse, nnext->line, nnext->pos,
-				    "Er %s %s", prev_Er, nnext->string);
+				    "Er %s %s (NetBSD)",
+				    prev_Er, nnext->string);
 			else if (order == 0)
 				mandoc_vmsg(MANDOCERR_ER_REP,
 				    mdoc->parse, nnext->line, nnext->pos,
-				    "Er %s", prev_Er);
+				    "Er %s (NetBSD)", prev_Er);
 		}
 		prev_Er = nnext->string;
 	}
@@ -1785,7 +1786,29 @@ post_sm(POST_ARGS)
 static void
 post_root(POST_ARGS)
 {
+	const char *openbsd_arch[] = {
+		"alpha", "amd64", "arm64", "armv7", "hppa", "i386",
+		"landisk", "loongson", "luna88k", "macppc", "mips64",
+		"octeon", "sgi", "socppc", "sparc64", NULL
+	};
+	const char *netbsd_arch[] = {
+		"acorn26", "acorn32", "algor", "alpha", "amiga",
+		"arc", "atari",
+		"bebox", "cats", "cesfic", "cobalt", "dreamcast",
+		"emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5",
+		"hp300", "hpcarm", "hpcmips", "hpcsh", "hppa",
+		"i386", "ibmnws", "luna68k",
+		"mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc",
+		"netwinder", "news68k", "newsmips", "next68k",
+		"pc532", "playstation2", "pmax", "pmppc", "prep",
+		"sandpoint", "sbmips", "sgimips", "shark",
+		"sparc", "sparc64", "sun2", "sun3",
+		"vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL
+        };
+	const char **arches[] = { NULL, netbsd_arch, openbsd_arch };
+
 	struct roff_node *n;
+	const char **arch;
 
 	/* Add missing prologue data. */
 
@@ -1806,6 +1829,27 @@ post_root(POST_ARGS)
 		mandoc_msg(MANDOCERR_OS_MISSING,
 		    mdoc->parse, 0, 0, NULL);
 		mdoc->meta.os = mandoc_strdup("");
+	} else if (mdoc->meta.os_e &&
+	    (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)
+		mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0,
+		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+		    "(OpenBSD)" : "(NetBSD)");
+
+	if (mdoc->meta.arch != NULL &&
+	    (arch = arches[mdoc->meta.os_e]) != NULL) {
+		while (*arch != NULL && strcmp(*arch, mdoc->meta.arch))
+			arch++;
+		if (*arch == NULL) {
+			n = mdoc->first->child;
+			while (n->tok != MDOC_Dt)
+				n = n->next;
+			n = n->child->next->next;
+			mandoc_vmsg(MANDOCERR_ARCH_BAD,
+			    mdoc->parse, n->line, n->pos,
+			    "Dt ... %s %s", mdoc->meta.arch,
+			    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+			    "(OpenBSD)" : "(NetBSD)");
+		}
 	}
 
 	/* Check that we begin with a proper `Sh'. */
@@ -2545,8 +2589,8 @@ post_os(POST_ARGS)
 	if (mdoc->meta.os)
 		goto out;
 
-	if (mdoc->defos) {
-		mdoc->meta.os = mandoc_strdup(mdoc->defos);
+	if (mdoc->os_s != NULL) {
+		mdoc->meta.os = mandoc_strdup(mdoc->os_s);
 		goto out;
 	}
 
@@ -2565,9 +2609,13 @@ post_os(POST_ARGS)
 	mdoc->meta.os = mandoc_strdup(defbuf);
 #endif /*!OSNAME*/
 
-out:	mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD") != NULL ?
-	    MDOC_OS_OPENBSD : strstr(mdoc->meta.os, "NetBSD") != NULL ?
-	    MDOC_OS_NETBSD : MDOC_OS_OTHER;
+out:
+	if (mdoc->meta.os_e == MANDOC_OS_OTHER) {
+		if (strstr(mdoc->meta.os, "OpenBSD") != NULL)
+			mdoc->meta.os_e = MANDOC_OS_OPENBSD;
+		else if (strstr(mdoc->meta.os, "NetBSD") != NULL)
+			mdoc->meta.os_e = MANDOC_OS_NETBSD;
+	}
 
 	/*
 	 * This is the earliest point where we can check
@@ -2575,21 +2623,28 @@ out:	mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD"
 	 * the operating system earlier.
 	 */
 
+	if (n->child != NULL)
+		mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse,
+		    n->child->line, n->child->pos,
+		    "Os %s (%s)", n->child->string,
+		    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+		    "OpenBSD" : "NetBSD");
+
 	while (n->tok != MDOC_Dd)
 		if ((n = n->prev) == NULL)
 			return;
 	if ((n = n->child) == NULL)
 		return;
 	if (strncmp(n->string, "$" "Mdocdate", 9)) {
-		if (mdoc->meta.os_e == MDOC_OS_OPENBSD)
+		if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)
 			mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING,
 			    mdoc->parse, n->line, n->pos,
-			    "Dd %s", n->string);
+			    "Dd %s (OpenBSD)", n->string);
 	} else {
-		if (mdoc->meta.os_e == MDOC_OS_NETBSD)
+		if (mdoc->meta.os_e == MANDOC_OS_NETBSD)
 			mandoc_vmsg(MANDOCERR_MDOCDATE,
 			    mdoc->parse, n->line, n->pos,
-			    "Dd %s", n->string);
+			    "Dd %s (NetBSD)", n->string);
 	}
 }