r13347: - Now we compare values with an optimized utf8

safe function if the user provides an utf8
compliant casefold function to ldb.

- Fix toupper_m and tolower_m to not crash if
the case tables are not found

- Let load_case_table() search into the correct
directory in the search tree for the case
tables so that we can test utf8

Simo
(This used to be commit e12f070958eb3c144beb81c5cb878db122249021)

1 files changed, 16 insertions, 8 deletions

diff --git a/source4/lib/util_unistr.c b/source4/lib/util_unistr.c
index e589e6493a..b35822877c 100644
--- a/source4/lib/util_unistr.c
+++ b/source4/lib/util_unistr.c
@@ -43,10 +43,18 @@ static void load_case_tables(void)
 	lowcase_table = map_file(lib_path(mem_ctx, "lowcase.dat"), 0x20000);
 	talloc_free(mem_ctx);
 	if (upcase_table == NULL) {
-		upcase_table = (void *)-1;
+		/* try also under codepages for testing purposes */
+		upcase_table = map_file("codepages/upcase.dat", 0x20000);
+		if (upcase_table == NULL) {
+			upcase_table = (void *)-1;
+		}
 	}
 	if (lowcase_table == NULL) {
-		lowcase_table = (void *)-1;
+		/* try also under codepages for testing purposes */
+		lowcase_table = map_file("codepages/lowcase.dat", 0x20000);
+		if (lowcase_table == NULL) {
+			lowcase_table = (void *)-1;
+		}
 	}
 }
 
@@ -58,12 +66,12 @@ codepoint_t toupper_w(codepoint_t val)
 	if (val < 128) {
 		return toupper(val);
 	}
-	if (upcase_table == (void *)-1) {
-		return val;
-	}
 	if (upcase_table == NULL) {
 		load_case_tables();
 	}
+	if (upcase_table == (void *)-1) {
+		return val;
+	}
 	if (val & 0xFFFF0000) {
 		return val;
 	}
@@ -78,12 +86,12 @@ codepoint_t tolower_w(codepoint_t val)
 	if (val < 128) {
 		return tolower(val);
 	}
-	if (lowcase_table == (void *)-1) {
-		return val;
-	}
 	if (lowcase_table == NULL) {
 		load_case_tables();
 	}
+	if (lowcase_table == (void *)-1) {
+		return val;
+	}
 	if (val & 0xFFFF0000) {
 		return val;
 	}