#include <lttng/constant.h>
#include <common/dynamic-array.h>
-#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
static
void lttng_directory_handle_release(struct urcu_ref *ref);
-#ifdef COMPAT_DIRFD
+#ifdef HAVE_DIRFD
/*
* Special inode number reserved to represent the "current working directory".
(ino_t) reserved_val; \
})
-LTTNG_HIDDEN
struct lttng_directory_handle *lttng_directory_handle_create(const char *path)
{
const struct lttng_directory_handle cwd_handle = {
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)
return NULL;
}
-LTTNG_HIDDEN
struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
int dirfd)
{
if (ret) {
PERROR("Failed to fstat directory file descriptor %i", dirfd);
lttng_directory_handle_release(&handle->ref);
+ handle = NULL;
+ goto end;
}
} else {
handle->directory_inode = RESERVED_AT_FDCWD_INO;
free(handle);
}
-LTTNG_HIDDEN
struct lttng_directory_handle *lttng_directory_handle_copy(
const struct lttng_directory_handle *handle)
{
return new_handle;
}
-LTTNG_HIDDEN
bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
const struct lttng_directory_handle *rhs)
{
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)
{
int lttng_directory_handle_rmdir(
const struct lttng_directory_handle *handle, const char *name)
{
- return unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+ int ret = unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+ if (ret) {
+ PERROR("Failed to remove directory `%s`", name);
+ }
+
+ return ret;
}
static
return run_as_rmdirat_recursive(handle->dirfd, name, uid, gid, flags);
}
-#else /* COMPAT_DIRFD */
+#else /* HAVE_DIRFD */
static
int get_full_path(const struct lttng_directory_handle *handle,
return handle;
}
-LTTNG_HIDDEN
struct lttng_directory_handle *lttng_directory_handle_create(
const char *path)
{
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)
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) {
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);
}
free(handle);
}
-LTTNG_HIDDEN
struct lttng_directory_handle *lttng_directory_handle_copy(
const struct lttng_directory_handle *handle)
{
return new_handle;
}
-LTTNG_HIDDEN
bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
const struct lttng_directory_handle *rhs)
{
- return strcmp(lhs->path, rhs->path) == 0;
+ return strcmp(lhs->base_path, rhs->base_path) == 0;
}
static
handle->base_path = NULL;
}
-LTTNG_HIDDEN
int lttng_directory_handle_stat(const struct lttng_directory_handle *handle,
const char *subdirectory, struct stat *st)
{
return ret;
}
-LTTNG_HIDDEN
bool lttng_directory_handle_uses_fd(
const struct lttng_directory_handle *handle)
{
return ret;
}
-#endif /* COMPAT_DIRFD */
+#endif /* HAVE_DIRFD */
/* Common implementation. */
size_t len;
int ret;
- assert(path);
+ LTTNG_ASSERT(path);
ret = lttng_strncpy(tmp, path, sizeof(tmp));
if (ret) {
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,
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,
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,
handle, subdirectory, mode, NULL);
}
-LTTNG_HIDDEN
int lttng_directory_handle_create_subdirectory_recursive(
const struct lttng_directory_handle *handle,
const char *subdirectory_path,
handle, subdirectory_path, mode, NULL);
}
-LTTNG_HIDDEN
int lttng_directory_handle_open_file_as_user(
const struct lttng_directory_handle *handle,
const char *filename,
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,
mode, NULL);
}
-LTTNG_HIDDEN
int lttng_directory_handle_unlink_file_as_user(
const struct lttng_directory_handle *handle,
const char *filename,
/* 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)
filename, NULL);
}
-LTTNG_HIDDEN
int lttng_directory_handle_rename(
const struct lttng_directory_handle *old_handle,
const char *old_name,
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,
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)
NULL);
}
-LTTNG_HIDDEN
int lttng_directory_handle_remove_subdirectory_as_user(
const struct lttng_directory_handle *handle,
const char *name,
/* 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;
}
lttng_dynamic_array_get_element(
&frames, current_frame_idx);
- assert(current_frame->dir);
+ LTTNG_ASSERT(current_frame->dir);
ret = lttng_dynamic_buffer_set_size(
¤t_path, current_frame->path_size);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
current_path.data[current_path.size - 1] = '\0';
while ((entry = readdir(current_frame->dir))) {
/* Set current_path to the entry's path. */
ret = lttng_dynamic_buffer_set_size(
¤t_path, current_path.size - 1);
- assert(!ret);
+ LTTNG_ASSERT(!ret);
ret = lttng_dynamic_buffer_append(¤t_path,
&separator, sizeof(separator));
if (ret) {
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(
return ret;
}
-LTTNG_HIDDEN
int lttng_directory_handle_remove_subdirectory_recursive(
const struct lttng_directory_handle *handle,
const char *name,
handle, name, NULL, flags);
}
-LTTNG_HIDDEN
int lttng_directory_handle_remove_subdirectory_recursive_as_user(
const struct lttng_directory_handle *handle,
const char *name,
/* 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;
}
projects / lttng-tools.git / blobdiff