X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Ftest-bus-marshal.c;h=317e3a7d634613a3209d9debd3646f55db2cfc48;hb=843f737ade9c73609a2280dd3dd16e18222a5dcb;hp=8f36a71d4b5d9032508e5fc365298d2656b7795f;hpb=5e86fd7b982e2d87537d4386bd1c9684c1ee7c43;p=elogind.git

diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd-bus/test-bus-marshal.c
index 8f36a71d4..317e3a7d6 100644
--- a/src/libsystemd-bus/test-bus-marshal.c
+++ b/src/libsystemd-bus/test-bus-marshal.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_DBUS
-#include <dbus.h>
+#include <dbus/dbus.h>
 #endif
 
 #include "log.h"
@@ -37,6 +37,30 @@
 #include "sd-bus.h"
 #include "bus-message.h"
 #include "bus-util.h"
+#include "bus-dump.h"
+
+static void test_bus_label_escape_one(const char *a, const char *b) {
+        _cleanup_free_ char *t = NULL, *x = NULL, *y = NULL;
+
+        assert_se(t = sd_bus_label_escape(a));
+        assert_se(streq(t, b));
+
+        assert_se(x = sd_bus_label_unescape(t));
+        assert_se(streq(a, x));
+
+        assert_se(y = sd_bus_label_unescape(b));
+        assert_se(streq(a, y));
+}
+
+static void test_bus_label_escape(void) {
+        test_bus_label_escape_one("foo123bar", "foo123bar");
+        test_bus_label_escape_one("foo.bar", "foo_2ebar");
+        test_bus_label_escape_one("foo_2ebar", "foo_5f2ebar");
+        test_bus_label_escape_one("", "_");
+        test_bus_label_escape_one("_", "_5f");
+        test_bus_label_escape_one("1", "_31");
+        test_bus_label_escape_one(":1", "_3a1");
+}
 
 int main(int argc, char *argv[]) {
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *copy = NULL;
@@ -95,7 +119,7 @@ int main(int argc, char *argv[]) {
         r = sd_bus_message_append_array(m, 'u', NULL, 0);
         assert_se(r >= 0);
 
-        r = bus_message_seal(m, 4711);
+        r = bus_message_seal(m, 4711, 0);
         assert_se(r >= 0);
 
         bus_message_dump(m, stdout, true);
@@ -139,16 +163,16 @@ int main(int argc, char *argv[]) {
                 dbus_error_init(&error);
 
                 w = dbus_message_demarshal(buffer, sz, &error);
-                if (!w) {
+                if (!w)
                         log_error("%s", error.message);
-                } else
+                else
                         dbus_message_unref(w);
         }
 #endif
 
         m = sd_bus_message_unref(m);
 
-        r = bus_message_from_malloc(buffer, sz, NULL, 0, NULL, NULL, &m);
+        r = bus_message_from_malloc(NULL, buffer, sz, NULL, 0, NULL, NULL, &m);
         assert_se(r >= 0);
 
         bus_message_dump(m, stdout, true);
@@ -229,7 +253,7 @@ int main(int argc, char *argv[]) {
         r = sd_bus_message_copy(copy, m, true);
         assert_se(r >= 0);
 
-        r = bus_message_seal(copy, 4712);
+        r = bus_message_seal(copy, 4712, 0);
         assert_se(r >= 0);
 
         fclose(ms);
@@ -238,8 +262,8 @@ int main(int argc, char *argv[]) {
         fflush(ms);
         assert_se(!ferror(ms));
 
-        printf("<%.*s>", (int) first_size, first);
-        printf("<%.*s>", (int) third_size, third);
+        printf("<%.*s>\n", (int) first_size, first);
+        printf("<%.*s>\n", (int) third_size, third);
 
         assert_se(first_size == third_size);
         assert_se(memcmp(first, third, third_size) == 0);
@@ -293,5 +317,7 @@ int main(int argc, char *argv[]) {
         assert_se(streq(c, "ccc"));
         assert_se(streq(d, "3"));
 
+        test_bus_label_escape();
+
         return 0;
 }