diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-07-20 20:12:23 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-07-20 20:12:23 +0000 |
| commit | a2898b9f8a33713c1718408237dd6517344da3b6 (patch) | |
| tree | 91ddce086ffec43d83c050168eeca779cbaa0747 /src/libstddjb/fd_close.c | |
| parent | a1811ef52374d28346eb554930bd40f885fbed22 (diff) | |
| download | skalibs-a2898b9f8a33713c1718408237dd6517344da3b6.tar.xz | |
- fd_close fix
- add openreadnclose_nb
- rc for 2.3.6.0
Diffstat (limited to 'src/libstddjb/fd_close.c')
| -rw-r--r-- | src/libstddjb/fd_close.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstddjb/fd_close.c b/src/libstddjb/fd_close.c index 8b107f6..cb52d4f 100644 --- a/src/libstddjb/fd_close.c +++ b/src/libstddjb/fd_close.c @@ -6,10 +6,10 @@ int fd_close (int fd) { - register unsigned int i = 0 ; -doit: - if (!close(fd)) return 0 ; - i++ ; - if (errno == EINTR) goto doit ; - return ((errno == EBADF) && (i > 1)) ? 0 : -1 ; + for (;;) + { + if (!close(fd) || errno == EINPROGRESS) break ; + if (errno != EINTR) return -1 ; + } + return 0 ; } |