From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 29 Jul 2018 21:46:54 +0000 (+0200)
Subject: criu: s/read()/lxc_read_nointr()/g
X-Git-Tag: lxc-3.1.0~185^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=668ba602ab594b57228ac6c91dd1681a13b88587;p=thirdparty%2Flxc.git

criu: s/read()/lxc_read_nointr()/g

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

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index ac4805aa6..ae6702c9f 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -1084,7 +1084,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
 			if (WEXITSTATUS(status)) {
 				int n;
 
-				n = read(pipes[0], buf, sizeof(buf));
+				n = lxc_read_nointr(pipes[0], buf, sizeof(buf));
 				if (n < 0) {
 					SYSERROR("failed reading from criu stderr");
 					goto out_fini_handler;
@@ -1312,7 +1312,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op
 			return false;
 		}
 
-		n = read(criuout[0], buf, sizeof(buf));
+		n = lxc_read_nointr(criuout[0], buf, sizeof(buf));
 		close(criuout[0]);
 		if (n < 0) {
 			SYSERROR("read");
@@ -1415,7 +1415,7 @@ bool __criu_restore(struct lxc_container *c, struct migrate_opts *opts)
 	close(pipefd[1]);
 	free(criu_version);
 
-	nread = read(pipefd[0], &status, sizeof(status));
+	nread = lxc_read_nointr(pipefd[0], &status, sizeof(status));
 	close(pipefd[0]);
 	if (sizeof(status) != nread) {
 		ERROR("reading status from pipe failed");