X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.h;h=4b74fe077ed0513215714d66fe0d6f1073bbf27c;hb=0371ca0dac1d70b2e5060a3c4e6fbbc2bdbd8671;hp=0a42de7e27093f0041c24b78a6009dbfbf5e3241;hpb=e203f7c3ad6a95dfa6179e30904ce0432ea0de91;p=elogind.git diff --git a/src/shared/path-util.h b/src/shared/path-util.h index 0a42de7e2..4b74fe077 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -24,16 +24,19 @@ #include #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 -# define DEFAULT_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +# define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR #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_; char** path_split_and_make_absolute(const char *p); -char* path_get_file_name(const char *p) _pure_; int path_get_parent(const char *path, char **parent); bool path_is_absolute(const char *p) _pure_; char* path_make_absolute(const char *p, const char *prefix); @@ -52,6 +55,8 @@ int path_is_os_tree(const char *path); int find_binary(const char *name, char **filename); +bool paths_check_timestamp(char **paths, usec_t *paths_ts_usec, bool update); + /* Iterates through the path prefixes of the specified path, going up * the tree, to root. Also returns "" (and not "/"!) for the root * directory. Excludes the specified directory itself */