X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Funit-name.c;h=2d4cd8d9f3743ebee8aaaaadbaff717463ebb793;hb=a016b9228f338cb9b380ce7e00826ef462767d98;hp=50031e608e066b299b216dd4c8878167cafde49f;hpb=696c245a23d55e4249651573eb9c61b68e61580c;p=elogind.git

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 50031e608..2d4cd8d9f 100644
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -44,6 +44,7 @@ static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
         [UNIT_TIMER] = "timer",
         [UNIT_SWAP] = "swap",
         [UNIT_PATH] = "path",
+        [UNIT_SLICE] = "slice"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
@@ -184,6 +185,7 @@ char *unit_name_change_suffix(const char *n, const char *suffix) {
         assert(n);
         assert(unit_name_is_valid(n, true));
         assert(suffix);
+        assert(suffix[0] == '.');
 
         assert_se(e = strrchr(n, '.'));
         a = e - n;
@@ -506,6 +508,38 @@ char *unit_name_mangle(const char *name) {
         return r;
 }
 
+char *unit_name_mangle_with_suffix(const char *name, const char *suffix) {
+        char *r, *t;
+        const char *f;
+
+        assert(name);
+        assert(suffix);
+        assert(suffix[0] == '.');
+
+        /* Similar to unit_name_mangle(), but is called when we know
+         * that this is about snapshot units. */
+
+        r = new(char, strlen(name) * 4 + strlen(suffix) + 1);
+        if (!r)
+                return NULL;
+
+        for (f = name, t = r; *f; f++) {
+                if (*f == '/')
+                        *(t++) = '-';
+                else if (!strchr(VALID_CHARS, *f))
+                        t = do_escape_char(*f, t);
+                else
+                        *(t++) = *f;
+        }
+
+        if (!endswith(name, suffix))
+                strcpy(t, suffix);
+        else
+                *t = 0;
+
+        return r;
+}
+
 UnitType unit_name_to_type(const char *n) {
         const char *e;