X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Funit-name.c;h=1baa6eb7e573bc9ba8de903dac0b4d5e721e987b;hp=67a760ace68afef2d76a6595dce29f8f3f54b5d5;hb=442e00839e4fc3c11506f5c8a9477b465865aecc;hpb=0a9f8ed00c8f323d5bf24a9a11149a9342c0e1aa diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c index 67a760ace..1baa6eb7e 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -44,11 +44,24 @@ static const char* const unit_type_table[_UNIT_TYPE_MAX] = { [UNIT_TIMER] = "timer", [UNIT_SWAP] = "swap", [UNIT_PATH] = "path", + [UNIT_SLICE] = "slice", + [UNIT_SCOPE] = "scope" }; DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType); -bool unit_name_is_valid_no_type(const char *n, bool template_ok) { +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" +}; + +DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState); + +bool unit_name_is_valid(const char *n, bool template_ok) { const char *e, *i, *at; /* Valid formats: @@ -66,6 +79,9 @@ bool unit_name_is_valid_no_type(const char *n, bool template_ok) { if (!e || e == n) return false; + if (unit_type_from_string(e + 1) < 0) + return false; + for (i = n, at = NULL; i < e; i++) { if (*i == '@' && !at) @@ -169,8 +185,9 @@ char *unit_name_change_suffix(const char *n, const char *suffix) { size_t a, b; assert(n); - assert(unit_name_is_valid_no_type(n, true)); + assert(unit_name_is_valid(n, true)); assert(suffix); + assert(suffix[0] == '.'); assert_se(e = strrchr(n, '.')); a = e - n; @@ -195,7 +212,7 @@ char *unit_name_build(const char *prefix, const char *instance, const char *suff if (!instance) return strappend(prefix, suffix); - return join(prefix, "@", instance, suffix, NULL); + return strjoin(prefix, "@", instance, suffix, NULL); } static char *do_escape_char(char c, char *t) { @@ -322,45 +339,51 @@ bool unit_name_is_template(const char *n) { assert(n); - if (!(p = strchr(n, '@'))) + p = strchr(n, '@'); + if (!p) return false; return p[1] == '.'; } +bool unit_name_is_instance(const char *n) { + const char *p; + + assert(n); + + p = strchr(n, '@'); + if (!p) + return false; + + return p[1] != '.'; +} + 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; } @@ -382,7 +405,6 @@ 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) { @@ -412,7 +434,7 @@ char *unit_name_from_path_instance(const char *prefix, const char *path, const c if (!p) return NULL; - r = join(prefix, "@", p, suffix, NULL); + r = strjoin(prefix, "@", p, suffix, NULL); free(p); return r; @@ -434,7 +456,7 @@ char *unit_name_to_path(const char *name) { } char *unit_dbus_path_from_name(const char *name) { - char *e, *p; + _cleanup_free_ char *e = NULL; assert(name); @@ -442,10 +464,23 @@ char *unit_dbus_path_from_name(const char *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; + + e = startswith(path, "/org/freedesktop/systemd1/unit/"); + if (!e) + return -EINVAL; + + n = bus_path_unescape(e); + if (!n) + return -ENOMEM; - return p; + *name = n; + return 0; } char *unit_name_mangle(const char *name) { @@ -457,8 +492,7 @@ char *unit_name_mangle(const char *name) { /* Try to turn a string that might not be a unit name into a * sensible unit name. */ - if (path_startswith(name, "/dev/") || - path_startswith(name, "/sys/")) + if (is_device_path(name)) return unit_name_from_path(name, ".device"); if (path_is_absolute(name)) @@ -467,12 +501,11 @@ 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 == '/') *(t++) = '-'; else if (!strchr("@" VALID_CHARS, *f)) @@ -481,7 +514,81 @@ char *unit_name_mangle(const char *name) { *(t++) = *f; } - *t = 0; + if (unit_name_to_type(name) < 0) + strcpy(t, ".service"); + else + *t = 0; + + return r; +} + +char *unit_name_mangle_with_suffix(const char *name, const char *suffix) { + char *r, *t; + const char *f; + + assert(name); + assert(suffix); + assert(suffix[0] == '.'); + + /* Similar to unit_name_mangle(), but is called when we know + * that this is about snapshot units. */ + + 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)) + t = do_escape_char(*f, t); + else + *(t++) = *f; + } + + if (!endswith(name, suffix)) + strcpy(t, suffix); + else + *t = 0; return r; } + +UnitType unit_name_to_type(const char *n) { + const char *e; + + assert(n); + + e = strrchr(n, '.'); + if (!e) + return _UNIT_TYPE_INVALID; + + 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; +}