Permalink
Browse files

redis-cli pipe mode: handle EINTR properly as well so that SIGSTOP/SI…

…GCONT are handled correctly.
  • Loading branch information...
1 parent f6bd912 commit ea66be60802fea82d88d48e0af87d1e6c20bfee5 @antirez committed May 11, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/redis-cli.c
View
@@ -1009,7 +1009,7 @@ static void pipeMode(void) {
/* Read from socket and feed the hiredis reader. */
do {
nread = read(fd,ibuf,sizeof(ibuf));
- if (nread == -1 && errno != EAGAIN) {
+ if (nread == -1 && errno != EAGAIN && errno != EINTR) {
fprintf(stderr, "Error reading from the server: %s\n",
strerror(errno));
exit(1);
@@ -1052,7 +1052,7 @@ static void pipeMode(void) {
ssize_t nwritten = write(fd,obuf+obuf_pos,obuf_len);
if (nwritten == -1) {
- if (errno != EAGAIN) {
+ if (errno != EAGAIN && errno != EINTR) {
fprintf(stderr, "Error writing to the server: %s\n",
strerror(errno));
exit(1);

0 comments on commit ea66be6

Please sign in to comment.