X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fguestfsd.c;h=ac8750c1e96b984843cfc6d81bd5d0420e21bda7;hb=c665d14f29dd5d66be315b3042cb562aa0c40edd;hp=36328893c9ce38f65d69923b31e795d328edd8cb;hpb=42938f6faf9e724130be28f8e67d3c291bb81cba;p=libguestfs.git diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index 3632889..ac8750c 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -679,6 +679,7 @@ commandrvf (char **stdoutput, char **stderror, int flags, } if (pid == 0) { /* Child process running the command. */ + signal (SIGALRM, SIG_DFL); signal (SIGPIPE, SIG_DFL); close (0); if (flag_copy_stdin) { @@ -768,9 +769,13 @@ commandrvf (char **stdoutput, char **stderror, int flags, quit = 0; while (quit < 2) { + again: rset2 = rset; r = select (MAX (so_fd[0], se_fd[0]) + 1, &rset2, NULL, NULL, NULL); if (r == -1) { + if (errno == EINTR) + goto again; + perror ("select"); quit: if (stdoutput) free (*stdoutput);