Error early on invalid tracker type for UST domain

[lttng-tools.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 2e07d4ff0b6d366268755b7969dab0d58199385e..d79985a16ce601ba419b57b41374b018b062b48e 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -682,21 +682,22 @@ LTTNG_HIDDEN
 int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
        ret = lttng_directory_handle_create_subdirectory_as_user(
-                       &handle, path, mode,
+                       handle, path, mode,
                        (uid >= 0 || gid >= 0) ? &creds : NULL);
-       lttng_directory_handle_fini(&handle);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }
 
@@ -710,21 +711,22 @@ LTTNG_HIDDEN
 int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
        const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
        ret = lttng_directory_handle_create_subdirectory_recursive_as_user(
-                       &handle, path, mode,
+                       handle, path, mode,
                        (uid >= 0 || gid >= 0) ? &creds : NULL);
-       lttng_directory_handle_fini(&handle);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }
 
@@ -742,7 +744,8 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
         char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
        const char *path_separator;
 
-       if (path_name && path_name[strlen(path_name) - 1] == '/') {
+       if (path_name && (path_name[0] == '\0' ||
+                       path_name[strlen(path_name) - 1] == '/')) {
                path_separator = "";
        } else {
                path_separator = "/";
@@ -1353,15 +1356,16 @@ LTTNG_HIDDEN
 int utils_recursive_rmdir(const char *path)
 {
        int ret;
-       struct lttng_directory_handle handle;
+       struct lttng_directory_handle *handle;
 
-       ret = lttng_directory_handle_init(&handle, NULL);
-       if (ret) {
+       handle = lttng_directory_handle_create(NULL);
+       if (!handle) {
+               ret = -1;
                goto end;
        }
-       ret = lttng_directory_handle_remove_subdirectory(&handle, path);
-       lttng_directory_handle_fini(&handle);
+       ret = lttng_directory_handle_remove_subdirectory(handle, path);
 end:
+       lttng_directory_handle_put(handle);
        return ret;
 }