X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=3a40ec5208edad530ae923c2d72b791c9f0ee276;hp=7439c1cdcf4d0fac711f7a5f4acfbd018a83a773;hb=9908810a4cfc351cc94e09ffef5898dfc33a9600;hpb=dcee6f19f636b7443cc70dd27911630c4da476fa

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 7439c1cdc..3a40ec520 100644
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,7 +25,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <common/error.h>
+#include <common/common.h>
+#include <common/utils.h>
 
 #include "conf.h"
 
@@ -40,6 +42,7 @@ char *config_get_file_path(char *path)
 	ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
 	if (ret < 0) {
 		ERR("Fail allocating config file path");
+		file_path = NULL;
 	}
 
 	return file_path;
@@ -121,14 +124,6 @@ end:
 	return ret;
 }
 
-/*
- * Returns the HOME directory path. Caller MUST NOT free(3) the return pointer.
- */
-char *config_get_default_path(void)
-{
-	return getenv("HOME");
-}
-
 /*
  * Destroys directory config and file config.
  */
@@ -160,7 +155,7 @@ end:
  */
 void config_destroy_default(void)
 {
-	char *path = config_get_default_path();
+	char *path = utils_get_home_dir();
 	if (path == NULL) {
 		return;
 	}
@@ -192,8 +187,11 @@ char *config_read_session_name(char *path)
 	int ret;
 	FILE *fp;
 	char var[NAME_MAX], *session_name;
+#if (NAME_MAX == 255)
+#define NAME_MAX_SCANF_IS_A_BROKEN_API	"254"
+#endif
 
-	session_name = malloc(NAME_MAX);
+	session_name = zmalloc(NAME_MAX);
 	if (session_name == NULL) {
 		ERR("Out of memory");
 		goto error;
@@ -208,7 +206,9 @@ char *config_read_session_name(char *path)
 	}
 
 	while (!feof(fp)) {
-		if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
+		if ((ret = fscanf(fp, "%" NAME_MAX_SCANF_IS_A_BROKEN_API
+				"[^'=']=%" NAME_MAX_SCANF_IS_A_BROKEN_API "s\n",
+				var, session_name)) != 2) {
 			if (ret == -1) {
 				ERR("Missing session=NAME in config file.");
 				goto error_close;
@@ -248,14 +248,16 @@ found:
 int config_add_session_name(char *path, char *name)
 {
 	int ret;
-	char session_name[NAME_MAX];
+	char *attr = "session=";
+	/* Max name len accepted plus attribute's len and the NULL byte. */
+	char session_name[NAME_MAX + strlen(attr) + 1];
 
 	/*
 	 * With GNU C <  2.1, snprintf returns -1 if the target buffer is too small;
 	 * With GNU C >= 2.1, snprintf returns the required size (excluding closing null)
 	 */
-	ret = snprintf(session_name, NAME_MAX, "session=%s\n", name);
-	if ((ret < 0) || (ret >= NAME_MAX)) {
+	ret = snprintf(session_name, sizeof(session_name), "%s%s\n", attr, name);
+	if (ret < 0) {
 		ret = -1;
 		goto error;
 	}
@@ -274,7 +276,7 @@ int config_init(char *session_name)
 	int ret;
 	char *path;
 
-	path = config_get_default_path();
+	path = utils_get_home_dir();
 	if (path == NULL) {
 		ret = -1;
 		goto error;