Extend the rotation API to provide network trace archive locations

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index b6632fcb144c052fa0ef4a9652843a074abd64c7..364977492d05b18002092e549b95d9cc90e2572e 100644 (file)
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,8 +23,10 @@
 #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"
 
@@ -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;
        }
@@ -183,33 +177,33 @@ int config_exists(const char *path)
        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>)");
-               free(session_name);
+               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;
@@ -223,22 +217,54 @@ char *config_read_session_name(char *path)
        }
 
 error_close:
-       free(session_name);
-       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;
 }
 
 /*
@@ -277,7 +303,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;