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=d0e71f24039c7602d30fd7fd4074d083c701d8a8;hp=cfe3133b5ae58fa4538af335f965fbf79d04f53b;hb=6ef9eeed61a291cc42b7d911f5cf5a4deca742a3;hpb=a05f97b3ac590bc313e8c9d1613d06de0bf28ae2 diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c index cfe3133b5..d0e71f240 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -24,26 +24,29 @@ #include #include "path-util.h" +#include "bus-label.h" #include "util.h" #include "unit-name.h" +#include "def.h" #define VALID_CHARS \ - "0123456789" \ - "abcdefghijklmnopqrstuvwxyz" \ - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ + DIGITS LETTERS \ ":-_.\\" static const char* const unit_type_table[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = "service", [UNIT_SOCKET] = "socket", + [UNIT_BUSNAME] = "busname", [UNIT_TARGET] = "target", + [UNIT_SNAPSHOT] = "snapshot", [UNIT_DEVICE] = "device", [UNIT_MOUNT] = "mount", [UNIT_AUTOMOUNT] = "automount", - [UNIT_SNAPSHOT] = "snapshot", - [UNIT_TIMER] = "timer", [UNIT_SWAP] = "swap", + [UNIT_TIMER] = "timer", [UNIT_PATH] = "path", + [UNIT_SLICE] = "slice", + [UNIT_SCOPE] = "scope" }; DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType); @@ -51,6 +54,7 @@ DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType); static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = { [UNIT_STUB] = "stub", [UNIT_LOADED] = "loaded", + [UNIT_NOT_FOUND] = "not-found", [UNIT_ERROR] = "error", [UNIT_MERGED] = "merged", [UNIT_MASKED] = "masked" @@ -58,7 +62,7 @@ static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = { DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState); -bool unit_name_is_valid(const char *n, bool template_ok) { +bool unit_name_is_valid(const char *n, enum template_valid template_ok) { const char *e, *i, *at; /* Valid formats: @@ -68,6 +72,7 @@ bool unit_name_is_valid(const char *n, bool template_ok) { */ assert(n); + assert(IN_SET(template_ok, TEMPLATE_VALID, TEMPLATE_INVALID)); if (strlen(n) >= UNIT_NAME_MAX) return false; @@ -92,7 +97,7 @@ bool unit_name_is_valid(const char *n, bool template_ok) { if (at == n) return false; - if (!template_ok && at+1 == e) + if (!template_ok == TEMPLATE_VALID && at+1 == e) return false; } @@ -182,8 +187,9 @@ char *unit_name_change_suffix(const char *n, const char *suffix) { size_t a, b; assert(n); - assert(unit_name_is_valid(n, true)); + assert(unit_name_is_valid(n, TEMPLATE_VALID)); assert(suffix); + assert(suffix[0] == '.'); assert_se(e = strrchr(n, '.')); a = e - n; @@ -288,7 +294,7 @@ char *unit_name_unescape(const char *f) { } char *unit_name_path_escape(const char *f) { - char *p, *e; + _cleanup_free_ char *p; assert(f); @@ -298,15 +304,10 @@ char *unit_name_path_escape(const char *f) { path_kill_slashes(p); - if (streq(p, "/")) { - free(p); + if (streq(p, "/") || streq(p, "")) return strdup("-"); - } - e = unit_name_escape(p[0] == '/' ? p + 1 : p); - free(p); - - return e; + return unit_name_escape(p[0] == '/' ? p + 1 : p); } char *unit_name_path_unescape(const char *f) { @@ -331,7 +332,7 @@ char *unit_name_path_unescape(const char *f) { } bool unit_name_is_template(const char *n) { - const char *p; + const char *p, *e; assert(n); @@ -339,11 +340,15 @@ bool unit_name_is_template(const char *n) { if (!p) return false; - return p[1] == '.'; + e = strrchr(p+1, '.'); + if (!e) + return false; + + return e == p + 1; } bool unit_name_is_instance(const char *n) { - const char *p; + const char *p, *e; assert(n); @@ -351,7 +356,11 @@ bool unit_name_is_instance(const char *n) { if (!p) return false; - return p[1] != '.'; + e = strrchr(p+1, '.'); + if (!e) + return false; + + return e > p + 1; } char *unit_name_replace_instance(const char *f, const char *i) { @@ -401,11 +410,10 @@ char *unit_name_template(const char *f) { strcpy(mempcpy(r, f, a), e); return r; - } char *unit_name_from_path(const char *path, const char *suffix) { - char *p, *r; + _cleanup_free_ char *p = NULL; assert(path); assert(suffix); @@ -414,14 +422,11 @@ char *unit_name_from_path(const char *path, const char *suffix) { if (!p) return NULL; - r = strappend(p, suffix); - free(p); - - return r; + return strappend(p, suffix); } char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) { - char *p, *r; + _cleanup_free_ char *p = NULL; assert(prefix); assert(path); @@ -431,14 +436,11 @@ char *unit_name_from_path_instance(const char *prefix, const char *path, const c if (!p) return NULL; - r = strjoin(prefix, "@", p, suffix, NULL); - free(p); - - return r; + return strjoin(prefix, "@", p, suffix, NULL); } char *unit_name_to_path(const char *name) { - char *w, *e; + _cleanup_free_ char *w = NULL; assert(name); @@ -446,36 +448,49 @@ char *unit_name_to_path(const char *name) { if (!w) return NULL; - e = unit_name_path_unescape(w); - free(w); - - return e; + return unit_name_path_unescape(w); } char *unit_dbus_path_from_name(const char *name) { - char *e, *p; + _cleanup_free_ char *e = NULL; assert(name); - e = bus_path_escape(name); + e = bus_label_escape(name); if (!e) return NULL; - p = strappend("/org/freedesktop/systemd1/unit/", e); - free(e); + return strappend("/org/freedesktop/systemd1/unit/", e); +} + +int unit_name_from_dbus_path(const char *path, char **name) { + const char *e; + char *n; - return p; + e = startswith(path, "/org/freedesktop/systemd1/unit/"); + if (!e) + return -EINVAL; + + n = bus_label_unescape(e); + if (!n) + return -ENOMEM; + + *name = n; + return 0; } -char *unit_name_mangle(const char *name) { + +/** + * Try to turn a string that might not be a unit name into a + * sensible unit name. + */ +char *unit_name_mangle(const char *name, enum unit_name_mangle allow_globs) { char *r, *t; const char *f; - bool dot = false; + const char* valid_chars = allow_globs == MANGLE_GLOB ? "@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS; assert(name); - - /* Try to turn a string that might not be a unit name into a - * sensible unit name. */ + assert(IN_SET(allow_globs, MANGLE_GLOB, MANGLE_NOGLOB)); if (is_device_path(name)) return unit_name_from_path(name, ".device"); @@ -486,25 +501,55 @@ 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 + sizeof(".service")-1); + r = new(char, strlen(name) * 4 + strlen(".service") + 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 (unit_name_to_type(name) < 0) + strcpy(t, ".service"); + else + *t = 0; + + return r; +} + + +/** + * Similar to unit_name_mangle(), but is called when we know + * that this is about a specific unit type. + */ +char *unit_name_mangle_with_suffix(const char *name, enum unit_name_mangle allow_globs, const char *suffix) { + char *r, *t; + const char *f; + + assert(name); + assert(suffix); + assert(suffix[0] == '.'); - if (*f == '.') - dot = true; + 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)) + else if (!strchr(VALID_CHARS, *f)) t = do_escape_char(*f, t); else *(t++) = *f; } - if (!dot) - strcpy(t, ".service"); + if (!endswith(name, suffix)) + strcpy(t, suffix); else *t = 0; @@ -522,3 +567,30 @@ UnitType unit_name_to_type(const char *n) { return unit_type_from_string(e + 1); } + +int build_subslice(const char *slice, const char*name, char **subslice) { + char *ret; + + assert(slice); + assert(name); + assert(subslice); + + if (streq(slice, "-.slice")) + ret = strappend(name, ".slice"); + else { + char *e; + + e = endswith(slice, ".slice"); + if (!e) + return -EINVAL; + + ret = new(char, (e - slice) + 1 + strlen(name) + 6 + 1); + if (!ret) + return -ENOMEM; + + stpcpy(stpcpy(stpcpy(mempcpy(ret, slice, e - slice), "-"), name), ".slice"); + } + + *subslice = ret; + return 0; +}