Improve error handling of lttng cli

[lttng-tools.git] / src / bin / lttng / commands / create.c

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 9dc3752244616c122683416f4d9ee7af5945d33b..f60fe619e223e0db9c5686f0a62a5c73362bd02d 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -67,7 +67,7 @@ static void usage(FILE *ofp)
  */
 static int create_session()
 {
-       int ret, have_name = 0;
+       int ret;
        char datetime[16];
        char *session_name, *traces_path = NULL, *alloc_path = NULL;
        time_t rawtime;
@@ -80,37 +80,32 @@ static int create_session()
 
        /* Auto session name creation */
        if (opt_session_name == NULL) {
-               ret = asprintf(&session_name, "auto-%s", datetime);
+               ret = asprintf(&session_name, "auto");
                if (ret < 0) {
                        perror("asprintf session name");
+                       ret = CMD_ERROR;
                        goto error;
                }
                DBG("Auto session name set to %s", session_name);
        } else {
                session_name = opt_session_name;
-               have_name = 1;
        }
 
        /* Auto output path */
        if (opt_output_path == NULL) {
                alloc_path = strdup(config_get_default_path());
                if (alloc_path == NULL) {
-                       ERR("Home path not found.\n \
-                                Please specify an output path using -o, --output PATH");
+                       ERR("Home path not found.\n"
+                               "Please specify an output path using -o, --output PATH\n");
                        ret = CMD_FATAL;
                        goto error;
                }
 
-               if (have_name) {
-                       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
-                                       "/%s-%s", alloc_path, session_name, datetime);
-               } else {
-                       ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
-                                       "/%s", alloc_path, session_name);
-               }
-
+               ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s",
+                               alloc_path, session_name, datetime);
                if (ret < 0) {
                        perror("asprintf trace dir name");
+                       ret = CMD_ERROR;
                        goto error;
                }
        } else {
@@ -119,15 +114,14 @@ static int create_session()
 
        ret = lttng_create_session(session_name, traces_path);
        if (ret < 0) {
+               /* Don't set ret so lttng can interpret the sessiond error. */
                goto error;
        }
 
        /* Init lttng session config */
        ret = config_init(session_name);
        if (ret < 0) {
-               if (ret == -1) {
-                       ret = CMD_ERROR;
-               }
+               ret = CMD_ERROR;
                goto error;
        }
 
@@ -137,6 +131,10 @@ static int create_session()
        ret = CMD_SUCCESS;
 
 error:
+       if (opt_session_name == NULL) {
+               free(session_name);
+       }
+
        if (alloc_path) {
                free(alloc_path);
        }
@@ -163,11 +161,10 @@ int cmd_create(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stderr);
+                       usage(stdout);
                        goto end;
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);
-                       ret = CMD_SUCCESS;
                        goto end;
                default:
                        usage(stderr);
@@ -181,5 +178,6 @@ int cmd_create(int argc, const char **argv)
        ret = create_session();
 
 end:
+       poptFreeContext(pc);
        return ret;
 }