*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <errno.h>
-#include <common/error.h>
+#include <common/common.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;
}
error:
- if (file_path) {
- free(file_path);
- }
+ free(file_path);
return fp;
}
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.
*/
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);
*/
void config_destroy_default(void)
{
- char *path = config_get_default_path();
+ char *path = utils_get_home_dir();
if (path == NULL) {
return;
}
return S_ISREG(info.st_mode) || S_ISDIR(info.st_mode);
}
-/*
- * Returns the session name from the config file.
- * The caller is responsible for freeing the returned string.
- * On error, NULL is returned.
- */
-char *config_read_session_name(char *path)
+static
+int _config_read_session_name(char *path, char **name)
{
- int ret;
+ int ret = 0;
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) {
+ ret = -ENOMEM;
ERR("Out of memory");
goto error;
}
fp = open_config(path, "r");
if (fp == NULL) {
- ERR("Can't find valid lttng config %s/.lttngrc", path);
- MSG("Did you create a session? (lttng create <my_session>)");
+ ret = -ENOENT;
goto error;
}
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;
}
error_close:
- ret = fclose(fp);
- if (ret < 0) {
+ if (fclose(fp) < 0) {
PERROR("close config read session name");
}
-
error:
- return NULL;
-
+ free(session_name);
+ return ret;
found:
- ret = fclose(fp);
- if (ret < 0) {
+ *name = session_name;
+ if (fclose(fp) < 0) {
PERROR("close config read session name found");
}
- return session_name;
+ return ret;
+}
+
+/*
+ * Returns the session name from the config file.
+ *
+ * The caller is responsible for freeing the returned string.
+ * On error, NULL is returned.
+ */
+char *config_read_session_name(char *path)
+{
+ int ret;
+ char *name = NULL;
+
+ ret = _config_read_session_name(path, &name);
+ if (ret == -ENOENT) {
+ const char *home_dir = utils_get_home_dir();
+
+ ERR("Can't find valid lttng config %s/.lttngrc", home_dir);
+ MSG("Did you create a session? (lttng create <my_session>)");
+ }
+
+ return name;
+}
+
+/*
+ * Returns the session name from the config file. (no warnings/errors emitted)
+ *
+ * The caller is responsible for freeing the returned string.
+ * On error, NULL is returned.
+ */
+char *config_read_session_name_quiet(char *path)
+{
+ char *name = NULL;
+ (void) _config_read_session_name(path, &name);
+ return 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;