Changeset 597 for vendor/current/source3/lib/util_str.c

Timestamp:

Jul 2, 2011, 4:01:14 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.9

File:

• vendor/current/source3/lib/util_str.c (modified) (2 diffs)

vendor/current/source3/lib/util_str.c

@@ -587 +587 @@
  zero. Strips out all but 'a-Z0-9' and the character in other_safe_chars
  and replaces with '_'. Deliberately does *NOT* check for multibyte
- characters. Don't change it !
+ characters. Treats src as an array of bytes, not as a multibyte
+ string. Any byte >0x7f is automatically converted to '_'.
+ other_safe_chars must also contain an ascii string (bytes<0x7f).
 **/
 
@@ -623 +625 @@
         for(i = 0; i < len; i++) {
                 int val = (src[i] & 0xff);
-                if (isupper_ascii(val) || islower_ascii(val) ||
-                                isdigit(val) || strchr_m(other_safe_chars, val))
+                if (val > 0x7f) {
+                        dest[i] = '_';
+                        continue;
+                }
+                if (isupper(val) || islower(val) ||
+                                isdigit(val) || strchr(other_safe_chars, val))
                         dest[i] = src[i];
                 else