chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v221: Update and clean up build system to sync with upstream
[elogind.git]
/
src
/
basic
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/basic/path-util.c
similarity index 99%
rename from
src/shared/path-util.c
rename to
src/basic/path-util.c
index 8f49d652664fcf2b63aa29740da6c61f741e350f..cc985b067af03824e9283a5f4d6b37157dd94064 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/basic/path-util.c
@@
-130,6
+130,8
@@
char *path_make_absolute_cwd(const char *p) {
return strjoin(cwd, "/", p, NULL);
}
return strjoin(cwd, "/", p, NULL);
}
+/// UNNEEDED by elogind
+#if 0
int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
char *r, *p;
unsigned n_parents;
int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
char *r, *p;
unsigned n_parents;
@@
-214,6
+216,7
@@
int path_make_relative(const char *from_dir, const char *to_path, char **_r) {
*_r = r;
return 0;
}
*_r = r;
return 0;
}
+#endif // 0
char **path_strv_make_absolute_cwd(char **l) {
char **s;
char **path_strv_make_absolute_cwd(char **l) {
char **s;
@@
-759,6
+762,8
@@
int find_binary(const char *name, bool local, char **filename) {
}
}
}
}
+/// UNNEEDED by elogind
+#if 0
bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) {
bool changed = false;
const char* const* i;
bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) {
bool changed = false;
const char* const* i;
@@
-793,6
+798,7
@@
bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd
return changed;
}
return changed;
}
+#endif // 0
int fsck_exists(const char *fstype) {
_cleanup_free_ char *p = NULL, *d = NULL;
int fsck_exists(const char *fstype) {
_cleanup_free_ char *p = NULL, *d = NULL;