From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 22 Jul 2019 21:55:38 +0000 (-0400)
Subject: Fix: ensure a newline is printed before exit on client destroy
X-Git-Tag: v2.11.0-rc3~96
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=26603837153339dee6b900379e4d2c8f5e61ec93;hp=0fb564b16b2c8185f499426ce2836f218549232a;p=lttng-tools.git

Fix: ensure a newline is printed before exit on client destroy

Errors encountered during the destruction of a session can cause
the `lttng` client to exit after having printed the
'Waiting for destruction of session ...' message without printing
a newline. This causes the user's prompt to reappear after the
message and not on a new line.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/commands/destroy.c b/src/bin/lttng/commands/destroy.c
index 7cea7bf23..e52735f43 100644
--- a/src/bin/lttng/commands/destroy.c
+++ b/src/bin/lttng/commands/destroy.c
@@ -192,6 +192,7 @@ static int destroy_session(struct lttng_session *session)
 skip_wait_rotation:
 	MSG("%sSession \"%s\" destroyed", printed_wait_msg ? "\n" : "",
 			session->name);
+	printed_wait_msg = false;
 
 	session_name = get_session_name_quiet();
 	if (session_name && !strncmp(session->name, session_name, NAME_MAX)) {
@@ -208,6 +209,9 @@ skip_wait_rotation:
 
 	ret = CMD_SUCCESS;
 error:
+	if (printed_wait_msg) {
+		MSG("");
+	}
 	lttng_destruction_handle_destroy(handle);
 	free(session_name);
 	return ret;