event: clear pending-state when re-arming timers

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

diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
index 942ac2b953be2286d1dbe0dcaf264c4d4895eec6..3fb1cf40f35c72e863a1e52b470cc8b198c86643 100644 (file)
--- a/src/libsystemd-bus/bus-internal.c
+++ b/src/libsystemd-bus/bus-internal.c
@@ -166,6 +166,17 @@ bool service_name_is_valid(const char *p) {
         return true;
 }
 
+bool sender_name_is_valid(const char *p) {
+        if (isempty(p))
+                return false;
+
+        /* FIXME: remove after PID 1 bus conversion */
+        if (streq(p, ":no-sender"))
+                return true;
+
+        return service_name_is_valid(p);
+}
+
 bool member_name_is_valid(const char *p) {
         const char *q;
 
@@ -277,3 +288,29 @@ const char *bus_message_type_to_string(uint8_t u) {
         else
                 return NULL;
 }
+
+char *bus_address_escape(const char *v) {
+        const char *a;
+        char *r, *b;
+
+        r = new(char, strlen(v)*3+1);
+        if (!r)
+                return NULL;
+
+        for (a = v, b = r; *a; a++) {
+
+                if ((*a >= '0' && *a <= '9') ||
+                    (*a >= 'a' && *a <= 'z') ||
+                    (*a >= 'A' && *a <= 'Z') ||
+                    strchr("_-/.", *a))
+                        *(b++) = *a;
+                else {
+                        *(b++) = '%';
+                        *(b++) = hexchar(*a >> 4);
+                        *(b++) = hexchar(*a & 0xF);
+                }
+        }
+
+        *b = 0;
+        return r;
+}