Mercurial > hg > octave-nkf > gnulib-hg
changeset 17355:41cddf8f3b4d
execute: Revert last change, but use a different condition.
* lib/execute.c (nonintr_close, nonintr_open): Reintroduce, but only
on Windows.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 06 Mar 2013 23:23:07 +0100 |
parents | aea18ef5eadd |
children | cd38818bce4e |
files | ChangeLog lib/execute.c |
diffstat | 2 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-03-06 Bruno Haible <bruno@clisp.org> + + 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 <eblake@redhat.com> execute: drop dead code
--- 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