Merge branch 'lukeshu/postmove' into 'lukeshu/master'

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libbasic/rm-rf.h b/src/libbasic/rm-rf.h
index 6d03268919..f693a5bb7c 100644
--- a/src/libbasic/rm-rf.h
+++ b/src/libbasic/rm-rf.h
@@ -30,3 +30,12 @@ typedef enum RemoveFlags {
 
 int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev);
 int rm_rf(const char *path, RemoveFlags flags);
+
+/* Useful for usage with _cleanup_(), destroys a directory and frees the pointer */
+static inline void rm_rf_physical_and_free(char *p) {
+        if (!p)
+                return;
+        (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL);
+        free(p);
+}
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rm_rf_physical_and_free);