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: move async.[ch] to src/shared
[elogind.git]
/
src
/
shared
/
path-util.h
diff --git
a/src/shared/path-util.h
b/src/shared/path-util.h
index 1098f6540cba383c370a1c61d1672baf000d0901..fdf1f6b000501fcd4850d9e42e25420d0c5a3ff1 100644
(file)
--- a/
src/shared/path-util.h
+++ b/
src/shared/path-util.h
@@
-26,10
+26,13
@@
#include "macro.h"
#include "time-util.h"
#include "macro.h"
#include "time-util.h"
+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin"
+
#ifdef HAVE_SPLIT_USR
#ifdef HAVE_SPLIT_USR
-# define DEFAULT_PATH
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+# define DEFAULT_PATH
DEFAULT_PATH_SPLIT_USR
#else
#else
-# define DEFAULT_PATH
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin"
+# define DEFAULT_PATH
DEFAULT_PATH_NORMAL
#endif
bool is_path(const char *p) _pure_;
#endif
bool is_path(const char *p) _pure_;
@@
-43,8
+46,8
@@
char* path_startswith(const char *path, const char *prefix) _pure_;
bool path_equal(const char *a, const char *b) _pure_;
char** path_strv_make_absolute_cwd(char **l);
bool path_equal(const char *a, const char *b) _pure_;
char** path_strv_make_absolute_cwd(char **l);
-char** path_strv_canonicalize
(char **l
);
-char** path_strv_canonicalize_
uniq(char **l
);
+char** path_strv_canonicalize
_absolute(char **l, const char *prefix
);
+char** path_strv_canonicalize_
absolute_uniq(char **l, const char *prefix
);
int path_is_mount_point(const char *path, bool allow_symlink);
int path_is_read_only_fs(const char *path);
int path_is_mount_point(const char *path, bool allow_symlink);
int path_is_read_only_fs(const char *path);
@@
-52,7
+55,9
@@
int path_is_os_tree(const char *path);
int find_binary(const char *name, char **filename);
int find_binary(const char *name, char **filename);
-bool paths_check_timestamp(char **paths, usec_t *paths_ts_usec, bool update);
+bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update);
+
+int fsck_exists(const char *fstype);
/* Iterates through the path prefixes of the specified path, going up
* the tree, to root. Also returns "" (and not "/"!) for the root
/* Iterates through the path prefixes of the specified path, going up
* the tree, to root. Also returns "" (and not "/"!) for the root