X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fstring.c;h=60c228914b2a669ae19bd6da76322fa701474a09;hb=75227eef9ea1ac309c4095b9433283dabda92f6c;hp=c3fdb7b9c3bcac129b2692469582945a1b54a852;hpb=1bcec8bf6a17a65396b2c947faed846d20428db9;p=openldap

diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index c3fdb7b9c3..60c228914b 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,13 +1,29 @@
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
 /*
- * Copyright 1998-1999 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"
 
@@ -91,15 +107,71 @@ char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
 }
 
 char *
-(ldap_pvt_strdup)( const char *s )
+ldap_pvt_str2upper( char *str )
+{
+	char    *s;
+
+	/* to upper */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOUPPER( (unsigned char) *s );
+		}
+	}
+
+	return( str );
+}
+
+struct berval *
+ldap_pvt_str2upperbv( char *str, struct berval *bv )
+{
+	char    *s = NULL;
+
+	assert( bv );
+
+	/* to upper */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOUPPER( (unsigned char) *s );
+		}
+	}
+
+	bv->bv_val = str;
+	bv->bv_len = (ber_len_t)(s - str);
+	
+	return( bv );
+}
+
+char *
+ldap_pvt_str2lower( char *str )
+{
+	char    *s;
+
+	/* to lower */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOLOWER( (unsigned char) *s );
+		}
+	}
+
+	return( str );
+}
+
+struct berval *
+ldap_pvt_str2lowerbv( char *str, struct berval *bv )
 {
-	char    *p;
-	size_t	len = strlen( s ) + 1;
+	char    *s = NULL;
 
-	if ( (p = (char *) LDAP_MALLOC( len )) == NULL ) {
-		return( NULL );
+	assert( bv );
+
+	/* to lower */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOLOWER( (unsigned char) *s );
+		}
 	}
 
-	memcpy( p, s, len );
-	return( p );
+	bv->bv_val = str;
+	bv->bv_len = (ber_len_t)(s - str);
+
+	return( bv );
 }