summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-12 10:27:13 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-16 13:54:38 +0100
commit9b49a3b49e78fa46ab5da45e5a176bab3df5803a (patch)
treef227c2f1c8b7f3e785a8584df275e583e35eb333
parenta456086b376b4e845b8049e13a500b2f3001dd38 (diff)
downloadsystemd-9b49a3b49e78fa46ab5da45e5a176bab3df5803a.tar.gz
basic/utf8: add function to convert to ASCII
The conversion must be lossy because ASCII doesn't have enough chars.
-rw-r--r--src/basic/utf8.c31
-rw-r--r--src/basic/utf8.h2
-rw-r--r--src/test/test-utf8.c28
3 files changed, 61 insertions, 0 deletions
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index 2ad2151816..2532fcf81a 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -312,6 +312,37 @@ char *ascii_is_valid_n(const char *str, size_t len) {
return (char*) str;
}
+int utf8_to_ascii(const char *str, char replacement_char, char **ret) {
+ /* Convert to a string that has only ASCII chars, replacing anything that is not ASCII
+ * by replacement_char. */
+
+ _cleanup_free_ char *ans = new(char, strlen(str) + 1);
+ if (!ans)
+ return -ENOMEM;
+
+ char *q = ans;
+
+ for (const char *p = str; *p; q++) {
+ int l;
+
+ l = utf8_encoded_valid_unichar(p, SIZE_MAX);
+ if (l < 0) /* Non-UTF-8, let's not even try to propagate the garbage */
+ return l;
+
+ if (l == 1)
+ *q = *p;
+ else
+ /* non-ASCII, we need to replace it */
+ *q = replacement_char;
+
+ p += l;
+ }
+ *q = '\0';
+
+ *ret = TAKE_PTR(ans);
+ return 0;
+}
+
/**
* utf8_encode_unichar() - Encode single UCS-4 character as UTF-8
* @out_utf8: output buffer of at least 4 bytes or NULL
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index b0e969f655..4a06dd62c5 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -21,6 +21,8 @@ static inline char *utf8_is_valid(const char *s) {
char *ascii_is_valid(const char *s) _pure_;
char *ascii_is_valid_n(const char *str, size_t len);
+int utf8_to_ascii(const char *str, char replacement_char, char **ret);
+
bool utf8_is_printable_newline(const char* str, size_t length, bool allow_newline) _pure_;
#define utf8_is_printable(str, length) utf8_is_printable_newline(str, length, true)
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index 4ba9ca8439..763d17ce9e 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -66,6 +66,33 @@ static void test_ascii_is_valid_n(void) {
assert_se( ascii_is_valid_n("\342\204\242", 0));
}
+static void test_utf8_to_ascii_one(const char *s, int r_expected, const char *expected) {
+ _cleanup_free_ char *ans = NULL;
+ int r;
+
+ r = utf8_to_ascii(s, '*', &ans);
+ log_debug("\"%s\" → %d/\"%s\" (expected %d/\"%s\")", s, r, strnull(ans), r_expected, strnull(expected));
+ assert_se(r == r_expected);
+ assert_se(streq_ptr(ans, expected));
+}
+
+static void test_utf8_to_ascii(void) {
+ log_info("/* %s */", __func__);
+
+ test_utf8_to_ascii_one("asdf", 0, "asdf");
+ test_utf8_to_ascii_one("dąb", 0, "d*b");
+ test_utf8_to_ascii_one("żęśłą óźń", 0, "***** ***");
+ test_utf8_to_ascii_one("\342\204\242", 0, "*");
+ test_utf8_to_ascii_one("\342\204", -EINVAL, NULL); /* truncated */
+ test_utf8_to_ascii_one("\342", -EINVAL, NULL); /* truncated */
+ test_utf8_to_ascii_one("\302\256", 0, "*");
+ test_utf8_to_ascii_one("", 0, "");
+ test_utf8_to_ascii_one(" ", 0, " ");
+ test_utf8_to_ascii_one("\t", 0, "\t");
+ test_utf8_to_ascii_one("串", 0, "*");
+ test_utf8_to_ascii_one("…👊🔪💐…", 0, "*****");
+}
+
static void test_utf8_encoded_valid_unichar(void) {
log_info("/* %s */", __func__);
@@ -241,6 +268,7 @@ int main(int argc, char *argv[]) {
test_utf8_is_printable();
test_ascii_is_valid();
test_ascii_is_valid_n();
+ test_utf8_to_ascii();
test_utf8_encoded_valid_unichar();
test_utf8_escape_invalid();
test_utf8_escape_non_printable();