X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=487d0f660d40b6f13d3be1435e9d4a65a6dd187c;hp=959de048103361bd5caa579f542202d58c82abc1;hb=849958d1ba3533c953fad46d4d41c0ec6e48316d;hpb=7fd1b19bc9e9f5574f2877936b8ac267c7706947 diff --git a/src/shared/install.c b/src/shared/install.c index 959de0481..487d0f660 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -38,18 +38,18 @@ #include "conf-files.h" #include "specifier.h" #include "install-printf.h" +#include "special.h" typedef struct { Hashmap *will_install; Hashmap *have_installed; } InstallContext; -#define _cleanup_lookup_paths_free_ \ - __attribute__((cleanup(lookup_paths_free))) -#define _cleanup_install_context_done_ \ - __attribute__((cleanup(install_context_done))) +#define _cleanup_install_context_done_ _cleanup_(install_context_done) -static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) { +static int lookup_paths_init_from_scope(LookupPaths *paths, + UnitFileScope scope, + const char *root_dir) { assert(paths); assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); @@ -59,6 +59,7 @@ static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) return lookup_paths_init(paths, scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, scope == UNIT_FILE_USER, + root_dir, NULL, NULL, NULL); } @@ -178,11 +179,9 @@ static int mark_symlink_for_removal( path_kill_slashes(n); - r = set_put(*remove_symlinks_to, n); - if (r < 0) { - free(n); + r = set_consume(*remove_symlinks_to, n); + if (r < 0) return r == -EEXIST ? 0 : r; - } return 0; } @@ -208,7 +207,7 @@ static int remove_marked_symlinks_fd( d = fdopendir(fd); if (!d) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } @@ -216,11 +215,10 @@ static int remove_marked_symlinks_fd( for (;;) { struct dirent *de; - union dirent_storage buf; - int k; - k = readdir_r(d, &buf.de, &de); - if (k != 0) { + errno = 0; + de = readdir(d); + if (!de && errno != 0) { r = -errno; break; } @@ -249,7 +247,7 @@ static int remove_marked_symlinks_fd( p = path_make_absolute(de->d_name, path); if (!p) { - close_nointr_nofail(nfd); + safe_close(nfd); return -ENOMEM; } @@ -280,10 +278,10 @@ static int remove_marked_symlinks_fd( found = set_get(remove_symlinks_to, dest) || - set_get(remove_symlinks_to, path_get_file_name(dest)); + set_get(remove_symlinks_to, basename(dest)); if (unit_name_is_instance(p)) - found = found && strv_contains(files, path_get_file_name(p)); + found = found && strv_contains(files, basename(p)); if (found) { @@ -337,7 +335,7 @@ static int remove_marked_symlinks( int q, cfd; deleted = false; - cfd = dup(fd); + cfd = fcntl(fd, F_DUPFD_CLOEXEC, 3); if (cfd < 0) { r = -errno; break; @@ -349,7 +347,7 @@ static int remove_marked_symlinks( r = q; } while (deleted); - close_nointr_nofail(fd); + safe_close(fd); return r; } @@ -372,17 +370,16 @@ static int find_symlinks_fd( d = fdopendir(fd); if (!d) { - close_nointr_nofail(fd); + safe_close(fd); return -errno; } for (;;) { - int k; struct dirent *de; - union dirent_storage buf; - k = readdir_r(d, &buf.de, &de); - if (k != 0) + errno = 0; + de = readdir(d); + if (!de && errno != 0) return -errno; if (!de) @@ -409,7 +406,7 @@ static int find_symlinks_fd( p = path_make_absolute(de->d_name, path); if (!p) { - close_nointr_nofail(nfd); + safe_close(nfd); return -ENOMEM; } @@ -455,7 +452,7 @@ static int find_symlinks_fd( if (path_is_absolute(name)) found_dest = path_equal(dest, name); else - found_dest = streq(path_get_file_name(dest), name); + found_dest = streq(basename(dest), name); if (found_path && found_dest) { _cleanup_free_ char *t = NULL; @@ -475,8 +472,6 @@ static int find_symlinks_fd( return 1; } } - - return r; } static int find_symlinks( @@ -508,7 +503,7 @@ static int find_symlinks_in_scope( UnitFileState *state) { int r; - _cleanup_free_ char *path = NULL; + _cleanup_free_ char *path2 = NULL; bool same_name_link_runtime = false, same_name_link = false; assert(scope >= 0); @@ -516,6 +511,7 @@ static int find_symlinks_in_scope( assert(name); if (scope == UNIT_FILE_SYSTEM || scope == UNIT_FILE_GLOBAL) { + _cleanup_free_ char *path = NULL; /* First look in runtime config path */ r = get_config_path(scope, true, root_dir, &path); @@ -532,11 +528,11 @@ static int find_symlinks_in_scope( } /* Then look in the normal config path */ - r = get_config_path(scope, false, root_dir, &path); + r = get_config_path(scope, false, root_dir, &path2); if (r < 0) return r; - r = find_symlinks(name, path, &same_name_link); + r = find_symlinks(name, path2, &same_name_link); if (r < 0) return r; else if (r > 0) { @@ -561,7 +557,7 @@ int unit_file_mask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -580,7 +576,7 @@ int unit_file_mask( STRV_FOREACH(i, files) { _cleanup_free_ char *path = NULL; - if (!unit_name_is_valid(*i, true)) { + if (!unit_name_is_valid(*i, TEMPLATE_VALID)) { if (r == 0) r = -EINVAL; continue; @@ -630,7 +626,7 @@ int unit_file_unmask( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, unsigned *n_changes) { @@ -648,7 +644,7 @@ int unit_file_unmask( STRV_FOREACH(i, files) { char *path; - if (!unit_name_is_valid(*i, true)) { + if (!unit_name_is_valid(*i, TEMPLATE_VALID)) { if (r == 0) r = -EINVAL; continue; @@ -695,7 +691,7 @@ int unit_file_link( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -708,7 +704,7 @@ int unit_file_link( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -721,10 +717,10 @@ int unit_file_link( char *fn; struct stat st; - fn = path_get_file_name(*i); + fn = basename(*i); if (!path_is_absolute(*i) || - !unit_name_is_valid(fn, true)) { + !unit_name_is_valid(fn, TEMPLATE_VALID)) { if (r == 0) r = -EINVAL; continue; @@ -864,9 +860,9 @@ static int install_info_add( assert(name || path); if (!name) - name = path_get_file_name(path); + name = basename(path); - if (!unit_name_is_valid(name, true)) + if (!unit_name_is_valid(name, TEMPLATE_VALID)) return -EINVAL; if (hashmap_get(c->have_installed, name) || @@ -925,6 +921,7 @@ static int config_parse_also(const char *unit, const char *filename, unsigned line, const char *section, + unsigned section_line, const char *lvalue, int ltype, const char *rvalue, @@ -960,6 +957,7 @@ static int config_parse_user(const char *unit, const char *filename, unsigned line, const char *section, + unsigned section_line, const char *lvalue, int ltype, const char *rvalue, @@ -968,14 +966,15 @@ static int config_parse_user(const char *unit, InstallInfo *i = data; char* printed; + int r; assert(filename); assert(lvalue); assert(rvalue); - printed = install_full_printf(i, rvalue); - if (!printed) - return -ENOMEM; + r = install_full_printf(i, rvalue, &printed); + if (r < 0) + return r; free(i->user); i->user = printed; @@ -1012,19 +1011,19 @@ static int unit_file_load( f = fdopen(fd, "re"); if (!f) { - close_nointr_nofail(fd); + safe_close(fd); return -ENOMEM; } r = config_parse(NULL, path, f, NULL, - config_item_table_lookup, (void*) items, true, info); + config_item_table_lookup, (void*) items, true, true, info); if (r < 0) return r; return - strv_length(info->aliases) + - strv_length(info->wanted_by) + - strv_length(info->required_by); + (int) strv_length(info->aliases) + + (int) strv_length(info->wanted_by) + + (int) strv_length(info->required_by); } static int unit_file_search( @@ -1041,67 +1040,64 @@ static int unit_file_search( assert(info); assert(paths); - if (info->path) - return unit_file_load(c, info, info->path, allow_symlink); + if (info->path) { + char *full_path = NULL; + + if (!isempty(root_dir)) + full_path = strappenda(root_dir, info->path); + + return unit_file_load(c, info, full_path ?: info->path, allow_symlink); + } assert(info->name); STRV_FOREACH(p, paths->unit_path) { - char *path = NULL; - - if (isempty(root_dir)) - asprintf(&path, "%s/%s", *p, info->name); - else - asprintf(&path, "%s/%s/%s", root_dir, *p, info->name); + _cleanup_free_ char *path = NULL, *full_path = NULL; + path = strjoin(*p, "/", info->name, NULL); if (!path) return -ENOMEM; - r = unit_file_load(c, info, path, allow_symlink); + if (!isempty(root_dir)) { + full_path = strappend(root_dir, path); + if (!full_path) + return -ENOMEM; + } - if (r >= 0) + r = unit_file_load(c, info, full_path ?: path, allow_symlink); + if (r >= 0) { info->path = path; - else { - if (r == -ENOENT && unit_name_is_instance(info->name)) { - /* unit file doesn't exist, however instance enablement was request */ - /* we will check if it is possible to load template unit file */ - char *template = NULL, - *template_path = NULL, - *template_dir = NULL; - - template = unit_name_template(info->name); - if (!template) { - free(path); - return -ENOMEM; - } + path = NULL; + } else if (r == -ENOENT && unit_name_is_instance(info->name)) { + /* Unit file doesn't exist, however instance enablement was requested. + * We will check if it is possible to load template unit file. */ + _cleanup_free_ char *template = NULL, *template_dir = NULL; + + template = unit_name_template(info->name); + if (!template) + return -ENOMEM; - /* we will reuse path variable since we don't need it anymore */ - template_dir = path; - *(strrchr(path, '/') + 1) = '\0'; + /* We will reuse path variable since we don't need it anymore. */ + template_dir = path; + *(strrchr(template_dir, '/') + 1) = '\0'; - template_path = strjoin(template_dir, template, NULL); - if (!template_path) { - free(path); - free(template); - return -ENOMEM; - } + path = strappend(template_dir, template); + if (!path) + return -ENOMEM; - /* let's try to load template unit */ - r = unit_file_load(c, info, template_path, allow_symlink); - if (r >= 0) { - info->path = strdup(template_path); - if (!info->path) { - free(path); - free(template); - free(template_path); - return -ENOMEM; - } - } + if (!isempty(root_dir)) { + free(full_path); + full_path = strappend(root_dir, path); + if (!full_path) + return -ENOMEM; + } - free(template); - free(template_path); + /* Let's try to load template unit. */ + r = unit_file_load(c, info, full_path ?: path, allow_symlink); + if (r >= 0) { + info->path = path; + path = NULL; } - free(path); } if (r != -ENOENT && r != -ELOOP) @@ -1134,9 +1130,9 @@ static int unit_file_can_install( if (r >= 0) r = - strv_length(i->aliases) + - strv_length(i->wanted_by) + - strv_length(i->required_by); + (int) strv_length(i->aliases) + + (int) strv_length(i->wanted_by) + + (int) strv_length(i->required_by); return r; } @@ -1174,7 +1170,9 @@ static int create_symlink( if (!force) return -EEXIST; - unlink(new_path); + r = unlink(new_path); + if (r < 0 && errno != ENOENT) + return -errno; if (symlink(old_path, new_path) >= 0) { add_file_change(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL); @@ -1201,9 +1199,9 @@ static int install_info_symlink_alias( STRV_FOREACH(s, i->aliases) { _cleanup_free_ char *alias_path = NULL, *dst = NULL; - dst = install_full_printf(i, *s); - if (!dst) - return -ENOMEM; + q = install_full_printf(i, *s, &dst); + if (q < 0) + return q; alias_path = path_make_absolute(dst, config_path); if (!alias_path) @@ -1233,11 +1231,11 @@ static int install_info_symlink_wants( STRV_FOREACH(s, i->wanted_by) { _cleanup_free_ char *path = NULL, *dst = NULL; - dst = install_full_printf(i, *s); - if (!dst) - return -ENOMEM; + q = install_full_printf(i, *s, &dst); + if (q < 0) + return q; - if (!unit_name_is_valid(dst, true)) { + if (!unit_name_is_valid(dst, TEMPLATE_VALID)) { r = -EINVAL; continue; } @@ -1270,11 +1268,11 @@ static int install_info_symlink_requires( STRV_FOREACH(s, i->required_by) { _cleanup_free_ char *path = NULL, *dst = NULL; - dst = install_full_printf(i, *s); - if (!dst) - return -ENOMEM; + q = install_full_printf(i, *s, &dst); + if (q < 0) + return q; - if (!unit_name_is_valid(dst, true)) { + if (!unit_name_is_valid(dst, TEMPLATE_VALID)) { r = -EINVAL; continue; } @@ -1415,7 +1413,9 @@ static int install_context_mark_for_removal( assert_se(hashmap_move_one(c->have_installed, c->will_install, i->name) == 0); q = unit_file_search(c, i, paths, root_dir, false); - if (q < 0) { + if (q == -ENOENT) { + /* do nothing */ + } else if (q < 0) { if (r >= 0) r = q; @@ -1424,16 +1424,30 @@ static int install_context_mark_for_removal( r += q; if (unit_name_is_instance(i->name)) { - char *unit_file = NULL; - - unit_file = path_get_file_name(i->path); + char *unit_file; + + if (i->path) { + unit_file = basename(i->path); + + if (unit_name_is_instance(unit_file)) + /* unit file named as instance exists, thus all symlinks + * pointing to it will be removed */ + q = mark_symlink_for_removal(remove_symlinks_to, i->name); + else + /* does not exist, thus we will mark for removal symlinks + * to template unit file */ + q = mark_symlink_for_removal(remove_symlinks_to, unit_file); + } else { + /* If i->path is not set, it means that we didn't actually find + * the unit file. But we can still remove symlinks to the + * nonexistent template. */ + unit_file = unit_name_template(i->name); + if (!unit_file) + return log_oom(); - if (unit_name_is_instance(unit_file)) - /* unit file named as instance exists, thus all symlinks pointing to it, will be removed */ - q = mark_symlink_for_removal(remove_symlinks_to, i->name); - else - /* does not exist, thus we will mark for removal symlinks to template unit file */ q = mark_symlink_for_removal(remove_symlinks_to, unit_file); + free(unit_file); + } } else q = mark_symlink_for_removal(remove_symlinks_to, i->name); @@ -1448,7 +1462,7 @@ int unit_file_enable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1462,7 +1476,7 @@ int unit_file_enable( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1480,15 +1494,15 @@ int unit_file_enable( supposed to be created, not the ones actually created. This is useful to determine whether the passed files had any installation data at all. */ - r = install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes); - return r; + + return install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes); } int unit_file_disable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, UnitFileChange **changes, unsigned *n_changes) { @@ -1502,7 +1516,7 @@ int unit_file_disable( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1529,47 +1543,118 @@ int unit_file_reenable( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, + bool force, + UnitFileChange **changes, + unsigned *n_changes) { + int r; + + r = unit_file_disable(scope, runtime, root_dir, files, + changes, n_changes); + if (r < 0) + return r; + + return unit_file_enable(scope, runtime, root_dir, files, force, + changes, n_changes); +} + +int unit_file_set_default( + UnitFileScope scope, + const char *root_dir, + const char *file, bool force, UnitFileChange **changes, unsigned *n_changes) { _cleanup_lookup_paths_free_ LookupPaths paths = {}; _cleanup_install_context_done_ InstallContext c = {}; - char **i; _cleanup_free_ char *config_path = NULL; - _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; - int r, q; + char *path; + int r; + InstallInfo *i = NULL; assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(file); - r = lookup_paths_init_from_scope(&paths, scope); + if (unit_name_to_type(file) != UNIT_TARGET) + return -EINVAL; + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; - r = get_config_path(scope, runtime, root_dir, &config_path); + r = get_config_path(scope, false, root_dir, &config_path); if (r < 0) return r; - STRV_FOREACH(i, files) { - r = mark_symlink_for_removal(&remove_symlinks_to, *i); - if (r < 0) - return r; + r = install_info_add_auto(&c, file); + if (r < 0) + return r; - r = install_info_add_auto(&c, *i); - if (r < 0) + assert_se(i = hashmap_first(c.will_install)); + + r = unit_file_search(&c, i, &paths, root_dir, false); + if (r < 0) + return r; + + path = strappenda(config_path, "/" SPECIAL_DEFAULT_TARGET); + + r = create_symlink(i->path, path, force, changes, n_changes); + if (r < 0) + return r; + + return 0; +} + +int unit_file_get_default( + UnitFileScope scope, + const char *root_dir, + char **name) { + + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + char **p; + int r; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(name); + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); + if (r < 0) + return r; + + STRV_FOREACH(p, paths.unit_path) { + _cleanup_free_ char *path = NULL, *tmp = NULL; + char *n; + + if (isempty(root_dir)) + path = strappend(*p, "/" SPECIAL_DEFAULT_TARGET); + else + path = strjoin(root_dir, "/", *p, "/" SPECIAL_DEFAULT_TARGET, NULL); + + if (!path) + return -ENOMEM; + + r = readlink_malloc(path, &tmp); + if (r == -ENOENT) + continue; + else if (r == -EINVAL) + /* not a symlink */ + n = strdup(SPECIAL_DEFAULT_TARGET); + else if (r < 0) return r; - } + else + n = strdup(basename(tmp)); - r = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files); + if (!n) + return -ENOMEM; - /* Returns number of symlinks that where supposed to be installed. */ - q = install_context_apply(&c, &paths, config_path, root_dir, force, changes, n_changes); - if (r == 0) - r = q; + *name = n; + return 0; + } - return r; + return -ENOENT; } UnitFileState unit_file_get_state( @@ -1590,15 +1675,16 @@ UnitFileState unit_file_get_state( if (root_dir && scope != UNIT_FILE_SYSTEM) return -EINVAL; - if (!unit_name_is_valid(name, true)) + if (!unit_name_is_valid(name, TEMPLATE_VALID)) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; STRV_FOREACH(i, paths.unit_path) { struct stat st; + char *partial; free(path); path = NULL; @@ -1607,28 +1693,37 @@ UnitFileState unit_file_get_state( asprintf(&path, "%s/%s/%s", root_dir, *i, name); else asprintf(&path, "%s/%s", *i, name); - if (!path) return -ENOMEM; + if (root_dir) + partial = path + strlen(root_dir) + 1; + else + partial = path; + + /* + * Search for a unit file in our default paths, to + * be sure, that there are no broken symlinks. + */ if (lstat(path, &st) < 0) { r = -errno; - if (errno == ENOENT) - continue; - - return -errno; - } + if (errno != ENOENT) + return r; - if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) - return -ENOENT; + if (!unit_name_is_instance(name)) + continue; + } else { + if (!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) + return -ENOENT; - r = null_or_empty_path(path); - if (r < 0 && r != -ENOENT) - return r; - else if (r > 0) { - state = path_startswith(*i, "/run") ? - UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED; - return state; + r = null_or_empty_path(path); + if (r < 0 && r != -ENOENT) + return r; + else if (r > 0) { + state = path_startswith(*i, "/run") ? + UNIT_FILE_MASKED_RUNTIME : UNIT_FILE_MASKED; + return state; + } } r = find_symlinks_in_scope(scope, root_dir, name, &state); @@ -1637,7 +1732,7 @@ UnitFileState unit_file_get_state( else if (r > 0) return state; - r = unit_file_can_install(&paths, root_dir, path, true); + r = unit_file_can_install(&paths, root_dir, partial, true); if (r < 0 && errno != ENOENT) return r; else if (r > 0) @@ -1730,7 +1825,7 @@ int unit_file_preset( UnitFileScope scope, bool runtime, const char *root_dir, - char *files[], + char **files, bool force, UnitFileChange **changes, unsigned *n_changes) { @@ -1745,7 +1840,7 @@ int unit_file_preset( assert(scope >= 0); assert(scope < _UNIT_FILE_SCOPE_MAX); - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1755,7 +1850,7 @@ int unit_file_preset( STRV_FOREACH(i, files) { - if (!unit_name_is_valid(*i, true)) + if (!unit_name_is_valid(*i, TEMPLATE_VALID)) return -EINVAL; r = unit_file_query_preset(scope, *i); @@ -1795,6 +1890,7 @@ static void unitfilelist_free(UnitFileList **f) { free((*f)->path); free(*f); } +#define _cleanup_unitfilelist_free_ _cleanup_(unitfilelist_free) int unit_file_get_list( UnitFileScope scope, @@ -1814,7 +1910,7 @@ int unit_file_get_list( if (root_dir && scope != UNIT_FILE_SYSTEM) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope); + r = lookup_paths_init_from_scope(&paths, scope, root_dir); if (r < 0) return r; @@ -1845,13 +1941,12 @@ int unit_file_get_list( for (;;) { struct dirent *de; - union dirent_storage buffer; - UnitFileList __attribute__((cleanup(unitfilelist_free))) - *f = NULL; + _cleanup_unitfilelist_free_ UnitFileList *f = NULL; - r = readdir_r(d, &buffer.de, &de); - if (r != 0) - return -r; + errno = 0; + de = readdir(d); + if (!de && errno != 0) + return -errno; if (!de) break; @@ -1859,7 +1954,7 @@ int unit_file_get_list( if (ignore_file(de->d_name)) continue; - if (!unit_name_is_valid(de->d_name, true)) + if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID)) continue; if (hashmap_get(h, de->d_name)) @@ -1915,7 +2010,7 @@ int unit_file_get_list( f->state = UNIT_FILE_STATIC; found: - r = hashmap_put(h, path_get_file_name(f->path), f); + r = hashmap_put(h, basename(f->path), f); if (r < 0) return r; f = NULL; /* prevent cleanup */