Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / man_hash.c

diff --git a/man_hash.c b/man_hash.c
index b29e8cdf34db0027f586647d6fd2e8cda866ff3a..8573994e5d530933181adeab397d9f18518d9b81 100644 (file)
--- a/man_hash.c
+++ b/man_hash.c
@@ -1,6 +1,7 @@
-/*     $Id: man_hash.c,v 1.20 2010/05/15 22:49:58 kristaps Exp $ */
+/*     $Id: man_hash.c,v 1.34 2015/10/06 18:32:19 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015 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 +15,23 @@
  * 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 <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include "roff.h"
+#include "man.h"
 #include "libman.h"
 
 #define        HASH_DEPTH       6
 
 #define        HASH_ROW(x) do { \
-               if (isupper((u_char)(x))) \
+               if (isupper((unsigned char)(x))) \
                        (x) -= 65; \
                else \
                        (x) -= 97; \
@@ -45,32 +45,29 @@
  * macro (the integer value of the enum stored as a char to save a bit
  * of space).
  */
-static u_char           table[26 * HASH_DEPTH];
+static unsigned char    table[26 * HASH_DEPTH];
+
 
-/*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
- */
 void
 man_hash_init(void)
 {
        int              i, j, x;
 
-       memset(table, UCHAR_MAX, sizeof(table));
+       if (*table != '\0')
+               return;
 
-       assert(/* LINTED */ 
-                       MAN_MAX < UCHAR_MAX);
+       memset(table, UCHAR_MAX, sizeof(table));
 
        for (i = 0; i < (int)MAN_MAX; i++) {
                x = man_macronames[i][0];
 
-               assert(isalpha((u_char)x));
+               assert(isalpha((unsigned char)x));
 
                HASH_ROW(x);
 
                for (j = 0; j < HASH_DEPTH; j++)
                        if (UCHAR_MAX == table[x + j]) {
-                               table[x + j] = (u_char)i;
+                               table[x + j] = (unsigned char)i;
                                break;
                        }
 
@@ -78,28 +75,27 @@ man_hash_init(void)
        }
 }
 
-
-enum mant
+int
 man_hash_find(const char *tmp)
 {
        int              x, y, i;
-       enum mant        tok;
+       int              tok;
 
        if ('\0' == (x = tmp[0]))
-               return(MAN_MAX);
-       if ( ! (isalpha((u_char)x)))
-               return(MAN_MAX);
+               return TOKEN_NONE;
+       if ( ! (isalpha((unsigned char)x)))
+               return TOKEN_NONE;
 
        HASH_ROW(x);
 
        for (i = 0; i < HASH_DEPTH; i++) {
                if (UCHAR_MAX == (y = table[x + i]))
-                       return(MAN_MAX);
+                       return TOKEN_NONE;
 
-               tok = (enum mant)y;
+               tok = y;
                if (0 == strcmp(tmp, man_macronames[tok]))
-                       return(tok);
+                       return tok;
        }
 
-       return(MAN_MAX);
+       return TOKEN_NONE;
 }