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

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

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 4c4d3fb4b..1b9c0fb6d 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2352,7 +2352,7 @@ static char **do_lxcapi_get_interfaces(struct lxc_container *c)
 	/* close the write-end of the pipe */
 	close(pipefd[1]);
 
-	while (read(pipefd[0], &interface, IFNAMSIZ) == IFNAMSIZ) {
+	while (lxc_read_nointr(pipefd[0], &interface, IFNAMSIZ) == IFNAMSIZ) {
 		interface[IFNAMSIZ - 1] = '\0';
 
 		if (array_contains(&interfaces, interface, count))
@@ -3342,7 +3342,7 @@ static int copy_file(const char *old, const char *new)
 	}
 
 	while (1) {
-		len = read(in, buf, 8096);
+		len = lxc_read_nointr(in, buf, 8096);
 		if (len < 0) {
 			SYSERROR("Error reading old file %s", old);
 			goto err;