utf8: intruduce utf8_escape_non_printable

diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index 8702ceb1b2f983b6a54e177f4191eac481885bf6..0b6c38ebbff2f90405d86704c86a459c7b0eeb78 100644 (file)
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -212,6 +212,45 @@ char *utf8_escape_invalid(const char *str) {
         return p;
 }
 
         return p;
 }
 

+char *utf8_escape_non_printable(const char *str) {
+        char *p, *s;
+
+        assert(str);
+
+        p = s = malloc(strlen(str) * 4 + 1);
+        if (!p)
+                return NULL;
+
+        while (*str) {
+                int len;
+
+                len = utf8_encoded_valid_unichar(str);
+                if (len > 0) {
+                        if (utf8_is_printable(str, len)) {
+                                s = mempcpy(s, str, len);
+                                str += len;
+                        } else {
+                                if ((*str < ' ') || (*str >= 127)) {
+                                        *(s++) = '\\';
+                                        *(s++) = 'x';
+                                        *(s++) = hexchar((int) *str >> 4);
+                                        *(s++) = hexchar((int) *str);
+                                } else
+                                        *(s++) = *str;
+
+                                str += 1;
+                        }
+                } else {
+                        s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
+                        str += 1;
+                }
+        }
+
+        *s = '\0';
+
+        return p;
+}
+

 char *ascii_is_valid(const char *str) {
         const char *p;
 
 char *ascii_is_valid(const char *str) {
         const char *p;
 

diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index c087995930eb0a75f2c7473829d45df97f5f9ff1..1fe1a350d5fe862c8d837b204eed6c17469e95b4 100644 (file)
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -30,6 +30,7 @@
 const char *utf8_is_valid(const char *s) _pure_;
 char *ascii_is_valid(const char *s) _pure_;
 char *utf8_escape_invalid(const char *s);
 const char *utf8_is_valid(const char *s) _pure_;
 char *ascii_is_valid(const char *s) _pure_;
 char *utf8_escape_invalid(const char *s);

+char *utf8_escape_non_printable(const char *str);

 
 bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_;
 _pure_ static inline bool utf8_is_printable(const char* str, size_t length) {
 
 bool utf8_is_printable_newline(const char* str, size_t length, bool newline) _pure_;
 _pure_ static inline bool utf8_is_printable(const char* str, size_t length) {

diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index b7d988f22d8f1e2d35ab7a8d3a65a75ca3458cf1..6dde63cdffcb5c7c0b1ef2c8685564e29bcb7139 100644 (file)
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -66,12 +66,37 @@ static void test_utf8_escaping(void) {
         assert_se(utf8_is_valid(p3));
 }
 
         assert_se(utf8_is_valid(p3));
 }
 

+static void test_utf8_escaping_printable(void) {
+        _cleanup_free_ char *p1, *p2, *p3, *p4, *p5;
+
+        p1 = utf8_escape_non_printable("goo goo goo");
+        puts(p1);
+        assert_se(utf8_is_valid(p1));
+
+        p2 = utf8_escape_non_printable("\341\204\341\204");
+        puts(p2);
+        assert_se(utf8_is_valid(p2));
+
+        p3 = utf8_escape_non_printable("\341\204");
+        puts(p3);
+        assert_se(utf8_is_valid(p3));
+
+        p4 = utf8_escape_non_printable("ąę\n가너도루\n1234\n\341\204\341\204\n\001 \019\20\a");
+        puts(p4);
+        assert_se(utf8_is_valid(p4));
+
+        p5 = utf8_escape_non_printable("\001 \019\20\a");
+        puts(p5);
+        assert_se(utf8_is_valid(p5));
+}
+

 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();
         test_ascii_is_valid();
         test_utf8_encoded_valid_unichar();
         test_utf8_escaping();
 int main(int argc, char *argv[]) {
         test_utf8_is_valid();
         test_utf8_is_printable();
         test_ascii_is_valid();
         test_utf8_encoded_valid_unichar();
         test_utf8_escaping();

+        test_utf8_escaping_printable();

 
         return 0;
 }
 
         return 0;
 }