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

indexable again.

4 files changed, 63 insertions, 1 deletions

diff --git a/devel/id-utils/distinfo b/devel/id-utils/distinfo
index b8e6cb6bbab..c2b55324378 100644
--- a/devel/id-utils/distinfo
+++ b/devel/id-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/02/27 09:07:42 joda Exp $
+$NetBSD: distinfo,v 1.8 2002/03/01 01:38:47 jmc Exp $
 
 SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5
 Size (id-utils-3.2.tar.gz) = 388012 bytes
@@ -15,3 +15,6 @@ SHA1 (patch-aj) = 7f2b3f1eaadfc3a71169d16010375eaf0ce96b46
 SHA1 (patch-ak) = 4d7807168b4fa9e3d497c943f45892e6d574ef9d
 SHA1 (patch-al) = 5ff628040e5f3c27263bded593deea57ad0847f5
 SHA1 (patch-am) = 137ffa727d505975b775c0a877f1ac9af9cf58a7
+SHA1 (patch-an) = 6e300f1c175085fe4190e31a0f3673714b51585b
+SHA1 (patch-ao) = 3fa01e9d9482695a1727a34eb8e3caf4f3572325
+SHA1 (patch-ap) = 8bff727bc838b77ca6bcd859fc38803d0d8ca00c
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;