chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time-util: when formatting usec_t as raw integers use PRIu64
[elogind.git]
/
src
/
basic
/
fs-util.h
diff --git
a/src/basic/fs-util.h
b/src/basic/fs-util.h
index e206a382ec7d94e6fce0f2fcaee18a2d93f80bc5..3f47537de147fb2b0689cc89f238f3596ccf7f16 100644
(file)
--- a/
src/basic/fs-util.h
+++ b/
src/basic/fs-util.h
@@
-93,7
+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 */
#endif // 0
enum {
CHASE_PREFIX_ROOT = 1, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */
- CHASE_NON
_EXISTING = 2,
/* If set, it's OK if the path doesn't actually exist. */
+ CHASE_NON
EXISTENT = 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_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);