X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffs-util.h;h=3f47537de147fb2b0689cc89f238f3596ccf7f16;hb=f082899f180431f04553e4ee3b0968020ef59188;hp=b5883b6c5cc630db8742546d222072405e17a67f;hpb=8036e4d0b9ef0990597196155fe6fc6329a6a881;p=elogind.git diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index b5883b6c5..3f47537de 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -93,6 +93,14 @@ 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); + +/* 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);