From: Julio Sánchez Fernández <jsanchez@openldap.org>
Date: Thu, 17 Jun 1999 16:10:38 +0000 (+0000)
Subject: Have the normalize routines process white space in the required way.
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~279
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5d8b65deb1e20035666a67e79692b92fa933870a;p=openldap

Have the normalize routines process white space in the required way.
Code untested, but it is not used yet.
---

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 64640852bd..829e4f6396 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -663,8 +663,32 @@ case_exact_normalize(
 )
 {
 	struct berval *newval;
+	char *p, *q;
 
 	newval = ber_bvdup( val );
+	p = q = newval->bv_val;
+	/* Ignore initial whitespace */
+	while ( isspace( *p++ ) )
+		;
+	while ( *p ) {
+		if ( isspace( *p ) ) {
+			*q++ = *p++;
+			/* Ignore the extra whitespace */
+			while ( isspace(*p++) )
+				;
+		} else {
+			*q++ = *p++;
+		}
+	}
+	/*
+	 * If the string ended in space, backup the pointer one
+	 * position.  One is enough because the above loop collapsed
+	 * all whitespace to a single space.
+	 */
+	if ( p != newval->bv_val && isspace( *(p-1) ) ) {
+		*(q-1) = '\0';
+	}
+	newval->bv_len = strlen( newval->bv_val );
 	normalized = &newval;
 
 	return 0;
@@ -679,19 +703,39 @@ case_exact_compare(
 	return strcmp( val1->bv_val, val2->bv_val );
 }
 
-static int
+int
 case_ignore_normalize(
 	struct berval *val,
 	struct berval **normalized
 )
 {
 	struct berval *newval;
-	char *p;
+	char *p, *q;
 
 	newval = ber_bvdup( val );
-	for ( p = newval->bv_val; *p; p++ ) {
-		*p = TOUPPER( *p );
+	p = q = newval->bv_val;
+	/* Ignore initial whitespace */
+	while ( isspace( *p++ ) )
+		;
+	while ( *p ) {
+		if ( isspace( *p ) ) {
+			*q++ = *p++;
+			/* Ignore the extra whitespace */
+			while ( isspace(*p++) )
+				;
+		} else {
+			*q++ = TOUPPER( *p++ );
+		}
+	}
+	/*
+	 * If the string ended in space, backup the pointer one
+	 * position.  One is enough because the above loop collapsed
+	 * all whitespace to a single space.
+	 */
+	if ( p != newval->bv_val && isspace( *(p-1) ) ) {
+		*(q-1) = '\0';
 	}
+	newval->bv_len = strlen( newval->bv_val );
 	normalized = &newval;
 
 	return 0;