fstab-generator: merge /proc/cmdline parsing loops into one

[elogind.git] / src / shared / utf8.c

diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index c3d97cc783f06e2805a4a2394a162e87a3b8b0e1..0b524d8a9041eae0348382cdf47159f7c2f8d0b3 100644 (file)
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -3,6 +3,7 @@
 /***
   This file is part of systemd.
 
+  Copyright 2008-2011 Kay Sievers
   Copyright 2012 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
@@ -19,7 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-/* This file is based on the GLIB utf8 validation functions. The
+/* Parts of this file are based on the GLIB utf8 validation functions. The
  * original license text follows. */
 
 /* gutf8.c - Operations on UTF-8 strings.
@@ -97,7 +98,7 @@ static int utf8_encoded_expected_len(const char *str) {
 }
 
 /* decode one unicode char */
-static int utf8_encoded_to_unichar(const char *str) {
+int utf8_encoded_to_unichar(const char *str) {
         int unichar;
         int len;
         int i;
@@ -140,14 +141,15 @@ bool utf8_is_printable(const char* str, size_t length) {
 
         assert(str);
 
-        for (p = (const uint8_t*) str; length; p++) {
+        for (p = (const uint8_t*) str; length;) {
                 int encoded_len = utf8_encoded_valid_unichar((const char *)p);
-                int32_t val = utf8_encoded_to_unichar((const char*)p);
+                int val = utf8_encoded_to_unichar((const char*)p);
 
                 if (encoded_len < 0 || val < 0 || is_unicode_control(val))
                         return false;
 
                 length -= encoded_len;
+                p += encoded_len;
         }
 
         return true;
@@ -159,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;
@@ -170,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) {