X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fstring.c;h=4f860ada785e68cfee3c875b314a42bd7ccffc13;hb=de01a6e3d791d3458549d2ceeccf4d7e0477ff78;hp=def6fce9faa0aaabd5e75e30c6f4c2f7d141860f;hpb=42cc5e5333c36b1bd7ab250dac3a1a54ec3c439a;p=openldap

diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index def6fce9fa..4f860ada78 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,7 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 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>.
  */
 
 /*
@@ -98,30 +107,38 @@ char *(ldap_pvt_strtok)( char *str, const char *delim, char **pos )
 }
 
 char *
-(ldap_pvt_strdup)( const char *s )
+ldap_pvt_str2upper( char *str )
 {
-	char    *p;
-	size_t	len = strlen( s ) + 1;
+	char    *s;
 
-	if ( (p = (char *) malloc( len )) == NULL ) {
-		return( NULL );
+	/* to upper */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOUPPER( (unsigned char) *s );
+		}
 	}
 
-	memcpy( p, s, len );
-	return( p );
+	return( str );
 }
 
-char *
-ldap_pvt_str2upper( char *str )
+struct berval *
+ldap_pvt_str2upperbv( char *str, struct berval *bv )
 {
-	char    *s;
+	char    *s = NULL;
+
+	assert( bv != NULL );
 
 	/* to upper */
-	for ( s = str; *s; s++ ) {
-		*s = TOUPPER( (unsigned char) *s );
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOUPPER( (unsigned char) *s );
+		}
 	}
 
-	return( str );
+	bv->bv_val = str;
+	bv->bv_len = (ber_len_t)(s - str);
+	
+	return( bv );
 }
 
 char *
@@ -130,9 +147,31 @@ ldap_pvt_str2lower( char *str )
 	char    *s;
 
 	/* to lower */
-	for ( s = str; *s; s++ ) {
-		*s = TOLOWER( (unsigned char) *s );
+	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    *s = NULL;
+
+	assert( bv != NULL );
+
+	/* to lower */
+	if ( str ) {
+		for ( s = str; *s; s++ ) {
+			*s = TOLOWER( (unsigned char) *s );
+		}
+	}
+
+	bv->bv_val = str;
+	bv->bv_len = (ber_len_t)(s - str);
+
+	return( bv );
+}