chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fixate show_status earlier, so that we actually print the welcome message
[elogind.git]
/
src
/
shared
/
conf-files.c
diff --git
a/src/shared/conf-files.c
b/src/shared/conf-files.c
index ed4070c662711cb1e3ae7f009b336e3ad9f19b3e..52017821834f4663b540371e34561056e51af81d 100644
(file)
--- a/
src/shared/conf-files.c
+++ b/
src/shared/conf-files.c
@@
-37,12
+37,8
@@
#include "hashmap.h"
#include "conf-files.h"
#include "hashmap.h"
#include "conf-files.h"
-static int files_add(Hashmap *h, const char *
root, const char *
path, const char *suffix) {
+static int files_add(Hashmap *h, const char *
dir
path, const char *suffix) {
_cleanup_closedir_ DIR *dir = NULL;
_cleanup_closedir_ DIR *dir = NULL;
- _cleanup_free_ char *dirpath = NULL;
-
- if (asprintf(&dirpath, "%s%s", root ? root : "", path) < 0)
- return -ENOMEM;
dir = opendir(dirpath);
if (!dir) {
dir = opendir(dirpath);
if (!dir) {
@@
-53,13
+49,13
@@
static int files_add(Hashmap *h, const char *root, const char *path, const char
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;
- union dirent_storage buf;
char *p;
int r;
char *p;
int r;
- r = readdir_r(dir, &buf.de, &de);
- if (r != 0)
- return -r;
+ errno = 0;
+ de = readdir(dir);
+ if (!de && errno != 0)
+ return -errno;
if (!de)
break;
if (!de)
break;
@@
-71,7
+67,7
@@
static int files_add(Hashmap *h, const char *root, const char *path, const char
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- r = hashmap_put(h,
path_get_file_
name(p), p);
+ r = hashmap_put(h,
base
name(p), p);
if (r == -EEXIST) {
log_debug("Skipping overridden file: %s.", p);
free(p);
if (r == -EEXIST) {
log_debug("Skipping overridden file: %s.", p);
free(p);
@@
-92,7
+88,7
@@
static int base_cmp(const void *a, const void *b) {
s1 = *(char * const *)a;
s2 = *(char * const *)b;
s1 = *(char * const *)a;
s2 = *(char * const *)b;
- return strcmp(
path_get_file_name(s1), path_get_file_
name(s2));
+ return strcmp(
basename(s1), base
name(s2));
}
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) {
}
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) {
@@
-104,7
+100,7
@@
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
assert(suffix);
/* This alters the dirs string array */
assert(suffix);
/* This alters the dirs string array */
- if (!path_strv_canonicalize_
uniq(dirs
))
+ if (!path_strv_canonicalize_
absolute_uniq(dirs, root
))
return -ENOMEM;
fh = hashmap_new(string_hash_func, string_compare_func);
return -ENOMEM;
fh = hashmap_new(string_hash_func, string_compare_func);
@@
-112,7
+108,7
@@
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
return -ENOMEM;
STRV_FOREACH(p, dirs) {
return -ENOMEM;
STRV_FOREACH(p, dirs) {
- r = files_add(fh,
root,
*p, suffix);
+ r = files_add(fh, *p, suffix);
if (r == -ENOMEM) {
hashmap_free_free(fh);
return r;
if (r == -ENOMEM) {
hashmap_free_free(fh);
return r;