diff options
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/libstddjb/djbunix.html | 6 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/include/skalibs/djbunix.h | 1 | ||||
| -rw-r--r-- | src/libstddjb/fd_close.c | 12 | ||||
| -rw-r--r-- | src/libstddjb/openreadnclose.c | 28 |
7 files changed, 38 insertions, 19 deletions
diff --git a/doc/index.html b/doc/index.html index f702f1c..f456a5d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -60,7 +60,7 @@ with a standard C development environment </li> <h3> Download </h3> <ul> - <li> The current released version of skalibs is <a href="skalibs-2.3.5.2.tar.gz">2.3.5.2</a>. </li> + <li> The current released version of skalibs is <a href="skalibs-2.3.6.0.tar.gz">2.3.6.0</a>. </li> <li> Alternatively, you can checkout a copy of the skalibs git repository: <pre> git clone git://git.skarnet.org/skalibs </pre> </li> </ul> diff --git a/doc/libstddjb/djbunix.html b/doc/libstddjb/djbunix.html index d8de94e..18e3def 100644 --- a/doc/libstddjb/djbunix.html +++ b/doc/libstddjb/djbunix.html @@ -588,6 +588,12 @@ number of read bytes. If that number is not <em>n</em>, errno is set to EPIPE. </p> <p> +<code> int openreadnclose_nb (char const *file, char *s, unsigned int n) </code> <br /> +Like <tt>openreadnclose</tt>, but can fail with EAGAIN if the file cannot be +immediately read (for instance if it's a named pipe or other special file). +</p> + +<p> <code> int openreadfileclose (char const *file, stralloc *sa, unsigned int n) </code> <br /> Reads at most <em>n</em> bytes from file <em>file</em> into the *<em>sa</em> stralloc, which is grown (if needed) to <em>just</em> accommodate the file diff --git a/doc/upgrade.html b/doc/upgrade.html index 9311332..bc7b6f3 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,12 @@ <h1> What has changed in skalibs </h1> +<h2> in 2.3.6.0 </h2> + +<ul> + <li> New function: <tt>openreadnclose_nb</tt>. </li> +</ul> + <h2> in 2.3.5.2 </h2> <ul> diff --git a/package/info b/package/info index 81ac9d5..4275e52 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=skalibs -version=2.3.5.2 +version=2.3.6.0 category=prog package_macro_name=SKALIBS diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h index 5e1348c..40065ce 100644 --- a/src/include/skalibs/djbunix.h +++ b/src/include/skalibs/djbunix.h @@ -110,6 +110,7 @@ extern int slurp (stralloc *, int) ; extern int openslurpclose (stralloc *, char const *) ; extern int openreadclose (char const *, stralloc *, unsigned int) ; extern int openreadnclose (char const *, char *, unsigned int) ; +extern int openreadnclose_nb (char const *, char *, unsigned int) ; extern int openreadfileclose (char const *, stralloc *, unsigned int) ; #define openwritenclose_unsafe(f, s, n) openwritenclose_unsafe_internal(f, s, (n), 0, 0, 0) 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) ; +} |