X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fconf.c;h=7e6c833449857890fa7c8e8a092eaf97d439a750;hb=6f04ed72990f6c72d16fd08d39feac0967da732e;hp=b6632fcb144c052fa0ef4a9652843a074abd64c7;hpb=487b253b3ec9f187b4c1b425b246e8e74e5ac309;p=lttng-tools.git

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index b6632fcb1..7e6c83344 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"
 
@@ -122,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.
  */
@@ -150,7 +144,7 @@ void config_destroy(char *path)
 	DBG("Removing %s\n", config_path);
 	ret = remove(config_path);
 	if (ret < 0) {
-		perror("remove config file");
+		PERROR("remove config file");
 	}
 end:
 	free(config_path);
@@ -161,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;
 	}
@@ -193,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;
@@ -209,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;
@@ -277,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;