Final round of module changes

[openldap] / include / ac / string.h

diff --git a/include/ac/string.h b/include/ac/string.h
index 87c5cb258fec47189332cb92cf5ec617f589fd48..ca2eeb0b7d6bf3e01fa3b4e574ff954e84135307 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,59 +1,77 @@
 /* Generic string.h */
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
 
 #ifndef _AC_STRING_H
 #define _AC_STRING_H
 
 #ifdef STDC_HEADERS
 #      include <string.h>
+
 #else
 #      ifdef HAVE_STRING_H
 #              include <string.h>
-#      else
-#        ifdef HAVE_STRINGS_H
+#      elif HAVE_STRINGS_H
 #              include <strings.h>
-#        endif
 #      endif
 
-#      ifndef HAVE_STRCHR
+#      ifdef HAVE_MEMORY_H
+#              include <memory.h>
+#      endif
+
+#      ifndef HAVE_STRRCHR
+#              undef strchr
 #              define strchr index
+#              undef strrchr
 #              define strrchr rindex
 #      endif
 
 #      ifndef HAVE_MEMCPY
-#              define memcpy(d, s, n)                  bcopy ((s), (d), (n))
-#              define memmove(d, s, n)                 bcopy ((s), (d), (n))
+#              undef memcpy
+#              define memcpy(d, s, n)          ((void) bcopy ((s), (d), (n)))
+#              undef memmove
+#              define memmove(d, s, n)         ((void) bcopy ((s), (d), (n)))
 #      endif
+#endif
 
-#      if !defined(HAVE_STRING_H) && !defined(HAVE_STRINGS_H)
-       /* define prototypes for string functions */
-       /* this could cause problems on some odd ball systems */
-       char    *strchr(), *strrchr();
-       char    *strcpy(), *strncpy();
-       char    *strcat (), *strncat ();
-       int             strcmp(), strncmp();
-       int             strcasecmp(), strncasecmp();
-       char    *strdup();
-       char    *strtok();
-       char    *strpbrk();
-       int             memcmp();
-#      endif
+/* use ldap_pvt_strtok instead of strtok or strtok_r! */
+LDAP_F(char *) ldap_pvt_strtok LDAP_P((
+       char *str, const char *delim, char **pos ));
 
+LDAP_F(char *) ldap_pvt_strdup LDAP_P((
+       const char * s ));
+
+#ifndef HAVE_STRDUP
+       /* strdup() is missing, declare our own version */
+#      undef strdup
+#      define strdup(s) ldap_pvt_strdup(s)
+#else
+       /* some systems fail to declare strdup */
+       extern char *(strdup)();
 #endif
 
+/*
+ * some systems fail to declare strcasecmp() and strncasecmp()
+ * we need them declared so we can obtain pointers to them
+ */
+extern int (strcasecmp)();
+extern int (strncasecmp)();
+
 #ifndef SAFEMEMCPY
 #      if defined( HAVE_MEMMOVE )
 #              define SAFEMEMCPY( d, s, n )    memmove((d), (s), (n))
-#      else
-#        if defined( HAVE_BCOPY )
+#      elif defined( HAVE_BCOPY )
 #              define SAFEMEMCPY( d, s, n )    bcopy((s), (d), (n))
-#        else
-#          if defined( MACOS )
-#              define SAFEMEMCPY( d, s, n )    BlockMoveData((Ptr)(s), (Ptr)(d), (n))
-#          else
+#      else
                /* nothing left but memcpy() */
 #              define SAFEMEMCPY( d, s, n )    memcpy((d), (s), (n))
-#          endif
-#        endif
 #      endif
 #endif