X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffs-util.h;h=60f465a4d919bf2a301bdd66c916c6994b732a29;hb=c0e8baacdbcf4cee407eb0c50c6fbb7e4e089158;hp=d58b14801ba23c5f8520d2287536724167f0ea90;hpb=5de3db0016e2a97b779abe27be5e7326ec1b78aa;p=elogind.git

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index d58b14801..60f465a4d 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -91,5 +91,22 @@ union inotify_event_buffer {
 int inotify_add_watch_fd(int fd, int what, uint32_t mask);
 
 #endif // 0
-int chase_symlinks(const char *path_with_prefix, const char *root, char **ret);
-int chase_symlinks_prefix(const char *path_without_prefix, const char *root, char **ret);
+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);
+
+/* 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);
+
+static inline void unlink_and_free(char *p) {
+        (void) unlink(p);
+        free(p);
+}
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, unlink_and_free);