chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "systemctl: fix broken list-unit-files with --root"
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 4f7179309e80eb056b7bbb8bd18232927f98d5d0..4b09a69456fd71fab4bf9c7bb113607d3747c9e2 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-45,8
+45,6
@@
typedef struct {
Hashmap *have_installed;
} InstallContext;
Hashmap *have_installed;
} InstallContext;
-#define _cleanup_install_context_done_ _cleanup_(install_context_done)
-
static int in_search_path(const char *path, char **search) {
_cleanup_free_ char *parent = NULL;
int r;
static int in_search_path(const char *path, char **search) {
_cleanup_free_ char *parent = NULL;
int r;
@@
-88,15
+86,10
@@
static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d
case UNIT_FILE_SYSTEM:
case UNIT_FILE_SYSTEM:
- if (root_dir && runtime)
- asprintf(&p, "%s/run/systemd/system", root_dir);
- else if (runtime)
- p = strdup("/run/systemd/system");
- else if (root_dir)
- asprintf(&p, "%s/%s", root_dir, SYSTEM_CONFIG_UNIT_PATH);
+ if (runtime)
+ p = path_join(root_dir, "/run/systemd/system", NULL);
else
else
- p = strdup(SYSTEM_CONFIG_UNIT_PATH);
-
+ p = path_join(root_dir, SYSTEM_CONFIG_UNIT_PATH, NULL);
break;
case UNIT_FILE_GLOBAL:
break;
case UNIT_FILE_GLOBAL:
@@
-951,20
+944,19
@@
static int config_parse_also(
void *data,
void *userdata) {
void *data,
void *userdata) {
- char *w;
size_t l;
size_t l;
- c
har
*state;
+ c
onst char *word,
*state;
InstallContext *c = data;
assert(filename);
assert(lvalue);
assert(rvalue);
InstallContext *c = data;
assert(filename);
assert(lvalue);
assert(rvalue);
- FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w
ord
, l, rvalue, state) {
_cleanup_free_ char *n;
int r;
_cleanup_free_ char *n;
int r;
- n = strndup(w, l);
+ n = strndup(w
ord
, l);
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;
@@
-972,6
+964,9
@@
static int config_parse_also(
if (r < 0)
return r;
}
if (r < 0)
return r;
}
+ if (!isempty(state))
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Trailing garbage, ignoring.");
return 0;
}
return 0;
}
@@
-1064,7
+1059,7
@@
static int unit_file_load(
assert(path);
if (!isempty(root_dir))
assert(path);
if (!isempty(root_dir))
- path = strappenda
3
(root_dir, "/", path);
+ path = strappenda(root_dir, "/", path);
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|(allow_symlink ? 0 : O_NOFOLLOW));
if (fd < 0)
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|(allow_symlink ? 0 : O_NOFOLLOW));
if (fd < 0)
@@
-1076,7
+1071,10
@@
static int unit_file_load(
return -ENOMEM;
}
return -ENOMEM;
}
- r = config_parse(NULL, path, f, NULL, config_item_table_lookup, (void*) items, true, true, info);
+ r = config_parse(NULL, path, f,
+ NULL,
+ config_item_table_lookup, items,
+ true, true, false, info);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1161,7
+1159,7
@@
static int unit_file_can_install(
const char *name,
bool allow_symlink) {
const char *name,
bool allow_symlink) {
- _cleanup_
install_context_done_
InstallContext c = {};
+ _cleanup_
(install_context_done)
InstallContext c = {};
InstallInfo *i;
int r;
InstallInfo *i;
int r;
@@
-1498,7
+1496,7
@@
int unit_file_enable(
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
- _cleanup_
install_context_done_
InstallContext c = {};
+ _cleanup_
(install_context_done)
InstallContext c = {};
char **i;
_cleanup_free_ char *config_path = NULL;
int r;
char **i;
_cleanup_free_ char *config_path = NULL;
int r;
@@
-1537,7
+1535,7
@@
int unit_file_disable(
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
- _cleanup_
install_context_done_
InstallContext c = {};
+ _cleanup_
(install_context_done)
InstallContext c = {};
char **i;
_cleanup_free_ char *config_path = NULL;
_cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
char **i;
_cleanup_free_ char *config_path = NULL;
_cleanup_set_free_free_ Set *remove_symlinks_to = NULL;
@@
-1597,7
+1595,7
@@
int unit_file_set_default(
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
unsigned *n_changes) {
_cleanup_lookup_paths_free_ LookupPaths paths = {};
- _cleanup_
install_context_done_
InstallContext c = {};
+ _cleanup_
(install_context_done)
InstallContext c = {};
_cleanup_free_ char *config_path = NULL;
char *path;
int r;
_cleanup_free_ char *config_path = NULL;
char *path;
int r;
@@
-1658,11
+1656,7
@@
int unit_file_get_default(
_cleanup_free_ char *path = NULL, *tmp = NULL;
char *n;
_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);
-
+ path = path_join(root_dir, *p, SPECIAL_DEFAULT_TARGET);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1719,15
+1713,12
@@
UnitFileState unit_file_get_state(
free(path);
path = NULL;
free(path);
path = NULL;
- if (root_dir)
- asprintf(&path, "%s/%s/%s", root_dir, *i, name);
- else
- asprintf(&path, "%s/%s", *i, name);
+ path = path_join(root_dir, *i, name);
if (!path)
return -ENOMEM;
if (root_dir)
if (!path)
return -ENOMEM;
if (root_dir)
- partial = path + strlen(root_dir)
+ 1
;
+ partial = path + strlen(root_dir);
else
partial = path;
else
partial = path;
@@
-1776,7
+1767,7
@@
UnitFileState unit_file_get_state(
int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name) {
_cleanup_strv_free_ char **files = NULL;
int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name) {
_cleanup_strv_free_ char **files = NULL;
- char **
i
;
+ char **
p
;
int r;
assert(scope >= 0);
int r;
assert(scope >= 0);
@@
-1804,17
+1795,10
@@
int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char
if (r < 0)
return r;
if (r < 0)
return r;
- STRV_FOREACH(i, files) {
- _cleanup_free_ char *buf = NULL;
+ STRV_FOREACH(p, files) {
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f;
- const char *p;
-
- if (root_dir)
- p = buf = strjoin(root_dir, "/", *i, NULL);
- else
- p = *i;
- f = fopen(p, "re");
+ f = fopen(
*
p, "re");
if (!f) {
if (errno == ENOENT)
continue;
if (!f) {
if (errno == ENOENT)
continue;
@@
-1873,7
+1857,7
@@
int unit_file_preset(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- _cleanup_
install_context_done_
InstallContext plus = {}, minus = {};
+ _cleanup_
(install_context_done)
InstallContext plus = {}, minus = {};
_cleanup_lookup_paths_free_ LookupPaths paths = {};
_cleanup_free_ char *config_path = NULL;
char **i;
_cleanup_lookup_paths_free_ LookupPaths paths = {};
_cleanup_free_ char *config_path = NULL;
char **i;
@@
-1881,7
+1865,7
@@
int unit_file_preset(
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
- assert(mode < _UNIT_FILE_PRESET_M
ODE_M
AX);
+ assert(mode < _UNIT_FILE_PRESET_MAX);
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
@@
-1941,7
+1925,7
@@
int unit_file_preset_all(
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
- _cleanup_
install_context_done_
InstallContext plus = {}, minus = {};
+ _cleanup_
(install_context_done)
InstallContext plus = {}, minus = {};
_cleanup_lookup_paths_free_ LookupPaths paths = {};
_cleanup_free_ char *config_path = NULL;
char **i;
_cleanup_lookup_paths_free_ LookupPaths paths = {};
_cleanup_free_ char *config_path = NULL;
char **i;
@@
-1949,7
+1933,7
@@
int unit_file_preset_all(
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
- assert(mode < _UNIT_FILE_PRESET_M
ODE_M
AX);
+ assert(mode < _UNIT_FILE_PRESET_MAX);
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
@@
-1961,17
+1945,11
@@
int unit_file_preset_all(
STRV_FOREACH(i, paths.unit_path) {
_cleanup_closedir_ DIR *d = NULL;
STRV_FOREACH(i, paths.unit_path) {
_cleanup_closedir_ DIR *d = NULL;
- _cleanup_free_ char *buf = NULL;
- const char *units_dir;
+ _cleanup_free_ char *units_dir;
- if (!isempty(root_dir)) {
- buf = strjoin(root_dir, "/", *i, NULL);
- if (!buf)
- return -ENOMEM;
-
- units_dir = buf;
- } else
- units_dir = *i;
+ units_dir = path_join(root_dir, *i, NULL);
+ if (!units_dir)
+ return -ENOMEM;
d = opendir(units_dir);
if (!d) {
d = opendir(units_dir);
if (!d) {
@@
-2039,14
+2017,15
@@
int unit_file_preset_all(
return r;
}
return r;
}
-static void unit
filelist_free(UnitFileList *
*f) {
- if (!
*
f)
+static void unit
_file_list_free_one(UnitFileList
*f) {
+ if (!f)
return;
return;
- free(
(*f)
->path);
- free(
*
f);
+ free(
f
->path);
+ free(f);
}
}
-#define _cleanup_unitfilelist_free_ _cleanup_(unitfilelist_free)
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(UnitFileList*, unit_file_list_free_one);
int unit_file_get_list(
UnitFileScope scope,
int unit_file_get_list(
UnitFileScope scope,
@@
-2064,23
+2043,23
@@
int unit_file_get_list(
if (root_dir && scope != UNIT_FILE_SYSTEM)
return -EINVAL;
if (root_dir && scope != UNIT_FILE_SYSTEM)
return -EINVAL;
+ if (root_dir) {
+ r = access(root_dir, F_OK);
+ if (r < 0)
+ return -errno;
+ }
+
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
return r;
STRV_FOREACH(i, paths.unit_path) {
_cleanup_closedir_ DIR *d = NULL;
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
if (r < 0)
return r;
STRV_FOREACH(i, paths.unit_path) {
_cleanup_closedir_ DIR *d = NULL;
- _cleanup_free_ char *buf = NULL;
- const char *units_dir;
-
- if (!isempty(root_dir)) {
- buf = strjoin(root_dir, "/", *i, NULL);
- if (!buf)
- return -ENOMEM;
+ _cleanup_free_ char *units_dir;
-
units_dir = buf
;
- } else
-
units_dir = *i
;
+
units_dir = path_join(root_dir, *i, NULL)
;
+ if (!units_dir)
+
return -ENOMEM
;
d = opendir(units_dir);
if (!d) {
d = opendir(units_dir);
if (!d) {
@@
-2091,7
+2070,7
@@
int unit_file_get_list(
}
for (;;) {
}
for (;;) {
- _cleanup_
unitfilelist_free_
UnitFileList *f = NULL;
+ _cleanup_
(unit_file_list_free_onep)
UnitFileList *f = NULL;
struct dirent *de;
errno = 0;
struct dirent *de;
errno = 0;
@@
-2186,7
+2165,7
@@
static const char* const unit_file_change_type_table[_UNIT_FILE_CHANGE_TYPE_MAX]
DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType);
DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType);
-static const char* const unit_file_preset_mode_table[_UNIT_FILE_PRESET_M
ODE_M
AX] = {
+static const char* const unit_file_preset_mode_table[_UNIT_FILE_PRESET_MAX] = {
[UNIT_FILE_PRESET_FULL] = "full",
[UNIT_FILE_PRESET_ENABLE_ONLY] = "enable-only",
[UNIT_FILE_PRESET_DISABLE_ONLY] = "disable-only",
[UNIT_FILE_PRESET_FULL] = "full",
[UNIT_FILE_PRESET_ENABLE_ONLY] = "enable-only",
[UNIT_FILE_PRESET_DISABLE_ONLY] = "disable-only",