use lxc_read_nointr() and lxc_write_nointr()

Using EPOLLHUP to determine when to exit the loop is unreliable. Let's exit
clean when read() returns -1 && errno != EINTR or 0.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>

diff --git a/src/lxc/console.c b/src/lxc/console.c
index f8741728b5d4546e5a65a8f494a011945ab64180..a8d09cad8727b751afa8c64bd03640f34d077285 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -161,33 +161,25 @@ static int lxc_console_cb_con(int fd, uint32_t events, void *data,
 {
        struct lxc_console *console = (struct lxc_console *)data;
        char buf[1024];
-       int r,w;
-
-       if (events & EPOLLHUP)
-               return 1;
-
-       w = r = read(fd, buf, sizeof(buf));
-       if (r < 0) {
-               SYSERROR("failed to read");
-               return 1;
-       }
+       int r, w;
 
-       if (!r) {
+       w = r = lxc_read_nointr(fd, buf, sizeof(buf));
+       if (r <= 0) {
                INFO("console client on fd %d has exited", fd);
                lxc_mainloop_del_handler(descr, fd);
                close(fd);
-               return 0;
+               return 1;
        }
 
        if (fd == console->peer)
-               w = write(console->master, buf, r);
+               w = lxc_write_nointr(console->master, buf, r);
 
        if (fd == console->master) {
                if (console->log_fd >= 0)
-                       w = write(console->log_fd, buf, r);
+                       w = lxc_write_nointr(console->log_fd, buf, r);
 
                if (console->peer >= 0)
-                       w = write(console->peer, buf, r);
+                       w = lxc_write_nointr(console->peer, buf, r);
        }
 
        if (w != r)

diff --git a/src/lxc/lxc_attach.c b/src/lxc/lxc_attach.c
index f02ef2621a14482d82c3559ba58dd8c877d52c50..ed3ba0df057f3ecf6f098c2a387e3ae1239e37de 100644 (file)
--- a/src/lxc/lxc_attach.c
+++ b/src/lxc/lxc_attach.c
@@ -301,8 +301,10 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
                goto err2;
        }
 
-       if (lxc_console_mainloop_add(&descr, conf) < 0)
+       if (lxc_console_mainloop_add(&descr, conf) < 0) {
+               ERROR("Failed to add handlers to lxc mainloop.");
                goto err3;
+       }
 
        ret = lxc_mainloop(&descr, -1);
        if (ret) {