chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: fix built with --disable-logind
[elogind.git]
/
src
/
shared
/
conf-files.c
diff --git
a/src/shared/conf-files.c
b/src/shared/conf-files.c
index 019fadcf5ee5bb22f2c50ff8a63727362d67c603..487c9a5e6861f966f769185fa49adad1961de207 100644
(file)
--- a/
src/shared/conf-files.c
+++ b/
src/shared/conf-files.c
@@
-33,6
+33,7
@@
#include "missing.h"
#include "log.h"
#include "strv.h"
#include "missing.h"
#include "log.h"
#include "strv.h"
+#include "path-util.h"
#include "hashmap.h"
#include "conf-files.h"
#include "hashmap.h"
#include "conf-files.h"
@@
-69,7
+70,7
@@
static int files_add(Hashmap *h, const char *path, const char *suffix) {
goto finish;
}
goto finish;
}
- if (hashmap_put(h,
file_name_from_path
(p), p) <= 0) {
+ if (hashmap_put(h,
path_get_file_name
(p), p) <= 0) {
log_debug("Skip overridden file: %s.", p);
free(p);
}
log_debug("Skip overridden file: %s.", p);
free(p);
}
@@
-85,7
+86,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(
file_name_from_path(s1), file_name_from_path
(s2));
+ return strcmp(
path_get_file_name(s1), path_get_file_name
(s2));
}
int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) {
}
int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs) {
@@
-137,7
+138,7
@@
int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) {
goto finish;
}
goto finish;
}
- if (!
strv_path
_canonicalize(dirs)) {
+ if (!
path_strv
_canonicalize(dirs)) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}