Skip to content

Commit

Permalink
cmd: s/read()/lxc_read_nointr()/g
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Dec 10, 2018
1 parent 41b1a84 commit d2bd14f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/lxc/lxc_monitord.c
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/lxc/tools/lxc_usernsexec.c
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down

0 comments on commit d2bd14f

Please sign in to comment.