X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.h;h=d85291bb44268d454505d1e778b8b297e68a21c8;hb=1f2b7175cf84bdbef6ee6917224658ba2adf43bf;hp=178bed5f175384e595b1cd711c718666fd282310;hpb=2ad8416dd057e7e3185169609ca3006e7649f576;p=elogind.git diff --git a/src/shared/path-util.h b/src/shared/path-util.h index 178bed5f1..d85291bb4 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -41,13 +41,15 @@ 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); char* path_make_absolute_cwd(const char *p); +int path_make_relative(const char *from_dir, const char *to_path, char **_r); char* path_kill_slashes(char *path); char* path_startswith(const char *path, const char *prefix) _pure_; bool path_equal(const char *a, const char *b) _pure_; +char* path_join(const char *root, const char *path, const char *rest); char** path_strv_make_absolute_cwd(char **l); -char** path_strv_canonicalize(char **l); -char** path_strv_canonicalize_uniq(char **l); +char** path_strv_resolve(char **l, const char *prefix); +char** path_strv_resolve_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); @@ -57,6 +59,8 @@ int find_binary(const char *name, char **filename); 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 * directory. Excludes the specified directory itself */