From: Stig Venaas Date: Thu, 4 Apr 2002 12:50:46 +0000 (+0000) Subject: Changed to use lower case for case folding X-Git-Tag: OPENLDAP_REL_ENG_2_MP~256 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=891f987928c5a438f091c1c0ddd9a8131222fa33;p=openldap Changed to use lower case for case folding --- diff --git a/libraries/liblunicode/ucstr.c b/libraries/liblunicode/ucstr.c index b5a98151d0..839a0086e6 100644 --- a/libraries/liblunicode/ucstr.c +++ b/libraries/liblunicode/ucstr.c @@ -41,8 +41,8 @@ int ucstrncasecmp( ber_len_t n ) { for(; 0 < n; ++u1, ++u2, --n ) { - ldap_unicode_t uu1 = uctoupper( *u1 ); - ldap_unicode_t uu2 = uctoupper( *u2 ); + ldap_unicode_t uu1 = uctolower( *u1 ); + ldap_unicode_t uu2 = uctolower( *u2 ); if( uu1 != uu2 ) { return uu1 < uu2 ? -1 : +1; @@ -73,9 +73,9 @@ ldap_unicode_t * ucstrncasechr( ber_len_t n, ldap_unicode_t c ) { - c = uctoupper( c ); + c = uctolower( c ); for(; 0 < n; ++u, --n ) { - if( uctoupper( *u ) == c ) { + if( uctolower( *u ) == c ) { return (ldap_unicode_t *) u; } } @@ -133,10 +133,10 @@ struct berval * UTF8bvnormalize( outpos = 0; for ( i = 1; (i < len) && LDAP_UTF8_ISASCII(s + i); i++ ) { - out[outpos++] = TOUPPER( s[i-1] ); + out[outpos++] = TOLOWER( s[i-1] ); } if ( i == len ) { - out[outpos++] = TOUPPER( s[len - 1] ); + out[outpos++] = TOLOWER( s[len - 1] ); out[outpos] = '\0'; return ber_str2bv( out, outpos, 0, newbv); } @@ -175,7 +175,7 @@ struct berval * UTF8bvnormalize( /* convert character before first non-ascii to ucs-4 */ if ( i > 0 ) { - *p = casefold ? TOUPPER( s[i - 1] ) : s[i - 1]; + *p = casefold ? TOLOWER( s[i - 1] ) : s[i - 1]; p++; } @@ -207,7 +207,7 @@ struct berval * UTF8bvnormalize( i++; } if ( casefold ) { - *p = uctoupper( *p ); + *p = uctolower( *p ); } p++; } @@ -246,15 +246,15 @@ struct berval * UTF8bvnormalize( /* s[i] is ascii */ /* finish off everything up to char before next non-ascii */ for ( i++; (i < len) && LDAP_UTF8_ISASCII(s + i); i++ ) { - out[outpos++] = casefold ? TOUPPER( s[i-1] ) : s[i-1]; + out[outpos++] = casefold ? TOLOWER( s[i-1] ) : s[i-1]; } if ( i == len ) { - out[outpos++] = casefold ? TOUPPER( s[len - 1] ) : s[len - 1]; + out[outpos++] = casefold ? TOLOWER( s[len - 1] ) : s[len - 1]; break; } /* convert character before next non-ascii to ucs-4 */ - *ucs = casefold ? TOUPPER( s[i - 1] ) : s[i - 1]; + *ucs = casefold ? TOLOWER( s[i - 1] ) : s[i - 1]; p = ucs + 1; } free( ucs ); @@ -296,8 +296,8 @@ int UTF8bvnormcmp( while ( (s1 < done) && LDAP_UTF8_ISASCII(s1) && LDAP_UTF8_ISASCII(s2) ) { if (casefold) { - char c1 = TOUPPER(*s1); - char c2 = TOUPPER(*s2); + char c1 = TOLOWER(*s1); + char c2 = TOLOWER(*s2); res = c1 - c2; } else { res = *s1 - *s2; diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 94d8e0ba4b..5e6d7f94eb 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -2766,7 +2766,7 @@ static int caseIgnoreIA5Indexer( for( i=0; values[i].bv_val != NULL; i++ ) { struct berval value; ber_dupbv( &value, &values[i] ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); HASH_Init( &HASHcontext ); if( prefix != NULL && prefix->bv_len > 0 ) { @@ -2814,7 +2814,7 @@ static int caseIgnoreIA5Filter( mlen = mr->smr_oidlen; ber_dupbv( &value, (struct berval *) assertValue ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); keys = ch_malloc( sizeof( struct berval ) * 2 ); @@ -2914,7 +2914,7 @@ static int caseIgnoreIA5SubstringsIndexer( if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue; ber_dupbv( &value, &values[i] ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); if( ( flags & SLAP_INDEX_SUBSTR_ANY ) && ( value.bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) ) @@ -3067,7 +3067,7 @@ static int caseIgnoreIA5SubstringsFilter( { pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX; ber_dupbv( &value, &sa->sa_initial ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len ? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len; @@ -3102,7 +3102,7 @@ static int caseIgnoreIA5SubstringsFilter( } ber_dupbv( &value, &sa->sa_any[i] ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); for(j=0; j <= value.bv_len - SLAP_INDEX_SUBSTR_MAXLEN; @@ -3135,7 +3135,7 @@ static int caseIgnoreIA5SubstringsFilter( { pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX; ber_dupbv( &value, &sa->sa_final ); - ldap_pvt_str2upper( value.bv_val ); + ldap_pvt_str2lower( value.bv_val ); klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len ? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;