In man(1) mode, properly clean up the resn[] result array

[mandoc.git] / arch.c

diff --git a/arch.c b/arch.c
index 3e746d8337ca9eb3919e6f14cf92a4a2f8534da9..41a23cbbc32ba1a4e792a1d6ea46ee285e29cbed 100644 (file)
--- a/arch.c
+++ b/arch.c
@@ -1,6 +1,6 @@
-/*     $Id: arch.c,v 1.11 2014/04/20 16:46:04 schwarze Exp $ */
+/* $Id: arch.c,v 1.17 2021/05/13 13:33:11 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2017, 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,24 +14,41 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
-#include "mdoc.h"
-#include "libmdoc.h"
+#include "roff.h"
 
-#define LINE(x, y) \
-       if (0 == strcmp(p, x)) return(y);
-
-
-const char *
-mdoc_a2arch(const char *p)
+int
+arch_valid(const char *arch, enum mandoc_os os)
 {
+       const char *openbsd_arch[] = {
+               "alpha", "amd64", "arm64", "armv7", "hppa", "i386",
+               "landisk", "loongson", "luna88k", "macppc", "mips64",
+               "octeon", "powerpc64", "riscv64", "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 };
+       const char **arch_p;
 
-#include "arch.in"
-
-       return(NULL);
+       if ((arch_p = arches[os]) == NULL)
+               return 1;
+       for (; *arch_p != NULL; arch_p++)
+               if (strcmp(*arch_p, arch) == 0)
+                       return 1;
+       return 0;
 }