X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.h;h=178bed5f175384e595b1cd711c718666fd282310;hb=127b55d5a49e8e534e12107fc5d5a684c390d7aa;hp=1098f6540cba383c370a1c61d1672baf000d0901;hpb=2b6bf07dd23bb467099d213c97b3875c5e453491;p=elogind.git diff --git a/src/shared/path-util.h b/src/shared/path-util.h index 1098f6540..178bed5f1 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -26,10 +26,13 @@ #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_; @@ -52,7 +55,7 @@ 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); +bool paths_check_timestamp(const char* const* 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