Change some of the short's to ints and extend the hash table size so /usr/src is

indexable again.

3 files changed, 59 insertions, 0 deletions

diff --git a/devel/id-utils/patches/patch-an b/devel/id-utils/patches/patch-an
new file mode 100644
index 00000000000..f72c8b8cc82
--- /dev/null
+++ b/devel/id-utils/patches/patch-an
@@ -0,0 +1,18 @@
+$NetBSD: patch-an,v 1.1 2002/03/01 01:38:48 jmc Exp $
+
+--- libidu/scanners.h.orig	Fri Mar  1 01:21:16 2002
++++ libidu/scanners.h	Fri Mar  1 01:21:30 2002
+@@ -21,11 +21,11 @@
+ 
+ #include "xobstack.h"
+ 
+-#define MAX_LEVELS 5		/* log_8 of the max # of files: log_8 (32768) == 5 */
++#define MAX_LEVELS 16		/* log_8 of the max # of files: log_8 (2^32) == 16 */
+ 
+ struct token
+ {
+-  unsigned short tok_count;
++  unsigned int tok_count;
+   unsigned char tok_flags;
+   unsigned char tok_hits[MAX_LEVELS];
+   char tok_name[1];
diff --git a/devel/id-utils/patches/patch-ao b/devel/id-utils/patches/patch-ao
new file mode 100644
index 00000000000..849e4e5943a
--- /dev/null
+++ b/devel/id-utils/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2002/03/01 01:38:48 jmc Exp $
+
+--- libidu/idfile.h.orig	Fri Mar  1 01:21:24 2002
++++ libidu/idfile.h	Fri Mar  1 01:21:27 2002
+@@ -121,7 +121,7 @@
+ {
+   struct file_link *mf_link;
+   struct lang_args const *mf_lang_args;
+-  short mf_index;		/* order in ID file */
++  int mf_index;		/* order in ID file */
+ };
+ 
+ #if HAVE_LINK
+@@ -147,7 +147,7 @@
+ 
+ #define token_string(buf) (buf)
+ extern unsigned int token_flags __P((char const *buf));
+-extern unsigned short token_count __P((char const *buf));
++extern unsigned int token_count __P((char const *buf));
+ extern unsigned char const *token_hits_addr __P((char const *buf));
+ 
+ #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \
diff --git a/devel/id-utils/patches/patch-ap b/devel/id-utils/patches/patch-ap
new file mode 100644
index 00000000000..d8e3e6f0860
--- /dev/null
+++ b/devel/id-utils/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 2002/03/01 01:38:48 jmc Exp $
+
+--- libidu/idread.c.orig	Fri Mar  1 01:22:36 2002
++++ libidu/idread.c	Fri Mar  1 01:22:52 2002
+@@ -207,12 +207,12 @@
+ #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1))
+ #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2))
+ 
+-unsigned short
++unsigned int
+ token_count (char const *buf)
+ {
+   unsigned char const *flags = (unsigned char const *)&buf[strlen (buf) + 1];
+   unsigned char const *addr = flags + 1;
+-  unsigned short count = *addr;
++  unsigned int count = *addr;
+   if (*flags & TOK_SHORT_COUNT)
+     count += (*++addr << 8);
+   return count;