Changeset 10949

Timestamp:

Jan 5, 2007, 6:13:51 PM (19 years ago)

Author:

jhoblitt

Message:

add our own implementation of strcasestr() that's only used when it doesn't exist in libc.

Location:

trunk/psLib

Files:

• configure.ac (modified) (1 diff)
• src/sys/Makefile.am (modified) (1 diff)
• src/sys/psString.h (modified) (2 diffs)
• src/sys/strcasestr.c (added)

trunk/psLib/configure.ac

@@ -458 +458 @@
 LDFLAGS=${TMP_LDFLAGS}
 CPPFLAGS=${TMP_CPPFLAGS}
+
+dnl set NO_STRCASESTR if we can't find strcasestr
+AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 dnl ------- enable -Werror after all of the probes have run ---------

trunk/psLib/src/sys/Makefile.am

@@ -14 +14 @@
         psSlurp.c      \
         psString.c     \
-        psTrace.c
+        psTrace.c      \
+    strcasestr.c 
 
 EXTRA_DIST = sys.i psErrorCodes.c.in psErrorCodes.h.in

trunk/psLib/src/sys/psString.h

@@ -14 +14 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-04 22:15:04 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-06 04:13:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -221 +221 @@
 }
 
+#ifndef DOXYGEN
+#if NO_STRCASESTR
+// this means that the system's libc does not provide strcasestr()
+#define strcasestr(...) p_psstrcasestr(__VA_ARGS__)
+extern char *p_psstrcasestr (const char *haystack, const char *needle)
+    __THROW __attribute_pure__ __nonnull ((1, 2));
+#endif // if NO_STRCASESTR
+#endif // ifndef DOXYGEN
 
 /** @} */// Doxygen - End of SystemGroup Functions