From ee34c25c8a989b5a7c0ad59d71bb39f8efff045c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 19 Jul 2011 13:19:29 -0700 Subject: First part of fix for bug 8310 - toupper_ascii() is broken on big-endian systems Remove int toupper_ascii(int c); int tolower_ascii(int c); int isupper_ascii(int c); int islower_ascii(int c); and replace with their _m equivalents, as they are identical. --- source3/lib/username.c | 4 ++-- source3/lib/util_str.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/username.c b/source3/lib/username.c index d5da532124..925b44bb06 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -196,9 +196,9 @@ static struct passwd *uname_string_combinations2(char *s, TALLOC_CTX *mem_ctx, for (i=offset;i<(len-(N-1));i++) { char c = s[i]; - if (!islower_ascii((int)c)) + if (!islower_m((int)c)) continue; - s[i] = toupper_ascii(c); + s[i] = toupper_m(c); ret = uname_string_combinations2(s, mem_ctx, i+1, fn, N-1); if(ret) return(ret); diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index a348b389e8..baa5a1f046 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -470,7 +470,7 @@ void strlower_m(char *s) (ie. they match for the first 128 chars) */ while (*s && !(((unsigned char)s[0]) & 0x80)) { - *s = tolower_ascii((unsigned char)*s); + *s = tolower_m((unsigned char)*s); s++; } -- cgit