X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffs-util.h;h=b5883b6c5cc630db8742546d222072405e17a67f;hb=8036e4d0b9ef0990597196155fe6fc6329a6a881;hp=ab31f061e13745fc8037ebcb51a034e48a06ab6d;hpb=c60d32aa37fc0b10451b0d392d90b3b96eb88ebc;p=elogind.git diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index ab31f061e..b5883b6c5 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -42,7 +42,7 @@ int readlink_malloc(const char *p, char **r); #if 0 /// UNNEEDED by elogind int readlink_value(const char *p, char **ret); int readlink_and_make_absolute(const char *p, char **r); -int readlink_and_canonicalize(const char *p, char **r); +int readlink_and_canonicalize(const char *p, const char *root, char **r); int readlink_and_make_absolute_root(const char *root, const char *path, char **ret); #endif // 0 @@ -73,7 +73,8 @@ int mkfifo_atomic(const char *path, mode_t mode); int get_files_in_directory(const char *path, char ***list); #if 0 /// UNNEEDED by elogind -int var_tmp(char **ret); +int tmp_dir(const char **ret); +int var_tmp_dir(const char **ret); #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1) @@ -88,4 +89,10 @@ union inotify_event_buffer { }; int inotify_add_watch_fd(int fd, int what, uint32_t mask); + #endif // 0 +enum { + CHASE_PREFIX_ROOT = 1, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */ +}; + +int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);