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

cmd: s/write()/lxc_write_nointr()/g

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

diff --git a/src/lxc/cmd/lxc_monitord.c b/src/lxc/cmd/lxc_monitord.c
index 38eee0a9b..cf0bee7d4 100644
--- a/src/lxc/cmd/lxc_monitord.c
+++ b/src/lxc/cmd/lxc_monitord.c
@@ -312,7 +312,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
 	}
 
 	for (i = 0; i < mon->clientfds_cnt; i++) {
-		ret = write(mon->clientfds[i], &msglxc, sizeof(msglxc));
+		ret = lxc_write_nointr(mon->clientfds[i], &msglxc, sizeof(msglxc));
 		if (ret < 0)
 			SYSERROR("Failed to send message to client file descriptor %d",
 			         mon->clientfds[i]);
@@ -428,7 +428,7 @@ int main(int argc, char *argv[])
 	 * if-empty-statement construct is to quiet the
 	 * warn-unused-result warning.
 	 */
-	if (write(pipefd, "S", 1))
+	if (lxc_write_nointr(pipefd, "S", 1))
 		;
 	close(pipefd);
 
diff --git a/src/lxc/cmd/lxc_usernsexec.c b/src/lxc/cmd/lxc_usernsexec.c
index 9ffc29fbf..84dcd46e5 100644
--- a/src/lxc/cmd/lxc_usernsexec.c
+++ b/src/lxc/cmd/lxc_usernsexec.c
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 			return 1;
 		}
 		buf[0] = '1';
-		if (write(pipe_fds1[1], buf, 1) < 1) {
+		if (lxc_write_nointr(pipe_fds1[1], buf, 1) < 1) {
 			perror("write pipe");
 			exit(EXIT_FAILURE);
 		}
@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
 	if (lxc_map_ids(&active_map, pid))
 		fprintf(stderr, "error mapping child\n");
 
-	if (write(pipe_fds2[1], buf, 1) < 0) {
+	if (lxc_write_nointr(pipe_fds2[1], buf, 1) < 0) {
 		perror("write to pipe");
 		exit(EXIT_FAILURE);
 	}