summaryrefslogtreecommitdiff
path: root/src/libstddjb
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstddjb')
-rw-r--r--src/libstddjb/fd_close.c12
-rw-r--r--src/libstddjb/openreadnclose.c28
2 files changed, 23 insertions, 17 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 ;
}
diff --git a/src/libstddjb/openreadnclose.c b/src/libstddjb/openreadnclose.c
index b0cf5d0..40edea9 100644
--- a/src/libstddjb/openreadnclose.c
+++ b/src/libstddjb/openreadnclose.c
@@ -4,18 +4,24 @@
#include <skalibs/allreadwrite.h>
#include <skalibs/djbunix.h>
-int openreadnclose (char const *file, char *s, unsigned int n)
+static int readnclose (int fd, char *s, unsigned int n)
{
- register int r ;
- int fd = open_readb(file) ;
- if (fd == -1) return -1 ;
- r = allread(fd, s, n) ;
- if (r == -1)
- {
- fd_close(fd) ;
- return -1 ;
- }
+ register int r = allread(fd, s, n) ;
+ register int e = errno ;
fd_close(fd) ;
- if ((r > 0) && (r < (int)n)) errno = EPIPE ;
+ if ((r > 0) && (r < (int)n)) e = EPIPE ;
+ errno = e ;
return r ;
}
+
+int openreadnclose (char const *file, char *s, unsigned int n)
+{
+ register int fd = open_readb(file) ;
+ return fd < 0 ? fd : readnclose(fd, s, n) ;
+}
+
+int openreadnclose_nb (char const *file, char *s, unsigned int n)
+{
+ register int fd = open_read(file) ;
+ return fd < 0 ? fd : readnclose(fd, s, n) ;
+}