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

terminal: lxc_terminal_signalfd_cb()

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

diff --git a/src/lxc/terminal.c b/src/lxc/terminal.c
index 4bc7d8575..be46f0b73 100644
--- a/src/lxc/terminal.c
+++ b/src/lxc/terminal.c
@@ -117,7 +117,7 @@ int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
 	ret = read(fd, &siginfo, sizeof(siginfo));
 	if (ret < 0 || (size_t)ret < sizeof(siginfo)) {
 		ERROR("Failed to read signal info");
-		return -1;
+		return LXC_MAINLOOP_ERROR;
 	}
 
 	if (siginfo.ssi_signo == SIGTERM) {
@@ -128,7 +128,7 @@ int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
 	if (siginfo.ssi_signo == SIGWINCH)
 		lxc_terminal_winch(ts);
 
-	return 0;
+	return LXC_MAINLOOP_CONTINUE;
 }
 
 struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd)