unit-name: rework unit_name_replace_instance function()

[elogind.git] / src / shared / unit-name.c

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index e8328c321a05363c5ef4fe3f901e126731944618..d6391228f2118686d4cae9cd79ca230a3d8ffc20 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -335,7 +335,8 @@ bool unit_name_is_template(const char *n) {
 
         assert(n);
 
-        if (!(p = strchr(n, '@')))
+        p = strchr(n, '@');
+        if (!p)
                 return false;
 
         return p[1] == '.';
@@ -356,36 +357,29 @@ bool unit_name_is_instance(const char *n) {
 char *unit_name_replace_instance(const char *f, const char *i) {
         const char *p, *e;
         char *r, *k;
-        size_t a;
+        size_t a, b;
 
         assert(f);
 
         p = strchr(f, '@');
-        assert_se(e = strrchr(f, '.'));
-
-        a = p - f;
-
-        if (p) {
-                size_t b;
-
-                b = strlen(i);
-
-                r = new(char, a + 1 + b + strlen(e) + 1);
-                if (!r)
-                        return NULL;
+        if (!p)
+                return strdup(f);
 
-                k = mempcpy(r, f, a + 1);
-                k = mempcpy(k, i, b);
-        } else {
+        e = strrchr(f, '.');
+        if (!e)
+                assert_se(e = strchr(f, 0));
 
-                r = new(char, a + strlen(e) + 1);
-                if (!r)
-                        return NULL;
+        a = p - f;
+        b = strlen(i);
 
-                k = mempcpy(r, f, a);
-        }
+        r = new(char, a + 1 + b + strlen(e) + 1);
+        if (!r)
+                return NULL;
 
+        k = mempcpy(r, f, a + 1);
+        k = mempcpy(k, i, b);
         strcpy(k, e);
+
         return r;
 }
 
@@ -476,6 +470,7 @@ char *unit_dbus_path_from_name(const char *name) {
 char *unit_name_mangle(const char *name) {
         char *r, *t;
         const char *f;
+        bool dot = false;
 
         assert(name);
 
@@ -492,12 +487,15 @@ char *unit_name_mangle(const char *name) {
         /* We'll only escape the obvious characters here, to play
          * safe. */
 
-        r = new(char, strlen(name) * 4 + 1);
+        r = new(char, strlen(name) * 4 + 1 + sizeof(".service")-1);
         if (!r)
                 return NULL;
 
         for (f = name, t = r; *f; f++) {
 
+                if (*f == '.')
+                        dot = true;
+
                 if (*f == '/')
                         *(t++) = '-';
                 else if (!strchr("@" VALID_CHARS, *f))
@@ -506,7 +504,10 @@ char *unit_name_mangle(const char *name) {
                         *(t++) = *f;
         }
 
-        *t = 0;
+        if (!dot)
+                strcpy(t, ".service");
+        else
+                *t = 0;
 
         return r;
 }