Properly cleanup after failure to set speed

After failure to set the speed, exit() was called without calling
ios->exit() which results in the lock file not being removed.

In this case restoring the terminal attributes must not be done as sots
isn't initialized yet, so swap the order of terminal restoring and ios
cleanup.

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>

1 files changed, 7 insertions, 5 deletions

diff --git a/microcom.c b/microcom.c
index 1218ec4..d4b1815 100644
--- a/microcom.c
+++ b/microcom.c
@@ -302,10 +302,11 @@ int main(int argc, char *argv[])
 			exit(1);
 	}
 
-	current_flow = FLOW_NONE;
-	if (ios->set_speed(ios, current_speed))
-		exit(EXIT_FAILURE);
+	ret = ios->set_speed(ios, current_speed);
+	if (ret)
+		goto cleanup_ios;
 
+	current_flow = FLOW_NONE;
 	ios->set_flow(ios, current_flow);
 
 	if (!listenonly) {
@@ -329,10 +330,11 @@ int main(int argc, char *argv[])
 	/* run the main program loop */
 	ret = mux_loop(ios);
 
-	ios->exit(ios);
-
 	if (!listenonly)
 		tcsetattr(STDIN_FILENO, TCSANOW, &sots);
 
+cleanup_ios:
+	ios->exit(ios);
+
 	exit(ret ? 1 : 0);
 }