sd-bus: make sure %m resolves to the specified error in bus_error_set_errnofv()

[elogind.git] / src / libsystemd / sd-bus / bus-internal.c

diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
index 0bea8cac498918b3e2f959ac07da4e8152c5558c..91b288cd255011dc3398679abb4afbdeaba622f7 100644 (file)
--- a/src/libsystemd/sd-bus/bus-internal.c
+++ b/src/libsystemd/sd-bus/bus-internal.c
@@ -166,6 +166,26 @@ bool service_name_is_valid(const char *p) {
         return true;
 }
 
+char* service_name_startswith(const char *a, const char *b) {
+        const char *p;
+
+        if (!service_name_is_valid(a) ||
+            !service_name_is_valid(b))
+                return NULL;
+
+        p = startswith(a, b);
+        if (!p)
+                return NULL;
+
+        if (*p == 0)
+                return (char*) p;
+
+        if (*p == '.')
+                return (char*) p + 1;
+
+        return NULL;
+}
+
 bool member_name_is_valid(const char *p) {
         const char *q;