|
 |
7f93bc2 |
From bed108402ded5dc88cf37ce48936453b15912027 Mon Sep 17 00:00:00 2001
|
|
|
a59965a |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
a59965a |
Date: Mon, 16 Jun 2014 17:19:30 +0200
|
|
|
a59965a |
Subject: [PATCH] install: various modernizations
|
|
|
a59965a |
|
|
|
a59965a |
(cherry picked from commit da39f6a63e9ca59bec23cc9d1cb841703bb5ef56)
|
|
|
a59965a |
---
|
|
|
a59965a |
src/shared/install.c | 43 ++++++++++++++-----------------------------
|
|
|
a59965a |
1 file changed, 14 insertions(+), 29 deletions(-)
|
|
|
a59965a |
|
|
|
a59965a |
diff --git a/src/shared/install.c b/src/shared/install.c
|
|
|
1cc3df3 |
index c9c785a443..1f3ea5b1c6 100644
|
|
|
a59965a |
--- a/src/shared/install.c
|
|
|
a59965a |
+++ b/src/shared/install.c
|
|
|
a59965a |
@@ -320,7 +320,8 @@ static int remove_marked_symlinks(
|
|
|
a59965a |
unsigned *n_changes,
|
|
|
a59965a |
char** files) {
|
|
|
a59965a |
|
|
|
a59965a |
- int fd, r = 0;
|
|
|
a59965a |
+ _cleanup_close_ int fd = -1;
|
|
|
a59965a |
+ int r = 0;
|
|
|
a59965a |
bool deleted;
|
|
|
a59965a |
|
|
|
a59965a |
assert(config_path);
|
|
|
a59965a |
@@ -348,8 +349,6 @@ static int remove_marked_symlinks(
|
|
|
a59965a |
r = q;
|
|
|
a59965a |
} while (deleted);
|
|
|
a59965a |
|
|
|
a59965a |
- safe_close(fd);
|
|
|
a59965a |
-
|
|
|
a59965a |
return r;
|
|
|
a59965a |
}
|
|
|
a59965a |
|
|
|
a59965a |
@@ -1823,11 +1822,11 @@ int unit_file_preset(
|
|
|
a59965a |
UnitFileChange **changes,
|
|
|
a59965a |
unsigned *n_changes) {
|
|
|
a59965a |
|
|
|
a59965a |
- _cleanup_lookup_paths_free_ LookupPaths paths = {};
|
|
|
a59965a |
_cleanup_install_context_done_ InstallContext plus = {}, minus = {};
|
|
|
a59965a |
- char **i;
|
|
|
a59965a |
- _cleanup_free_ char *config_path = NULL;
|
|
|
a59965a |
_cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
|
|
|
a59965a |
+ _cleanup_lookup_paths_free_ LookupPaths paths = {};
|
|
|
a59965a |
+ _cleanup_free_ char *config_path = NULL;
|
|
|
a59965a |
+ char **i;
|
|
|
a59965a |
int r, q;
|
|
|
a59965a |
|
|
|
a59965a |
assert(scope >= 0);
|
|
|
a59965a |
@@ -1854,16 +1853,13 @@ int unit_file_preset(
|
|
|
a59965a |
r = install_info_add_auto(&plus, *i);
|
|
|
a59965a |
else
|
|
|
a59965a |
r = install_info_add_auto(&minus, *i);
|
|
|
a59965a |
-
|
|
|
a59965a |
if (r < 0)
|
|
|
a59965a |
return r;
|
|
|
a59965a |
}
|
|
|
a59965a |
|
|
|
a59965a |
- r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to,
|
|
|
a59965a |
- config_path, root_dir);
|
|
|
a59965a |
+ r = install_context_mark_for_removal(&minus, &paths, &remove_symlinks_to, config_path, root_dir);
|
|
|
a59965a |
|
|
|
a59965a |
- q = remove_marked_symlinks(remove_symlinks_to, config_path,
|
|
|
a59965a |
- changes, n_changes, files);
|
|
|
a59965a |
+ q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files);
|
|
|
a59965a |
if (r == 0)
|
|
|
a59965a |
r = q;
|
|
|
a59965a |
|
|
|
a59965a |
@@ -1891,8 +1887,6 @@ int unit_file_get_list(
|
|
|
a59965a |
|
|
|
a59965a |
_cleanup_lookup_paths_free_ LookupPaths paths = {};
|
|
|
a59965a |
char **i;
|
|
|
a59965a |
- _cleanup_free_ char *buf = NULL;
|
|
|
a59965a |
- _cleanup_closedir_ DIR *d = NULL;
|
|
|
a59965a |
int r;
|
|
|
a59965a |
|
|
|
a59965a |
assert(scope >= 0);
|
|
|
a59965a |
@@ -1907,22 +1901,19 @@ int unit_file_get_list(
|
|
|
a59965a |
return r;
|
|
|
a59965a |
|
|
|
a59965a |
STRV_FOREACH(i, paths.unit_path) {
|
|
|
a59965a |
+ _cleanup_closedir_ DIR *d = NULL;
|
|
|
a59965a |
+ _cleanup_free_ char *buf = NULL;
|
|
|
a59965a |
const char *units_dir;
|
|
|
a59965a |
|
|
|
a59965a |
- free(buf);
|
|
|
a59965a |
- buf = NULL;
|
|
|
a59965a |
-
|
|
|
a59965a |
- if (root_dir) {
|
|
|
a59965a |
- if (asprintf(&buf, "%s/%s", root_dir, *i) < 0)
|
|
|
a59965a |
+ if (!isempty(root_dir)) {
|
|
|
a59965a |
+ buf = strjoin(root_dir, "/", *i, NULL);
|
|
|
a59965a |
+ if (!buf)
|
|
|
a59965a |
return -ENOMEM;
|
|
|
a59965a |
|
|
|
a59965a |
units_dir = buf;
|
|
|
a59965a |
} else
|
|
|
a59965a |
units_dir = *i;
|
|
|
a59965a |
|
|
|
a59965a |
- if (d)
|
|
|
a59965a |
- closedir(d);
|
|
|
a59965a |
-
|
|
|
a59965a |
d = opendir(units_dir);
|
|
|
a59965a |
if (!d) {
|
|
|
a59965a |
if (errno == ENOENT)
|
|
|
a59965a |
@@ -1953,15 +1944,9 @@ int unit_file_get_list(
|
|
|
a59965a |
if (hashmap_get(h, de->d_name))
|
|
|
a59965a |
continue;
|
|
|
a59965a |
|
|
|
a59965a |
- r = dirent_ensure_type(d, de);
|
|
|
a59965a |
- if (r < 0) {
|
|
|
a59965a |
- if (r == -ENOENT)
|
|
|
a59965a |
- continue;
|
|
|
a59965a |
-
|
|
|
a59965a |
- return r;
|
|
|
a59965a |
- }
|
|
|
a59965a |
+ dirent_ensure_type(d, de);
|
|
|
a59965a |
|
|
|
a59965a |
- if (de->d_type != DT_LNK && de->d_type != DT_REG)
|
|
|
a59965a |
+ if (!IN_SET(de->d_type, DT_LNK, DT_REG))
|
|
|
a59965a |
continue;
|
|
|
a59965a |
|
|
|
a59965a |
f = new0(UnitFileList, 1);
|