From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 28 Feb 2018 11:02:51 +0000 (+0100)
Subject: terminal: lxc_setup_tios()
X-Git-Tag: lxc-3.0.0.beta1~4^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4953e62daff9089d7412142fd6dddcd101850de;p=thirdparty%2Flxc.git

terminal: lxc_setup_tios()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index ac6e9ff1a..07f13a5c6 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -473,16 +473,18 @@ int lxc_terminal_mainloop_add(struct lxc_epoll_descr *descr,
 
 int lxc_setup_tios(int fd, struct termios *oldtios)
 {
+	int ret;
 	struct termios newtios;
 
 	if (!isatty(fd)) {
-		ERROR("'%d' is not a tty", fd);
+		ERROR("File descriptor %d does not refert to a terminal", fd);
 		return -1;
 	}
 
-	/* Get current termios */
-	if (tcgetattr(fd, oldtios)) {
-		SYSERROR("failed to get current terminal settings");
+	/* Get current termios. */
+	ret = tcgetattr(fd, oldtios);
+	if (ret < 0) {
+		SYSERROR("Failed to get current terminal settings");
 		return -1;
 	}
 
@@ -511,8 +513,9 @@ int lxc_setup_tios(int fd, struct termios *oldtios)
 	newtios.c_cc[VTIME] = 0;
 
 	/* Set new attributes. */
-	if (tcsetattr(fd, TCSAFLUSH, &newtios)) {
-		ERROR("failed to set new terminal settings");
+	ret = tcsetattr(fd, TCSAFLUSH, &newtios);
+	if (ret < 0) {
+		ERROR("Failed to set new terminal settings");
 		return -1;
 	}