shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

systemctl: append .service to unit names lacking suffix

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=39386
This commit is contained in:
Lennart Poettering 2012-07-28 13:20:35 +02:00
parent 47ae7201b1
commit 56d4fbf92e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -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 * systemctl: "Journal has been rotated since unit was started." message is misleading
* syscall filter: add knowledge about compat syscalls * syscall filter: add knowledge about compat syscalls

11
src/shared/unit-name.c
View File

@ -477,6 +477,7 @@ char *unit_dbus_path_from_name(const char *name) {
char *unit_name_mangle(const char *name) { char *unit_name_mangle(const char *name) {
char *r, *t; char *r, *t;
const char *f; 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 /* We'll only escape the obvious characters here, to play
* safe. */ * safe. */
r = new(char, strlen(name) * 4 + 1); r = new(char, strlen(name) * 4 + 1 + sizeof(".service")-1);
if (!r) if (!r)
return NULL; return NULL;
for (f = name, t = r; *f; f++) { for (f = name, t = r; *f; f++) {
if (*f == '.')
dot = true;
if (*f == '/') if (*f == '/')
*(t++) = '-'; *(t++) = '-';
else if (!strchr("@" VALID_CHARS, *f)) 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;
} }