X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=1cc999b4d3979c2aad12591850a091b29804d2a8;hb=17384d7f95169dad5f769431374fc2c08101206d;hp=1e90bdf725129bb45888dbca66752f718ec517f1;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git diff --git a/src/shared/install.c b/src/shared/install.c index 1e90bdf72..1cc999b4d 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -36,7 +36,6 @@ #include "install.h" #include "conf-parser.h" #include "conf-files.h" -#include "specifier.h" #include "install-printf.h" #include "special.h" @@ -58,22 +57,6 @@ static int in_search_path(const char *path, char **search) { return strv_contains(search, parent); } -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); - - zero(*paths); - - return lookup_paths_init(paths, - scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, - scope == UNIT_FILE_USER, - root_dir, - NULL, NULL, NULL); -} - static int get_config_path(UnitFileScope scope, bool runtime, const char *root_dir, char **ret) { char *p = NULL; int r; @@ -240,7 +223,7 @@ static int remove_marked_symlinks_fd( if (!de) break; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; dirent_ensure_type(d, de); @@ -415,7 +398,7 @@ static int find_symlinks_fd( if (!de) return r; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; dirent_ensure_type(d, de); @@ -538,7 +521,6 @@ static int find_symlinks_in_scope( assert(scope < _UNIT_FILE_SCOPE_MAX); assert(name); - /* First look in runtime config path */ r = get_config_path(scope, true, root_dir, &path); if (r < 0) @@ -662,7 +644,7 @@ int unit_file_unmask( goto finish; STRV_FOREACH(i, files) { - char *path; + _cleanup_free_ char *path = NULL; if (!unit_name_is_valid(*i, TEMPLATE_VALID)) { if (r == 0) @@ -678,21 +660,16 @@ int unit_file_unmask( q = null_or_empty_path(path); if (q > 0) { - if (unlink(path) >= 0) { - mark_symlink_for_removal(&remove_symlinks_to, path); + if (unlink(path) < 0) + q = -errno; + else { + q = mark_symlink_for_removal(&remove_symlinks_to, path); add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL); - - free(path); - continue; } - - q = -errno; } if (q != -ENOENT && r == 0) r = q; - - free(path); } @@ -1070,7 +1047,7 @@ static int unit_file_load( assert(path); if (!isempty(root_dir)) - path = strappenda(root_dir, "/", path); + path = strjoina(root_dir, "/", path); if (!load) { r = access(path, F_OK) ? -errno : 0; @@ -1106,7 +1083,7 @@ static int unit_file_load( static int unit_file_search( InstallContext *c, InstallInfo *info, - LookupPaths *paths, + const LookupPaths *paths, const char *root_dir, bool allow_symlink, bool load, @@ -1175,7 +1152,7 @@ static int unit_file_search( } static int unit_file_can_install( - LookupPaths *paths, + const LookupPaths *paths, const char *root_dir, const char *name, bool allow_symlink, @@ -1339,7 +1316,7 @@ static int install_info_symlink_wants( static int install_info_symlink_link( InstallInfo *i, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1367,7 +1344,7 @@ static int install_info_symlink_link( static int install_info_apply( InstallInfo *i, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1399,7 +1376,7 @@ static int install_info_apply( static int install_context_apply( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, const char *config_path, const char *root_dir, bool force, @@ -1446,7 +1423,7 @@ static int install_context_apply( static int install_context_mark_for_removal( InstallContext *c, - LookupPaths *paths, + const LookupPaths *paths, Set **remove_symlinks_to, const char *config_path, const char *root_dir) { @@ -1553,14 +1530,12 @@ int unit_file_add_dependency( UnitFileState state; state = unit_file_get_state(scope, root_dir, *i); - if (state < 0) { - log_error_errno(-state, "Failed to get unit file state for %s: %m", *i); - return state; - } + if (state < 0) + return log_error_errno(state, "Failed to get unit file state for %s: %m", *i); if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { log_error("Failed to enable unit: Unit %s is masked", *i); - return -ENOTSUP; + return -EOPNOTSUPP; } r = install_info_add_auto(&c, *i); @@ -1638,7 +1613,7 @@ int unit_file_enable( state = unit_file_get_state(scope, root_dir, *i); if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { log_error("Failed to enable unit: Unit %s is masked", *i); - return -ENOTSUP; + return -EOPNOTSUPP; } r = install_info_add_auto(&c, *i); @@ -1754,7 +1729,7 @@ int unit_file_set_default( if (r < 0) return r; - path = strappenda(config_path, "/" SPECIAL_DEFAULT_TARGET); + path = strjoina(config_path, "/" SPECIAL_DEFAULT_TARGET); r = create_symlink(i->path, path, force, changes, n_changes); if (r < 0) @@ -1809,39 +1784,28 @@ int unit_file_get_default( return -ENOENT; } -UnitFileState unit_file_get_state( +UnitFileState unit_file_lookup_state( UnitFileScope scope, const char *root_dir, + const LookupPaths *paths, const char *name) { - _cleanup_lookup_paths_free_ LookupPaths paths = {}; UnitFileState state = _UNIT_FILE_STATE_INVALID; char **i; _cleanup_free_ char *path = NULL; - int r; - - assert(scope >= 0); - assert(scope < _UNIT_FILE_SCOPE_MAX); - assert(name); + int r = 0; - if (root_dir && scope != UNIT_FILE_SYSTEM) - return -EINVAL; + assert(paths); if (!unit_name_is_valid(name, TEMPLATE_VALID)) return -EINVAL; - r = lookup_paths_init_from_scope(&paths, scope, root_dir); - if (r < 0) - return r; - - STRV_FOREACH(i, paths.unit_path) { + STRV_FOREACH(i, paths->unit_path) { struct stat st; char *partial; bool also = false; free(path); - path = NULL; - path = path_join(root_dir, *i, name); if (!path) return -ENOMEM; @@ -1882,7 +1846,7 @@ UnitFileState unit_file_get_state( else if (r > 0) return state; - r = unit_file_can_install(&paths, root_dir, partial, true, &also); + r = unit_file_can_install(paths, root_dir, partial, true, &also); if (r < 0 && errno != ENOENT) return r; else if (r > 0) @@ -1897,6 +1861,28 @@ UnitFileState unit_file_get_state( return r < 0 ? r : state; } +UnitFileState unit_file_get_state( + UnitFileScope scope, + const char *root_dir, + const char *name) { + + _cleanup_lookup_paths_free_ LookupPaths paths = {}; + int r; + + assert(scope >= 0); + assert(scope < _UNIT_FILE_SCOPE_MAX); + assert(name); + + if (root_dir && scope != UNIT_FILE_SYSTEM) + return -EINVAL; + + r = lookup_paths_init_from_scope(&paths, scope, root_dir); + if (r < 0) + return r; + + return unit_file_lookup_state(scope, root_dir, &paths, name); +} + int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name) { _cleanup_strv_free_ char **files = NULL; char **p; @@ -2102,7 +2088,7 @@ int unit_file_preset_all( if (!de) break; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID)) @@ -2214,7 +2200,7 @@ int unit_file_get_list( if (!de) break; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))