Changeset 124 for branches/samba-3.0/source/lib/util_str.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/lib/util_str.c (modified) (3 diffs)

branches/samba-3.0/source/lib/util_str.c

@@ -395 +395 @@
 **/
 
-void string_replace( pstring s, char oldc, char newc )
+/**
+ String replace.
+ NOTE: oldc and newc must be 7 bit characters
+**/
+void string_replace( char *s, char oldc, char newc )
 {
         char *p;
@@ -407 +411 @@
                 if (*p & 0x80) /* mb string - slow path. */
                         break;
-                if (*p == oldc)
+                if (*p == oldc) {
                         *p = newc;
+                }
         }
 
@@ -419 +424 @@
         p = s;
 #endif
-        push_ucs2(NULL, tmpbuf, p, sizeof(tmpbuf), STR_TERMINATE);
-        string_replace_w(tmpbuf, UCS2_CHAR(oldc), UCS2_CHAR(newc));
-        pull_ucs2(NULL, p, tmpbuf, -1, sizeof(tmpbuf), STR_TERMINATE);
+
+        while (*p) {
+                size_t c_size;
+                next_codepoint(p, &c_size);
+
+                if (c_size == 1) {
+                        if (*p == oldc) {
+                                *p = newc;
+                        }
+                }
+                p += c_size;
+        }
 }