From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 29 Jul 2018 21:45:51 +0000 (+0200)
Subject: cmd: s/read()/lxc_read_nointr()/g
X-Git-Tag: lxc-2.0.10~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2bd14f02146ebe1081f2b6b711285fe69ee80fe;p=thirdparty%2Flxc.git

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

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

diff --git a/src/lxc/lxc_monitord.c b/src/lxc/lxc_monitord.c
index ed5542cbd..d7e1cd22a 100644
--- a/src/lxc/lxc_monitord.c
+++ b/src/lxc/lxc_monitord.c
@@ -158,7 +158,7 @@ static int lxc_monitord_sock_handler(int fd, uint32_t events, void *data,
 		int rc;
 		char buf[4];
 
-		rc = read(fd, buf, sizeof(buf));
+		rc = lxc_read_nointr(fd, buf, sizeof(buf));
 		if (rc > 0 && !strncmp(buf, "quit", 4))
 			quit = 1;
 	}
@@ -297,7 +297,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
 	struct lxc_msg msglxc;
 	struct lxc_monitor *mon = data;
 
-	ret = read(fd, &msglxc, sizeof(msglxc));
+	ret = lxc_read_nointr(fd, &msglxc, sizeof(msglxc));
 	if (ret != sizeof(msglxc)) {
 		SYSERROR("Reading from fifo failed: %s.", strerror(errno));
 		return 1;
diff --git a/src/lxc/tools/lxc_usernsexec.c b/src/lxc/tools/lxc_usernsexec.c
index 93340cfcb..3a29a976a 100644
--- a/src/lxc/tools/lxc_usernsexec.c
+++ b/src/lxc/tools/lxc_usernsexec.c
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
 			perror("write pipe");
 			exit(EXIT_FAILURE);
 		}
-		if (read(pipe_fds2[0], buf, 1) < 1) {
+		if (lxc_read_nointr(pipe_fds2[0], buf, 1) < 1) {
 			perror("read pipe");
 			exit(EXIT_FAILURE);
 		}
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
 
 	close(pipe_fds1[1]);
 	close(pipe_fds2[0]);
-	if (read(pipe_fds1[0], buf, 1) < 1) {
+	if (lxc_read_nointr(pipe_fds1[0], buf, 1) < 1) {
 		perror("read pipe");
 		exit(EXIT_FAILURE);
 	}