Update for new password codes for MSVC5

[openldap] / libraries / libldap / string.c

diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index a0877bb68342b3d290a63d7ff2822dbd0552562d..cd9994ad0601a6ae96c145bd5ad84f42521e3330 100644 (file)
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -5,9 +6,10 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
+#include <ac/ctype.h>
 
 #include "ldap-int.h"
 
@@ -58,9 +60,6 @@ static char *(int_strpbrk)( const char *str, const char *accept )
 
 char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
 {
-#if defined( HAVE_STRTOK_R ) || defined( HAVE_REENTRANT_FUNCTIONS )
-       return strtok_r(str, delim, pos);
-#else
        char *p;
 
        if (pos==NULL) {
@@ -91,19 +90,44 @@ char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
        }
 
        return str;
-#endif
 }
 
 char *
 (ldap_pvt_strdup)( const char *s )
 {
        char    *p;
-       int     len = strlen( s ) + 1;
+       size_t  len = strlen( s ) + 1;
 
        if ( (p = (char *) malloc( len )) == NULL ) {
-               return( (char *)0 );
+               return( NULL );
        }
 
        memcpy( p, s, len );
        return( p );
 }
+
+char *
+ldap_pvt_str2upper( char *str )
+{
+       char    *s;
+
+       /* to upper */
+       for ( s = str; *s; s++ ) {
+               *s = TOUPPER( (unsigned char) *s );
+       }
+
+       return( str );
+}
+
+char *
+ldap_pvt_str2lower( char *str )
+{
+       char    *s;
+
+       /* to lower */
+       for ( s = str; *s; s++ ) {
+               *s = TOLOWER( (unsigned char) *s );
+       }
+
+       return( str );
+}