string function and gdbm defines config changes

hypermail-project · Dec 2, 2001 · 56b227e · 56b227e
1 parent 6ae731f
commit 56b227e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/Changelog b/Changelog
@@ -1,6 +1,10 @@
 Version Changes for Hypermail
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Peter McCluskey (Dec 1 2001)
+   Applied patches from William King to string function defines and gdbm
+   configuration.
+
 Peter McCluskey (Nov 30 2001)
    - Add Polish language support from Piotr Waskiewicz. Change some hardcoded
    From's to new macro MSG_FROM, change a Date to MSG_CDATE.

diff --git a/FILES b/FILES
@@ -17,6 +17,7 @@ configure.in
 install-sh
 maketgz
 patchlevel.h
+acconfig.h
 # 
 # Archive directory files 
 #

diff --git a/acconfig.h b/acconfig.h
@@ -0,0 +1,2 @@
+
+#undef HAVE_GDBM_H
diff --git a/config.h.in b/config.h.in
@@ -18,6 +18,8 @@
 /* Define if your <sys/time.h> declares struct tm.  */
 #undef TM_IN_SYS_TIME
 
+#undef HAVE_GDBM_H
+
 /* Define if you have the getopt function.  */
 #undef HAVE_GETOPT
 
@@ -39,15 +41,12 @@
 /* Define if you have the strcasecmp function.  */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the strcmpi function.  */
-#undef HAVE_STRCMPI
+/* Define if you have the strcasestr function.  */
+#undef HAVE_STRCASESTR
 
 /* Define if you have the strdup function.  */
 #undef HAVE_STRDUP
 
-/* Define if you have the stricmp function.  */
-#undef HAVE_STRICMP
-
 /* Define if you have the strstr function.  */
 #undef HAVE_STRSTR
 
@@ -72,9 +71,6 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
-/* Define if you have the <gdbm.h> header file.  */
-#undef HAVE_GDBM_H
-
 /* Define if you have the <locale.h> header file.  */
 #undef HAVE_LOCALE_H
 
@@ -131,3 +127,7 @@
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
+
+/* Whether you have GDBM */
+#undef GDBM
+
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.6 # Guess values for system-dependent variables and create Makefiles.
+# From configure.in Revision: 1.7 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #

diff --git a/src/string.c b/src/string.c
@@ -197,12 +197,11 @@ void strcpymax(char *dest, const char *src, int n)
     *dest = 0;
 }
 
+#ifndef HAVE_STRCASESTR
 /*
 ** strcasestr() - case insensitive strstr()
 */
 
-#if 1
-
 /* Stolen-- stolen!-- from glibc 2.1. Please don't sue me. */
 
 char *strcasestr (char *phaystack, const char *pneedle)
@@ -290,25 +289,6 @@ jin:	  a = *++haystack;
 ret0:
   return 0;
 }
-
-#else
-char *strcasestr(char *haystack, const char *needle)
-{
-    int nlen = strlen(needle);
-    int hlen = strlen(haystack);
-
-    int i;
-    int max;
-
-    max = hlen - nlen;
-
-    for (i = 0; i <= max; i++) {
-	if (!strncasecmp(haystack, needle, nlen))
-	    return haystack;
-	haystack++;
-    }
-    return NULL;
-}
 #endif
 
 /*