#include <unistd.h>
#include <common/error.h>
+#include <common/utils.h>
#include "conf.h"
ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
if (ret < 0) {
ERR("Fail allocating config file path");
+ file_path = NULL;
}
return file_path;
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.
*/
*/
void config_destroy_default(void)
{
- char *path = config_get_default_path();
+ char *path = utils_get_home_dir();
if (path == NULL) {
return;
}
if (fp == NULL) {
ERR("Can't find valid lttng config %s/.lttngrc", path);
MSG("Did you create a session? (lttng create <my_session>)");
+ free(session_name);
goto error;
}
}
error_close:
+ free(session_name);
ret = fclose(fp);
if (ret < 0) {
PERROR("close config read session name");
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;
}
int ret;
char *path;
- path = config_get_default_path();
+ path = utils_get_home_dir();
if (path == NULL) {
ret = -1;
goto error;