diff options
Diffstat (limited to 'src/libudev/conf-files.c')
| -rw-r--r-- | src/libudev/conf-files.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libudev/conf-files.c b/src/libudev/conf-files.c index 2d413999f9..dc4f970313 100644 --- a/src/libudev/conf-files.c +++ b/src/libudev/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; - union dirent_storage buf; 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; @@ -71,7 +71,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char if (!p) return -ENOMEM; - r = hashmap_put(h, path_get_file_name(p), p); + r = hashmap_put(h, basename(p), 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; - return strcmp(path_get_file_name(s1), path_get_file_name(s2)); + return strcmp(basename(s1), basename(s2)); } static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) { |