X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=c08e349e2c8d618933845ec5699ef35858d33e2b;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=a068e410b4bf26800d38e5807a0fb06c884f70d6;hpb=d6d89e4c97ca12219003f576d145ea667c87badb;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index a068e410b..c08e349e2 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -9,7 +9,6 @@
 
 #include "common/macros.h"
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -60,16 +59,15 @@
  * but the /tmp/test1 does, the real path for /tmp/test1 is concatened with
  * /test2/test3 then returned. In normal time, realpath(3) fails if the end
  * point directory does not exist.
- * In case resolved_path is NULL, the string returned was allocated in the
- * function and thus need to be freed by the caller. The size argument allows
- * to specify the size of the resolved_path argument if given, or the size to
- * allocate.
+ *
+ * Return a newly-allocated string.
  */
-LTTNG_HIDDEN
-char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
+static
+char *utils_partial_realpath(const char *path)
 {
 	char *cut_path = NULL, *try_path = NULL, *try_path_prev = NULL;
 	const char *next, *prev, *end;
+	char *resolved_path = NULL;
 
 	/* Safety net */
 	if (path == NULL) {
@@ -150,13 +148,11 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 		cut_path = NULL;
 	}
 
-	/* Allocate memory for the resolved path if necessary */
+	/* Allocate memory for the resolved path. */
+	resolved_path = zmalloc(LTTNG_PATH_MAX);
 	if (resolved_path == NULL) {
-		resolved_path = zmalloc(size);
-		if (resolved_path == NULL) {
-			PERROR("zmalloc resolved path");
-			goto error;
-		}
+		PERROR("zmalloc resolved path");
+		goto error;
 	}
 
 	/*
@@ -180,7 +176,8 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 		}
 
 		/* Concatenate the strings */
-		snprintf(resolved_path, size, "%s%s", try_path_prev, cut_path);
+		snprintf(resolved_path, LTTNG_PATH_MAX, "%s%s",
+				try_path_prev, cut_path);
 
 		/* Free the allocated memory */
 		free(cut_path);
@@ -192,7 +189,7 @@ char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
 	 * return it as is
 	 */
 	} else {
-		strncpy(resolved_path, path, size);
+		strncpy(resolved_path, path, LTTNG_PATH_MAX);
 	}
 
 	/* Then we return the 'partially' resolved path */
@@ -294,7 +291,7 @@ int expand_double_slashes_dot_and_dotdot(char *path)
 		 * Copy the current token which is neither a '.' nor a '..'.
 		 */
 		path[expanded_path_len++] = '/';
-		memcpy(&path[expanded_path_len], curr_char, curr_token_len);
+		memmove(&path[expanded_path_len], curr_char, curr_token_len);
 		expanded_path_len += curr_token_len;
 	}
 
@@ -371,11 +368,13 @@ char *_utils_expand_path(const char *path, bool keep_symlink)
 
 	if (keep_symlink) {
 		/* Resolve partially our path */
-		absolute_path = utils_partial_realpath(absolute_path,
-				absolute_path, LTTNG_PATH_MAX);
-		if (!absolute_path) {
+		char *new_absolute_path = utils_partial_realpath(absolute_path);
+		if (!new_absolute_path) {
 			goto error;
 		}
+
+		free(absolute_path);
+		absolute_path = new_absolute_path;
 	}
 
 	ret = expand_double_slashes_dot_and_dotdot(absolute_path);
@@ -598,7 +597,7 @@ int utils_create_pid_file(pid_t pid, const char *filepath)
 	int ret;
 	FILE *fp;
 
-	assert(filepath);
+	LTTNG_ASSERT(filepath);
 
 	fp = fopen(filepath, "w");
 	if (fp == NULL) {
@@ -633,7 +632,7 @@ int utils_create_lock_file(const char *filepath)
 	int fd;
 	struct flock lock;
 
-	assert(filepath);
+	LTTNG_ASSERT(filepath);
 
 	memset(&lock, 0, sizeof(lock));
 	fd = open(filepath, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR |
@@ -679,8 +678,8 @@ int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
 	int ret;
 	struct lttng_directory_handle *handle;
 	const struct lttng_credentials creds = {
-		.uid = (uid_t) uid,
-		.gid = (gid_t) gid,
+		.uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+		.gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
 	};
 
 	handle = lttng_directory_handle_create(NULL);
@@ -708,8 +707,8 @@ int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
 	int ret;
 	struct lttng_directory_handle *handle;
 	const struct lttng_credentials creds = {
-		.uid = (uid_t) uid,
-		.gid = (gid_t) gid,
+		.uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
+		.gid = LTTNG_OPTIONAL_INIT_VALUE(gid),
 	};
 
 	handle = lttng_directory_handle_create(NULL);
@@ -751,7 +750,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
 	if (size > 0) {
 		ret = snprintf(count_str, sizeof(count_str), "_%" PRIu64,
 				count);
-		assert(ret > 0 && ret < sizeof(count_str));
+		LTTNG_ASSERT(ret > 0 && ret < sizeof(count_str));
 	}
 
 	ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
@@ -1209,8 +1208,8 @@ size_t utils_get_current_time_str(const char *format, char *dst, size_t len)
 	time_t rawtime;
 	struct tm *timeinfo;
 
-	assert(format);
-	assert(dst);
+	LTTNG_ASSERT(format);
+	LTTNG_ASSERT(dst);
 
 	/* Get date and time for session path */
 	time(&rawtime);
@@ -1274,8 +1273,14 @@ int utils_get_group_id(const char *name, bool warn, gid_t *gid)
 		}
 	}
 	if (ret) {
-		PERROR("Failed to get group file entry for group name \"%s\"",
-				name);
+		if (ret == ESRCH) {
+			DBG("Could not find group file entry for group name '%s'",
+					name);
+		} else {
+			PERROR("Failed to get group file entry for group name '%s'",
+					name);
+		}
+
 		ret = -1;
 		goto error;
 	}
@@ -1411,7 +1416,7 @@ int utils_show_help(int section, const char *page_name,
 
 	/* Section integer -> section string */
 	ret = sprintf(section_string, "%d", section);
-	assert(ret > 0 && ret < 8);
+	LTTNG_ASSERT(ret > 0 && ret < 8);
 
 	/*
 	 * Execute man pager.
@@ -1506,7 +1511,7 @@ int utils_change_working_directory(const char *path)
 {
 	int ret;
 
-	assert(path);
+	LTTNG_ASSERT(path);
 
 	DBG("Changing working directory to \"%s\"", path);
 	ret = chdir(path);
@@ -1663,3 +1668,39 @@ end:
 	free(buf);
 	return ret_val;
 }
+
+LTTNG_HIDDEN
+int utils_parse_unsigned_long_long(const char *str,
+		unsigned long long *value)
+{
+	int ret;
+	char *endptr;
+
+	LTTNG_ASSERT(str);
+	LTTNG_ASSERT(value);
+
+	errno = 0;
+	*value = strtoull(str, &endptr, 10);
+
+	/* Conversion failed. Out of range? */
+	if (errno != 0) {
+		/* Don't print an error; allow the caller to log a better error. */
+		DBG("Failed to parse string as unsigned long long number: string = '%s', errno = %d",
+				str, errno);
+		ret = -1;
+		goto end;
+	}
+
+	/* Not the end of the string or empty string. */
+	if (*endptr || endptr == str) {
+		DBG("Failed to parse string as unsigned long long number: string = '%s'",
+				str);
+		ret = -1;
+		goto end;
+	}
+
+	ret = 0;
+
+end:
+	return ret;
+}