X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=d79985a16ce601ba419b57b41374b018b062b48e;hp=3cdb6b76063caf4545761a93b52523dd2c39b14c;hb=ef440343c0d6372c1aaca74d0cdecfcd700a5785;hpb=a1e4ab8b82429320c5f962038c0f28b874f8ea6f

diff --git a/src/common/utils.c b/src/common/utils.c
index 3cdb6b760..d79985a16 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -324,7 +324,7 @@ error:
  * The returned string was allocated in the function, it is thus of
  * the responsibility of the caller to free this memory.
  */
-LTTNG_HIDDEN
+static
 char *_utils_expand_path(const char *path, bool keep_symlink)
 {
 	int ret;
@@ -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;
 }
 
@@ -1501,3 +1505,35 @@ int utils_get_memory_total(size_t *value)
 {
 	return read_proc_meminfo_field(PROC_MEMINFO_MEMTOTAL_LINE, value);
 }
+
+LTTNG_HIDDEN
+int utils_change_working_directory(const char *path)
+{
+	int ret;
+
+	assert(path);
+
+	DBG("Changing working directory to \"%s\"", path);
+	ret = chdir(path);
+	if (ret) {
+		PERROR("Failed to change working directory to \"%s\"", path);
+		goto end;
+	}
+
+	/* Check for write access */
+	if (access(path, W_OK)) {
+		if (errno == EACCES) {
+			/*
+			 * Do not treat this as an error since the permission
+			 * might change in the lifetime of the process
+			 */
+			DBG("Working directory \"%s\" is not writable", path);
+		} else {
+			PERROR("Failed to check if working directory \"%s\" is writable",
+					path);
+		}
+	}
+
+end:
+	return ret;
+}