X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Funit-name.c;h=71937187922835fb3fcf3d6c3c8037356f0bfa9d;hp=e84d995dd79d29807ca09701c603e851ca365f2f;hb=56d4fbf92eb6d8eb31c910e137224308c40dd909;hpb=a7b9ecf9b20866a5dc09359b3c65a6e6f00490cf diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c index e84d995dd..719371879 100644 --- 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; + bool dot = false; assert(name); @@ -493,12 +494,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)) @@ -507,7 +511,10 @@ char *unit_name_mangle(const char *name) { *(t++) = *f; } - *t = 0; + if (!dot) + strcpy(t, ".service"); + else + *t = 0; return r; }