X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fdirectory-handle.h;h=26da76bcc7d7a751971adee30a9cd252f2235a84;hb=4375b3d11abd6299e4eac8fafa4c7e0437ad9cfe;hp=f50cef67455edd403d647002e25ecee75f016972;hpb=d295668767ac8234e83984e1812d342d03293d88;p=lttng-tools.git

diff --git a/src/common/compat/directory-handle.h b/src/common/compat/directory-handle.h
index f50cef674..26da76bcc 100644
--- a/src/common/compat/directory-handle.h
+++ b/src/common/compat/directory-handle.h
@@ -21,6 +21,11 @@
 #include <common/macros.h>
 #include <common/credentials.h>
 
+enum lttng_directory_handle_rmdir_recursive_flags {
+	LTTNG_DIRECTORY_HANDLE_FAIL_NON_EMPTY_FLAG = (1U << 0),
+	LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG = (1U << 1),
+};
+
 /*
  * Some platforms, such as Solaris 10, do not support directory file descriptors
  * and their associated functions (*at(...)), which are defined in POSIX.2008.
@@ -153,12 +158,19 @@ int lttng_directory_handle_create_subdirectory_recursive_as_user(
 		const char *subdirectory_path,
 		mode_t mode, const struct lttng_credentials *creds);
 
+/*
+ * Open a file descriptor to a path relative to a directory handle.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_open_file(
 		const struct lttng_directory_handle *handle,
 		const char *filename,
 		int flags, mode_t mode);
 
+/*
+ * Open a file descriptor to a path relative to a directory handle
+ * as a given user.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_open_file_as_user(
 		const struct lttng_directory_handle *handle,
@@ -166,48 +178,83 @@ int lttng_directory_handle_open_file_as_user(
 		int flags, mode_t mode,
 		const struct lttng_credentials *creds);
 
+/*
+ * Unlink a file to a path relative to a directory handle.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_unlink_file(
 		const struct lttng_directory_handle *handle,
 		const char *filename);
 
+/*
+ * Unlink a file to a path relative to a directory handle as a given user.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_unlink_file_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *filename,
 		const struct lttng_credentials *creds);
 
+/*
+ * Rename a file from a path relative to a directory handle to a new
+ * name relative to another directory handle.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_rename(
-		const struct lttng_directory_handle *handle,
-		const char *old, const char *new);
+		const struct lttng_directory_handle *old_handle,
+		const char *old_name,
+		const struct lttng_directory_handle *new_handle,
+		const char *new_name);
 
+/*
+ * Rename a file from a path relative to a directory handle to a new
+ * name relative to another directory handle as a given user.
+ */
 LTTNG_HIDDEN
 int lttng_directory_handle_rename_as_user(
-		const struct lttng_directory_handle *handle,
-		const char *old, const char *new,
+		const struct lttng_directory_handle *old_handle,
+		const char *old_name,
+		const struct lttng_directory_handle *new_handle,
+		const char *new_name,
 		const struct lttng_credentials *creds);
 
+/*
+ * Remove a subdirectory relative to a directory handle.
+ */
 LTTNG_HIDDEN
-int lttng_directory_handle_rmdir(
+int lttng_directory_handle_remove_subdirectory(
 		const struct lttng_directory_handle *handle,
 		const char *name);
 
+/*
+ * Remove a subdirectory relative to a directory handle as a given user.
+ */
 LTTNG_HIDDEN
-int lttng_directory_handle_rmdir_as_user(
+int lttng_directory_handle_remove_subdirectory_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *name,
 		const struct lttng_credentials *creds);
 
+/*
+ * Remove a subdirectory and remove its contents if it only
+ * consists in empty directories.
+ * @flags: enum lttng_directory_handle_rmdir_recursive_flags
+ */
 LTTNG_HIDDEN
-int lttng_directory_handle_rmdir_recursive(
+int lttng_directory_handle_remove_subdirectory_recursive(
 		const struct lttng_directory_handle *handle,
-		const char *name);
+		const char *name, int flags);
 
+/*
+ * Remove a subdirectory and remove its contents if it only
+ * consists in empty directories as a given user.
+ * @flags: enum lttng_directory_handle_rmdir_recursive_flags
+ */
 LTTNG_HIDDEN
-int lttng_directory_handle_rmdir_recursive_as_user(
+int lttng_directory_handle_remove_subdirectory_recursive_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *name,
-		const struct lttng_credentials *creds);
+		const struct lttng_credentials *creds,
+		int flags);
 
 #endif /* _COMPAT_PATH_HANDLE_H */