X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futf8.c;h=0b524d8a9041eae0348382cdf47159f7c2f8d0b3;hb=981e4cd325410384cdadd837f34c002699d2d750;hp=98b68ef657c076e53f108df96e43aa8762fea79e;hpb=f405e86de361ec305dc2b8634efeaa23dc144053;p=elogind.git

diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index 98b68ef65..0b524d8a9 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -161,7 +161,9 @@ const char *utf8_is_valid(const char *str) {
         assert(str);
 
         for (p = (const uint8_t*) str; *p; ) {
-                int len = utf8_encoded_valid_unichar((const char *)p);
+                int len;
+
+                len = utf8_encoded_valid_unichar((const char *)p);
 
                 if (len < 0)
                         return NULL;
@@ -172,37 +174,42 @@ const char *utf8_is_valid(const char *str) {
         return str;
 }
 
-char *ascii_is_valid(const char *str) {
-        const char *p;
+char *utf8_escape_invalid(const char *str) {
+        char *p, *s;
 
         assert(str);
 
-        for (p = str; *p; p++)
-                if ((unsigned char) *p >= 128)
-                        return NULL;
+        p = s = malloc(strlen(str) * 4 + 1);
+        if (!p)
+                return NULL;
 
-        return (char*) str;
-}
+        while (*str) {
+                int len;
 
-char *ascii_filter(const char *str) {
-        const char *s;
-        char *r, *d;
-        size_t l;
+                len = utf8_encoded_valid_unichar(str);
+                if (len > 0) {
+                        s = mempcpy(s, str, len);
+                        str += len;
+                } else {
+                        s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
+                        str += 1;
+                }
+        }
+        *s = '\0';
 
-        assert(str);
+        return p;
+}
 
-        l = strlen(str);
-        r = malloc(l + 1);
-        if (!r)
-                return NULL;
+char *ascii_is_valid(const char *str) {
+        const char *p;
 
-        for (s = str, d = r; *s; s++)
-                if ((unsigned char) *s < 128)
-                        *(d++) = *s;
+        assert(str);
 
-        *d = 0;
+        for (p = str; *p; p++)
+                if ((unsigned char) *p >= 128)
+                        return NULL;
 
-        return r;
+        return (char*) str;
 }
 
 char *utf16_to_utf8(const void *s, size_t length) {