Bootstrapped

diff --git a/configure b/configure
index 57cd00127a405cb7a8c9427367a309d73caaa6e9..9aeb9b124b3689f3865ffd0a9efd9e5ad835f7c3 100755 (executable)
--- a/configure
+++ b/configure
@@ -43330,6 +43330,92 @@ _ACEOF
 
 fi
 
+{ echo "$as_me:$LINENO: checking if strnstr is well implemented" >&5
+echo $ECHO_N "checking if strnstr is well implemented... $ECHO_C" >&6; }
+if test "${ac_cv_func_strnstr+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+    // we expect this to succeed, or crash on over-run.
+    // if it passes otherwise we may need a better check.
+int main(int argc, char **argv)
+{
+    int size = 20;
+    char *str = malloc(size);
+    memset(str, 'x', size);
+    strnstr(str, "fubar", size);
+    return 0;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_strnstr="yes"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_strnstr="no"
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_strnstr" >&5
+echo "${ECHO_T}$ac_cv_func_strnstr" >&6; }
+if test "$ac_cv_func_strnstr" = "yes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRNSTR 1
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRNSTR 0
+_ACEOF
+
+fi
+
+
 
 
 if false; then

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 0dd1013063837ef272c8c8dc05d6affcbcc374b9..a05888640f6de687ddc997494f1a2332482ad0ae 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -562,6 +562,10 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Yay! A MacOS X brokenness. Its not good enough to know that strnstr()
+   exists, because MacOSX 10.4 and earlier may have a buffer overrun. */
+#undef HAVE_STRNSTR
+
 /* Define to 1 if you have the `strsep' function. */
 #undef HAVE_STRSEP
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 26b956a0b0088000b8d16716ccfd94f58560084f..a7e33342fdbe3e55ec828f0f6f864bdeef3c1485 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -60,8 +60,8 @@ libmiscutil_a_DEPENDENCIES = libTrie/src/Trie.o libTrie/src/TrieNode.o \
 am__libmiscutil_a_SOURCES_DIST = MemPool.cc base64.c getfullhostname.c \
        hash.c heap.c html_quote.c iso3307.c md5.c radix.c rfc1035.c \
        rfc1123.c rfc1738.c rfc2617.c safe_inet_addr.c Splay.cc \
-       strsep.c strtoll.c stub_memaccount.c util.c uudecode.c \
-       assert.c xusleep.c Profiler.c win32lib.c
+       strnstr.h strnstr.cc strsep.c strtoll.c stub_memaccount.c \
+       util.c uudecode.c assert.c xusleep.c Profiler.c win32lib.c
 @NEED_OWN_STRSEP_TRUE@am__objects_1 = strsep.$(OBJEXT)
 @NEED_OWN_STRTOLL_TRUE@am__objects_2 = strtoll.$(OBJEXT)
 @ENABLE_XPROF_STATS_TRUE@am__objects_3 = Profiler.$(OBJEXT)
@@ -71,10 +71,10 @@ am_libmiscutil_a_OBJECTS = MemPool.$(OBJEXT) base64.$(OBJEXT) \
        html_quote.$(OBJEXT) iso3307.$(OBJEXT) md5.$(OBJEXT) \
        radix.$(OBJEXT) rfc1035.$(OBJEXT) rfc1123.$(OBJEXT) \
        rfc1738.$(OBJEXT) rfc2617.$(OBJEXT) safe_inet_addr.$(OBJEXT) \
-       Splay.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
-       stub_memaccount.$(OBJEXT) util.$(OBJEXT) uudecode.$(OBJEXT) \
-       assert.$(OBJEXT) xusleep.$(OBJEXT) $(am__objects_3) \
-       $(am__objects_4)
+       Splay.$(OBJEXT) strnstr.$(OBJEXT) $(am__objects_1) \
+       $(am__objects_2) stub_memaccount.$(OBJEXT) util.$(OBJEXT) \
+       uudecode.$(OBJEXT) assert.$(OBJEXT) xusleep.$(OBJEXT) \
+       $(am__objects_3) $(am__objects_4)
 libmiscutil_a_OBJECTS = $(am_libmiscutil_a_OBJECTS)
 libntlmauth_a_AR = $(AR) $(ARFLAGS)
 libntlmauth_a_DEPENDENCIES = @LIBOBJS@
@@ -396,6 +396,8 @@ libmiscutil_a_SOURCES = \
        safe_inet_addr.c \
        $(SNPRINTFSOURCE) \
        Splay.cc \
+       strnstr.h \
+       strnstr.cc \
        $(STRSEPSOURCE) \
        $(STRTOLLSOURCE) \
        stub_memaccount.c \
@@ -530,6 +532,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2617.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_inet_addr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sspwin32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnstr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stub_memaccount.Po@am__quote@