chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network: link - simplify code a bit and remove some debug logging
[elogind.git]
/
src
/
core
/
load-dropin.c
diff --git
a/src/core/load-dropin.c
b/src/core/load-dropin.c
index 0318296f1fce4d2e296647c47d0c8a411befff53..546e560b852c82c4bb27ff59aba793ba6ea3098d 100644
(file)
--- a/
src/core/load-dropin.c
+++ b/
src/core/load-dropin.c
@@
-31,7
+31,12
@@
#include "load-fragment.h"
#include "conf-files.h"
#include "load-fragment.h"
#include "conf-files.h"
-static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, char ***strv) {
+static int iterate_dir(
+ Unit *u,
+ const char *path,
+ UnitDependency dependency,
+ char ***strv) {
+
_cleanup_closedir_ DIR *d = NULL;
int r;
_cleanup_closedir_ DIR *d = NULL;
int r;
@@
-58,12
+63,13
@@
static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, cha
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buf;
_cleanup_free_ char *f = NULL;
int k;
_cleanup_free_ char *f = NULL;
int k;
- k = readdir_r(d, &buf.de, &de);
- if (k != 0) {
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ k = errno;
log_error("Failed to read directory %s: %s", path, strerror(k));
return -k;
}
log_error("Failed to read directory %s: %s", path, strerror(k));
return -k;
}
@@
-86,9
+92,16
@@
static int iterate_dir(Unit *u, const char *path, UnitDependency dependency, cha
return 0;
}
return 0;
}
-static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency, char ***strv) {
+static int process_dir(
+ Unit *u,
+ const char *unit_path,
+ const char *name,
+ const char *suffix,
+ UnitDependency dependency,
+ char ***strv) {
+
+ _cleanup_free_ char *path = NULL;
int r;
int r;
- char *path;
assert(u);
assert(unit_path);
assert(u);
assert(unit_path);
@@
-97,51
+110,41
@@
static int process_dir(Unit *u, const char *unit_path, const char *name, const c
path = strjoin(unit_path, "/", name, suffix, NULL);
if (!path)
path = strjoin(unit_path, "/", name, suffix, NULL);
if (!path)
- return
-ENOMEM
;
+ return
log_oom()
;
- if (u->manager->unit_path_cache &&
- !set_get(u->manager->unit_path_cache, path))
- r = 0;
- else
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, path)) {
r = iterate_dir(u, path, dependency, strv);
r = iterate_dir(u, path, dependency, strv);
- free(path);
-
- if (r < 0)
- return r;
+ if (r < 0)
+ return r;
+ }
if (u->instance) {
if (u->instance) {
-
char *template
;
+
_cleanup_free_ char *template = NULL, *p = NULL
;
/* Also try the template dir */
template = unit_name_template(name);
if (!template)
/* Also try the template dir */
template = unit_name_template(name);
if (!template)
- return -ENOMEM;
-
- path = strjoin(unit_path, "/", template, suffix, NULL);
- free(template);
-
- if (!path)
- return -ENOMEM;
+ return log_oom();
- if (u->manager->unit_path_cache &&
- !set_get(u->manager->unit_path_cache, path))
- r = 0;
- else
- r = iterate_dir(u, path, dependency, strv);
- free(path);
+ p = strjoin(unit_path, "/", template, suffix, NULL);
+ if (!p)
+ return log_oom();
- if (r < 0)
- return r;
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, p)) {
+ r = iterate_dir(u, p, dependency, strv);
+ if (r < 0)
+ return r;
+ }
}
return 0;
}
char **unit_find_dropin_paths(Unit *u) {
}
return 0;
}
char **unit_find_dropin_paths(Unit *u) {
- Iterator i;
- char *t;
_cleanup_strv_free_ char **strv = NULL;
char **configs = NULL;
_cleanup_strv_free_ char **strv = NULL;
char **configs = NULL;
+ Iterator i;
+ char *t;
int r;
assert(u);
int r;
assert(u);
@@
-157,14
+160,14
@@
char **unit_find_dropin_paths(Unit *u) {
}
}
}
}
- if (!strv_isempty(strv)) {
- r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
- if (r < 0) {
- log_error("Failed to get list of configuration files: %s", strerror(-r));
- strv_free(configs);
- return NULL;
- }
+ if (strv_isempty(strv))
+ return NULL;
+ r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
+ if (r < 0) {
+ log_error("Failed to get list of configuration files: %s", strerror(-r));
+ strv_free(configs);
+ return NULL;
}
return configs;
}
return configs;