chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
driverd: properly handle NameHasOwner() for unique names
[elogind.git]
/
src
/
shared
/
conf-files.c
diff --git
a/src/shared/conf-files.c
b/src/shared/conf-files.c
index ed4070c662711cb1e3ae7f009b336e3ad9f19b3e..92204a6a09eb92aebeea87954267dad392538c7c 100644
(file)
--- a/
src/shared/conf-files.c
+++ b/
src/shared/conf-files.c
@@
-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) {