X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=6bf0a10e163a3fb434b9b117b38e912884ddf546;hp=d9bacad0e7a7f32dd660e2d6db28b754b7545066;hb=abcdc00cea4a7b354509b3547a8ddd581a9d5dfa;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/common/utils.c b/src/common/utils.c
index d9bacad0e..6bf0a10e1 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include "common/macros.h"
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <ctype.h>
@@ -50,22 +51,24 @@
 #error MAX_NAME_LEN_SCANF_IS_A_BROKEN_API must be updated to match (PROC_MEMINFO_FIELD_MAX_NAME_LEN - 1)
 #endif
 
+#define FALLBACK_USER_BUFLEN 16384
+#define FALLBACK_GROUP_BUFLEN 16384
+
 /*
  * Return a partial realpath(3) of the path even if the full path does not
  * exist. For instance, with /tmp/test1/test2/test3, if test2/ does not exist
  * 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) {
@@ -146,13 +149,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;
 	}
 
 	/*
@@ -176,7 +177,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);
@@ -188,7 +190,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 */
@@ -290,7 +292,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;
 	}
 
@@ -367,11 +369,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);
@@ -537,6 +541,7 @@ void utils_close_pipe(int *src)
 		if (ret) {
 			PERROR("close pipe");
 		}
+		src[i] = -1;
 	}
 }
 
@@ -674,8 +679,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);
@@ -703,8 +708,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);
@@ -731,7 +736,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
 		char *out_stream_path, size_t stream_path_len)
 {
 	int ret;
-        char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
+	char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
 	const char *path_separator;
 
 	if (path_name && (path_name[0] == '\0' ||
@@ -749,7 +754,7 @@ int utils_stream_file_path(const char *path_name, const char *file_name,
 		assert(ret > 0 && ret < sizeof(count_str));
 	}
 
-        ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
+	ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
 			path_name, path_separator, file_name, count_str,
 			suffix);
 	if (ret < 0 || ret >= stream_path_len) {
@@ -1269,8 +1274,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;
 	}
@@ -1527,3 +1538,170 @@ int utils_change_working_directory(const char *path)
 end:
 	return ret;
 }
+
+LTTNG_HIDDEN
+enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
+{
+	struct passwd p, *pres;
+	int ret;
+	enum lttng_error_code ret_val = LTTNG_OK;
+	char *buf = NULL;
+	ssize_t buflen;
+
+	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (buflen < 0) {
+		buflen = FALLBACK_USER_BUFLEN;
+	}
+
+	buf = zmalloc(buflen);
+	if (!buf) {
+		ret_val = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	for (;;) {
+		ret = getpwnam_r(user_name, &p, buf, buflen, &pres);
+		switch (ret) {
+		case EINTR:
+			continue;
+		case ERANGE:
+			buflen *= 2;
+			free(buf);
+			buf = zmalloc(buflen);
+			if (!buf) {
+				ret_val = LTTNG_ERR_NOMEM;
+				goto end;
+			}
+			continue;
+		default:
+			goto end_loop;
+		}
+	}
+end_loop:
+
+	switch (ret) {
+	case 0:
+		if (pres == NULL) {
+			ret_val = LTTNG_ERR_USER_NOT_FOUND;
+		} else {
+			*uid = p.pw_uid;
+			DBG("Lookup of tracker UID/VUID: name '%s' maps to uid %" PRId64,
+					user_name, (int64_t) *uid);
+			ret_val = LTTNG_OK;
+		}
+		break;
+	case ENOENT:
+	case ESRCH:
+	case EBADF:
+	case EPERM:
+		ret_val = LTTNG_ERR_USER_NOT_FOUND;
+		break;
+	default:
+		ret_val = LTTNG_ERR_NOMEM;
+	}
+end:
+	free(buf);
+	return ret_val;
+}
+
+LTTNG_HIDDEN
+enum lttng_error_code utils_group_id_from_name(
+		const char *group_name, gid_t *gid)
+{
+	struct group g, *gres;
+	int ret;
+	enum lttng_error_code ret_val = LTTNG_OK;
+	char *buf = NULL;
+	ssize_t buflen;
+
+	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+	if (buflen < 0) {
+		buflen = FALLBACK_GROUP_BUFLEN;
+	}
+
+	buf = zmalloc(buflen);
+	if (!buf) {
+		ret_val = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	for (;;) {
+		ret = getgrnam_r(group_name, &g, buf, buflen, &gres);
+		switch (ret) {
+		case EINTR:
+			continue;
+		case ERANGE:
+			buflen *= 2;
+			free(buf);
+			buf = zmalloc(buflen);
+			if (!buf) {
+				ret_val = LTTNG_ERR_NOMEM;
+				goto end;
+			}
+			continue;
+		default:
+			goto end_loop;
+		}
+	}
+end_loop:
+
+	switch (ret) {
+	case 0:
+		if (gres == NULL) {
+			ret_val = LTTNG_ERR_GROUP_NOT_FOUND;
+		} else {
+			*gid = g.gr_gid;
+			DBG("Lookup of tracker GID/GUID: name '%s' maps to gid %" PRId64,
+					group_name, (int64_t) *gid);
+			ret_val = LTTNG_OK;
+		}
+		break;
+	case ENOENT:
+	case ESRCH:
+	case EBADF:
+	case EPERM:
+		ret_val = LTTNG_ERR_GROUP_NOT_FOUND;
+		break;
+	default:
+		ret_val = LTTNG_ERR_NOMEM;
+	}
+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;
+
+	assert(str);
+	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;
+}