X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Fstring.c;h=2f97f853ed471d3a575b1070c06a4ab8b814038d;hb=fedbb4fb3d9d52ad050d688a1f7bde66db34b836;hp=b41305da435f4df11e305a16f35ee86c1fa7768c;hpb=aa17fdd0bd0773b72ca088665501a26002e9cd81;p=openldap
diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index b41305da43..2f97f853ed 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,13 +1,29 @@
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2010 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
+ * .
+ */
+
/*
- * 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
+#include
#include
#include
+#include
#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 != NULL );
+
+ /* 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;
- int len = strlen( s ) + 1;
+ char *s = NULL;
- if ( (p = (char *) malloc( len )) == NULL ) {
- return( (char *)0 );
+ assert( bv != NULL );
+
+ /* 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 );
}