X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Ffs-util.h;h=3f47537de147fb2b0689cc89f238f3596ccf7f16;hp=08d24fd9b0579e484a4ae13e2c51abb57532b926;hb=306d96a538d1c007e1f5a700ec7555ef76372306;hpb=f203e18b6f2c9c69e897ff62d8a4478dd3e059fe

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 08d24fd9b..3f47537de 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
 
@@ -89,6 +89,18 @@ 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 */
+        CHASE_NONEXISTENT = 2,   /* If set, it's OK if the path doesn't actually exist. */
+};
+
+int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);
 
-int chase_symlinks(const char *path, const char *_root, char **ret);
+/* Useful for usage with _cleanup_(), removes a directory and frees the pointer */
+static inline void rmdir_and_free(char *p) {
+        (void) rmdir(p);
+        free(p);
+}
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rmdir_and_free);