From 929bd53a6d2863c97bd3eb371f4693c39540bcb5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 6 Mar 2013 23:23:07 +0100 Subject: [PATCH] execute: Revert last change, but use a different condition. * lib/execute.c (nonintr_close, nonintr_open): Reintroduce, but only on Windows. --- ChangeLog | 6 ++++++ lib/execute.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/ChangeLog b/ChangeLog index a76586388..576e80eb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-03-06 Bruno Haible + + execute: Revert last change, but use a different condition. + * lib/execute.c (nonintr_close, nonintr_open): Reintroduce, but only + on Windows. + 2013-03-05 Eric Blake execute: drop dead code diff --git a/lib/execute.c b/lib/execute.c index cf547fe9a..554d3f0fb 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -54,6 +54,42 @@ #undef close +#if defined EINTR && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) + +/* EINTR handling for close(), open(). + These functions can return -1/EINTR even though we don't have any + signal handlers set up, namely when we get interrupted via SIGSTOP. */ + +static int +nonintr_close (int fd) +{ + int retval; + + do + retval = close (fd); + while (retval < 0 && errno == EINTR); + + return retval; +} +#define close nonintr_close + +static int +nonintr_open (const char *pathname, int oflag, mode_t mode) +{ + int retval; + + do + retval = open (pathname, oflag, mode); + while (retval < 0 && errno == EINTR); + + return retval; +} +#undef open /* avoid warning on VMS */ +#define open nonintr_open + +#endif + + /* Execute a command, optionally redirecting any of the three standard file descriptors to /dev/null. Return its exit code. If it didn't terminate correctly, exit if exit_on_error is true, otherwise -- 2.11.0