sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r2175: Fix for #1546 from fumiya@samba.gr.jp. Preserve errno in MB strupper_m/strlower_m.

Browse Source 
Jeremy.
(This used to be commit 615aa6e914)
This commit is contained in:
Jeremy Allison 2004-09-01 17:39:27 +00:00 committed by Gerald (Jerry) Carter
parent d9a1327474
commit c5b11b56aa
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/lib/util_str.c
View File

@ -1391,6 +1391,7 @@ char *strstr_m(const char *src, const char *findstr)
void strlower_m(char *s)
{
size_t len;
int errno_save;
/* this is quite a common operation, so we want it to be
fast. We optimise for the ascii case, knowing that all our
@ -1408,11 +1409,13 @@ void strlower_m(char *s)
/* I assume that lowercased string takes the same number of bytes
* as source string even in UTF-8 encoding. (VIV) */
len = strlen(s) + 1;
errno_save = errno;
errno = 0;
unix_strlower(s,len,s,len);
/* Catch mb conversion errors that may not terminate. */
if (errno)
s[len-1] = '\0';
errno = errno_save;
}
/**
@ -1422,6 +1425,7 @@ void strlower_m(char *s)
void strupper_m(char *s)
{
size_t len;
int errno_save;
/* this is quite a common operation, so we want it to be
fast. We optimise for the ascii case, knowing that all our
@ -1439,11 +1443,13 @@ void strupper_m(char *s)
/* I assume that lowercased string takes the same number of bytes
* as source string even in multibyte encoding. (VIV) */
len = strlen(s) + 1;
errno_save = errno;
errno = 0;
unix_strupper(s,len,s,len);
/* Catch mb conversion errors that may not terminate. */
if (errno)
s[len-1] = '\0';
errno = errno_save;
}
/**