chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: switch our hash table implementation over to SipHash
[elogind.git]
/
src
/
shared
/
conf-files.c
diff --git
a/src/shared/conf-files.c
b/src/shared/conf-files.c
index 6d99739353be97b0553059ffb0d205acff25459d..c86bb03074474006247516019cbd41bb2175d457 100644
(file)
--- a/
src/shared/conf-files.c
+++ b/
src/shared/conf-files.c
@@
-53,13
+53,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
+71,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
+92,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) {
@@
-127,7
+127,7
@@
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
return -ENOMEM;
}
return -ENOMEM;
}
- qsort(files, hashmap_size(fh), sizeof(char *), base_cmp);
+ qsort
_safe
(files, hashmap_size(fh), sizeof(char *), base_cmp);
*strv = files;
hashmap_free(fh);
*strv = files;
hashmap_free(fh);