systemctl: append .service to unit names lacking suffix

https://bugs.freedesktop.org/show_bug.cgi?id=39386

diff --git a/TODO b/TODO
index d4f350292d474de1cd12db5d7e3b6c1879a55c54..59ba7a2e1439757793a4113f51a7c9537378d25b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -49,10 +49,6 @@ Features:
 
 * rename "userspace" to "core-os"
 
 
 * rename "userspace" to "core-os"
 

-* append ".service" to unit names without any suffix (https://bugs.freedesktop.org/show_bug.cgi?id=39386)
-
-* journalctl: add --priority switch
-

 * systemctl: "Journal has been rotated since unit was started." message is misleading
 
 * syscall filter: add knowledge about compat syscalls
 * systemctl: "Journal has been rotated since unit was started." message is misleading
 
 * syscall filter: add knowledge about compat syscalls

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index e84d995dd79d29807ca09701c603e851ca365f2f..71937187922835fb3fcf3d6c3c8037356f0bfa9d 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -477,6 +477,7 @@ char *unit_dbus_path_from_name(const char *name) {
 char *unit_name_mangle(const char *name) {
         char *r, *t;
         const char *f;
 char *unit_name_mangle(const char *name) {
         char *r, *t;
         const char *f;

+        bool dot = false;

 
         assert(name);
 
 
         assert(name);
 


@@ -493,12 +494,15 @@ char *unit_name_mangle(const char *name) {
         /* We'll only escape the obvious characters here, to play
          * safe. */
 
         /* 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 (!r)
                 return NULL;
 
         for (f = name, t = r; *f; f++) {
 

+                if (*f == '.')
+                        dot = true;
+

                 if (*f == '/')
                         *(t++) = '-';
                 else if (!strchr("@" VALID_CHARS, *f))
                 if (*f == '/')
                         *(t++) = '-';
                 else if (!strchr("@" VALID_CHARS, *f))


@@ -507,7 +511,10 @@ char *unit_name_mangle(const char *name) {
                         *(t++) = *f;
         }
 
                         *(t++) = *f;
         }
 

-        *t = 0;
+        if (!dot)
+                strcpy(t, ".service");
+        else
+                *t = 0;

 
         return r;
 }
 
         return r;
 }