X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fdirectory-handle.c;h=9b98e04827bf2a91dd669df5bee7a929a87c8bcb;hb=ca806b0b247f89c62ac628a7779ae84049a8c2d7;hp=356376ac0ed00a516fe9cadee59ac6a68b6835c5;hpb=4fb28dfc10106c4095ca3b1155d4da9a04467fd1;p=lttng-tools.git

diff --git a/src/common/compat/directory-handle.c b/src/common/compat/directory-handle.c
index 356376ac0..9b98e0482 100644
--- a/src/common/compat/directory-handle.c
+++ b/src/common/compat/directory-handle.c
@@ -13,7 +13,6 @@
 #include <lttng/constant.h>
 #include <common/dynamic-array.h>
 
-#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -100,7 +99,6 @@ void lttng_directory_handle_release(struct urcu_ref *ref);
 		(ino_t) reserved_val;              \
 	})
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create(const char *path)
 {
 	const struct lttng_directory_handle cwd_handle = {
@@ -111,7 +109,6 @@ struct lttng_directory_handle *lttng_directory_handle_create(const char *path)
 	return lttng_directory_handle_create_from_handle(path, &cwd_handle);
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create_from_handle(
 		const char *path,
 		const struct lttng_directory_handle *ref_handle)
@@ -147,7 +144,6 @@ error_close:
 	return NULL;
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
 		int dirfd)
 {
@@ -199,7 +195,6 @@ end:
 	free(handle);
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_copy(
 		const struct lttng_directory_handle *handle)
 {
@@ -224,7 +219,6 @@ end:
 	return new_handle;
 }
 
-LTTNG_HIDDEN
 bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
 		const struct lttng_directory_handle *rhs)
 {
@@ -237,14 +231,12 @@ void lttng_directory_handle_invalidate(struct lttng_directory_handle *handle)
 	handle->dirfd = -1;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_stat(const struct lttng_directory_handle *handle,
 		const char *path, struct stat *st)
 {
 	return fstatat(handle->dirfd, path, st, 0);
 }
 
-LTTNG_HIDDEN
 bool lttng_directory_handle_uses_fd(
 		const struct lttng_directory_handle *handle)
 {
@@ -425,7 +417,6 @@ end:
 	return handle;
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create(
 		const char *path)
 {
@@ -473,7 +464,6 @@ end:
 	return new_handle;
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create_from_handle(
 		const char *path,
 		const struct lttng_directory_handle *ref_handle)
@@ -485,7 +475,7 @@ struct lttng_directory_handle *lttng_directory_handle_create_from_handle(
 	struct lttng_directory_handle *new_handle = NULL;
 	char *new_path = NULL;
 
-	assert(ref_handle && ref_handle->base_path);
+	LTTNG_ASSERT(ref_handle && ref_handle->base_path);
 
 	ret = lttng_directory_handle_stat(ref_handle, path, &stat_buf);
 	if (ret == -1) {
@@ -557,11 +547,10 @@ end:
 	return new_handle;
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
 		int dirfd)
 {
-	assert(dirfd == AT_FDCWD);
+	LTTNG_ASSERT(dirfd == AT_FDCWD);
 	return lttng_directory_handle_create(NULL);
 }
 
@@ -576,7 +565,6 @@ void lttng_directory_handle_release(struct urcu_ref *ref)
 	free(handle);
 }
 
-LTTNG_HIDDEN
 struct lttng_directory_handle *lttng_directory_handle_copy(
 		const struct lttng_directory_handle *handle)
 {
@@ -594,7 +582,6 @@ end:
 	return new_handle;
 }
 
-LTTNG_HIDDEN
 bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
 		const struct lttng_directory_handle *rhs)
 {
@@ -607,7 +594,6 @@ void lttng_directory_handle_invalidate(struct lttng_directory_handle *handle)
 	handle->base_path = NULL;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_stat(const struct lttng_directory_handle *handle,
 		const char *subdirectory, struct stat *st)
 {
@@ -625,7 +611,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 bool lttng_directory_handle_uses_fd(
 		const struct lttng_directory_handle *handle)
 {
@@ -943,7 +928,7 @@ int create_directory_recursive(const struct lttng_directory_handle *handle,
 	size_t len;
 	int ret;
 
-	assert(path);
+	LTTNG_ASSERT(path);
 
 	ret = lttng_strncpy(tmp, path, sizeof(tmp));
 	if (ret) {
@@ -990,23 +975,20 @@ error:
 	return ret;
 }
 
-LTTNG_HIDDEN
 bool lttng_directory_handle_get(struct lttng_directory_handle *handle)
 {
 	return urcu_ref_get_unless_zero(&handle->ref);
 }
 
-LTTNG_HIDDEN
 void lttng_directory_handle_put(struct lttng_directory_handle *handle)
 {
 	if (!handle) {
 		return;
 	}
-	assert(handle->ref.refcount);
+	LTTNG_ASSERT(handle->ref.refcount);
 	urcu_ref_put(&handle->ref, lttng_directory_handle_release);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *subdirectory,
@@ -1019,14 +1001,14 @@ int lttng_directory_handle_create_subdirectory_as_user(
 		ret = create_directory_check_exists(handle,
 				subdirectory, mode);
 	} else {
-		ret = _run_as_mkdir(handle, subdirectory,
-				mode, creds->uid, creds->gid);
+		ret = _run_as_mkdir(handle, subdirectory, mode,
+				lttng_credentials_get_uid(creds),
+				lttng_credentials_get_gid(creds));
 	}
 
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_recursive_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *subdirectory_path,
@@ -1040,13 +1022,12 @@ int lttng_directory_handle_create_subdirectory_recursive_as_user(
 				subdirectory_path, mode);
 	} else {
 		ret = _run_as_mkdir_recursive(handle, subdirectory_path,
-				mode, creds->uid, creds->gid);
+				mode, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory(
 		const struct lttng_directory_handle *handle,
 		const char *subdirectory,
@@ -1056,7 +1037,6 @@ int lttng_directory_handle_create_subdirectory(
 			handle, subdirectory, mode, NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_recursive(
 		const struct lttng_directory_handle *handle,
 		const char *subdirectory_path,
@@ -1066,7 +1046,6 @@ int lttng_directory_handle_create_subdirectory_recursive(
 			handle, subdirectory_path, mode, NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_open_file_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *filename,
@@ -1081,12 +1060,11 @@ int lttng_directory_handle_open_file_as_user(
 				mode);
 	} else {
 		ret = _run_as_open(handle, filename, flags, mode,
-				creds->uid, creds->gid);
+				lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_open_file(
 		const struct lttng_directory_handle *handle,
 		const char *filename,
@@ -1096,7 +1074,6 @@ int lttng_directory_handle_open_file(
 			mode, NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_unlink_file_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *filename,
@@ -1108,12 +1085,11 @@ int lttng_directory_handle_unlink_file_as_user(
 		/* Run as current user. */
 		ret = lttng_directory_handle_unlink(handle, filename);
 	} else {
-		ret = _run_as_unlink(handle, filename, creds->uid, creds->gid);
+		ret = _run_as_unlink(handle, filename, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_unlink_file(
 		const struct lttng_directory_handle *handle,
 		const char *filename)
@@ -1122,7 +1098,6 @@ int lttng_directory_handle_unlink_file(
 			filename, NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_rename(
 		const struct lttng_directory_handle *old_handle,
 		const char *old_name,
@@ -1133,7 +1108,6 @@ int lttng_directory_handle_rename(
 			new_handle, new_name, NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_rename_as_user(
 		const struct lttng_directory_handle *old_handle,
 		const char *old_name,
@@ -1149,12 +1123,11 @@ int lttng_directory_handle_rename_as_user(
 				old_name, new_handle, new_name);
 	} else {
 		ret = _run_as_rename(old_handle, old_name, new_handle,
-				new_name, creds->uid, creds->gid);
+				new_name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_remove_subdirectory(
 		const struct lttng_directory_handle *handle,
 		const char *name)
@@ -1163,7 +1136,6 @@ int lttng_directory_handle_remove_subdirectory(
 			NULL);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_remove_subdirectory_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *name,
@@ -1175,7 +1147,7 @@ int lttng_directory_handle_remove_subdirectory_as_user(
 		/* Run as current user. */
 		ret = lttng_directory_handle_rmdir(handle, name);
 	} else {
-		ret = _run_as_rmdir(handle, name, creds->uid, creds->gid);
+		ret = _run_as_rmdir(handle, name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
@@ -1261,10 +1233,10 @@ int remove_directory_recursive(const struct lttng_directory_handle *handle,
 				lttng_dynamic_array_get_element(
 						&frames, current_frame_idx);
 
-		assert(current_frame->dir);
+		LTTNG_ASSERT(current_frame->dir);
 		ret = lttng_dynamic_buffer_set_size(
 				&current_path, current_frame->path_size);
-		assert(!ret);
+		LTTNG_ASSERT(!ret);
 		current_path.data[current_path.size - 1] = '\0';
 
 		while ((entry = readdir(current_frame->dir))) {
@@ -1278,7 +1250,7 @@ int remove_directory_recursive(const struct lttng_directory_handle *handle,
 			/* Set current_path to the entry's path. */
 			ret = lttng_dynamic_buffer_set_size(
 					&current_path, current_path.size - 1);
-			assert(!ret);
+			LTTNG_ASSERT(!ret);
 			ret = lttng_dynamic_buffer_append(&current_path,
 					&separator, sizeof(separator));
 			if (ret) {
@@ -1369,7 +1341,7 @@ int remove_directory_recursive(const struct lttng_directory_handle *handle,
 
 			parent_frame = lttng_dynamic_array_get_element(&frames,
 					current_frame->parent_frame_idx);
-			assert(parent_frame);
+			LTTNG_ASSERT(parent_frame);
 			parent_frame->empty = false;
 		}
 		ret = lttng_dynamic_array_remove_element(
@@ -1386,7 +1358,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_remove_subdirectory_recursive(
 		const struct lttng_directory_handle *handle,
 		const char *name,
@@ -1396,7 +1367,6 @@ int lttng_directory_handle_remove_subdirectory_recursive(
 			handle, name, NULL, flags);
 }
 
-LTTNG_HIDDEN
 int lttng_directory_handle_remove_subdirectory_recursive_as_user(
 		const struct lttng_directory_handle *handle,
 		const char *name,
@@ -1409,8 +1379,8 @@ int lttng_directory_handle_remove_subdirectory_recursive_as_user(
 		/* Run as current user. */
 		ret = remove_directory_recursive(handle, name, flags);
 	} else {
-		ret = _run_as_rmdir_recursive(handle, name, creds->uid,
-				creds->gid, flags);
+		ret = _run_as_rmdir_recursive(handle, name, lttng_credentials_get_uid(creds),
+				lttng_credentials_get_gid(creds), flags);
 	}
 	return ret;
 }