X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fstring.c;h=df8069ccaabe80c4e9da084decf7e1db1f711032;hb=d2b05a3858822df66785b4a0939204b10ac1c47f;hp=a0877bb68342b3d290a63d7ff2822dbd0552562d;hpb=941087a09dcec4d5d68c3fca0a77dca1a203436b;p=openldap

diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index a0877bb683..df8069ccaa 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,13 +1,20 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+/*
+ * Locale-specific 1-byte character versions
+ * See utf-8.c for UTF-8 versions
+ */
+
 #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 +65,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 +95,30 @@ char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
 	}
 
 	return str;
-#endif
 }
 
 char *
-(ldap_pvt_strdup)( const char *s )
+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    *p;
-	int	len = strlen( s ) + 1;
+	char    *s;
 
-	if ( (p = (char *) malloc( len )) == NULL ) {
-		return( (char *)0 );
+	/* to lower */
+	for ( s = str; *s; s++ ) {
+		*s = TOLOWER( (unsigned char) *s );
 	}
 
-	memcpy( p, s, len );
-	return( p );
+	return( str );
 }