[systemd-commits] 2 commits - Makefile.am src/libsystemd-bus src/shared src/systemd src/test
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Nov 7 03:08:43 CET 2013
Makefile.am | 4 +++-
src/libsystemd-bus/sd-utf8.c | 36 ++++++++++++++++++++++++++++++++++++
src/shared/utf8.c | 25 +++----------------------
src/shared/utf8.h | 2 --
src/systemd/sd-utf8.h | 28 ++++++++++++++++++++++++++++
src/test/test-utf8.c | 17 -----------------
6 files changed, 70 insertions(+), 42 deletions(-)
New commits:
commit faaa5728d956b7f0d24f27f3341d0b9fff30af00
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Nov 7 03:07:37 2013 +0100
utf8: export utf8 validation functions as part of sd-bus
To write useful bus code clients need to validate utf8 frequently since
the bus reacts allergic to it. Since glibc does not provide any calls
for this, let's provide it as part of libsystemd-bus.
diff --git a/Makefile.am b/Makefile.am
index 27fd996..ce5ff63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1964,6 +1964,7 @@ libsystemd_bus_la_SOURCES = \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
src/systemd/sd-memfd.h \
+ src/systemd/sd-utf8.h \
src/libsystemd-bus/sd-bus.c \
src/libsystemd-bus/bus-control.c \
src/libsystemd-bus/bus-control.h \
@@ -1995,7 +1996,8 @@ libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/kdbus.h \
src/libsystemd-bus/sd-memfd.c \
src/libsystemd-bus/bus-util.c \
- src/libsystemd-bus/bus-util.h
+ src/libsystemd-bus/bus-util.h \
+ src/libsystemd-bus/sd-utf8.c
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
diff --git a/src/libsystemd-bus/sd-utf8.c b/src/libsystemd-bus/sd-utf8.c
new file mode 100644
index 0000000..6c44340
--- /dev/null
+++ b/src/libsystemd-bus/sd-utf8.c
@@ -0,0 +1,36 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "util.h"
+#include "utf8.h"
+#include "sd-utf8.h"
+
+const char *sd_utf8_is_valid(const char *s) {
+ assert_return(s, NULL);
+
+ return utf8_is_valid(s);
+}
+
+const char *sd_ascii_is_valid(const char *s) {
+ assert_return(s, NULL);
+
+ return ascii_is_valid(s);
+}
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index aedf6e2..6e5ba9a 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;
diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h
new file mode 100644
index 0000000..039c36e
--- /dev/null
+++ b/src/systemd/sd-utf8.h
@@ -0,0 +1,28 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef fooutf8hfoo
+#define fooutf8hfoo
+
+/***
+ This file is part of systemd.
+
+ Copyright 2013 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+const char *sd_utf8_is_valid(const char *s);
+const char *sd_ascii_is_valid(const char *s);
+
+#endif
commit 23c62e05b3954350495bf63b45fb5d846c2030a0
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Nov 7 03:06:37 2013 +0100
utf8: ascii_filter() is unused, let's remove it
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index 98b68ef..aedf6e2 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -184,27 +184,6 @@ char *ascii_is_valid(const char *str) {
return (char*) str;
}
-char *ascii_filter(const char *str) {
- const char *s;
- char *r, *d;
- size_t l;
-
- assert(str);
-
- l = strlen(str);
- r = malloc(l + 1);
- if (!r)
- return NULL;
-
- for (s = str, d = r; *s; s++)
- if ((unsigned char) *s < 128)
- *(d++) = *s;
-
- *d = 0;
-
- return r;
-}
-
char *utf16_to_utf8(const void *s, size_t length) {
char *r;
const uint8_t *f;
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
index e3eef11..f560774 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -30,8 +30,6 @@ char *ascii_is_valid(const char *s) _pure_;
bool utf8_is_printable(const char* str, size_t length) _pure_;
-char *ascii_filter(const char *s);
-
char *utf16_to_utf8(const void *s, size_t length);
int utf8_encoded_valid_unichar(const char *str);
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
index f0182ee..d2198fd 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -41,22 +41,6 @@ static void test_ascii_is_valid(void) {
assert_se(!ascii_is_valid("\341\204"));
}
-static void test_ascii_filter(void) {
- char *f;
-
- f = ascii_filter("alsdjf\t\vbarr\nba z");
- assert_se(streq(f, "alsdjf\t\vbarr\nba z"));
- free(f);
-
- f = ascii_filter("\342\204\242");
- assert_se(streq(f, ""));
- free(f);
-
- f = ascii_filter("foo\341\204bar");
- assert_se(streq(f, "foobar"));
- free(f);
-}
-
static void test_utf8_encoded_valid_unichar(void) {
assert_se(utf8_encoded_valid_unichar("\342\204\242") == 3);
assert_se(utf8_encoded_valid_unichar("\302\256") == 2);
@@ -70,7 +54,6 @@ int main(int argc, char *argv[]) {
test_utf8_is_valid();
test_utf8_is_printable();
test_ascii_is_valid();
- test_ascii_filter();
test_utf8_encoded_valid_unichar();
return 0;
More information about the systemd-commits
mailing list