From 0a181fc1b38a62e583f13ccc1550f7ffc8f5896b Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Sat, 21 Jul 2018 07:28:05 +0000
Subject: Add unlink_void, change dir_close, prepare for 2.7.0.0
---
NEWS | 5 +++--
doc/index.html | 2 +-
doc/upgrade.html | 6 ++++--
package/deps.mak | 1 +
package/info | 2 +-
src/include/skalibs/direntry.h | 2 +-
src/include/skalibs/posixplz.h | 1 +
src/libposixplz/unlink_void.c | 12 ++++++++++++
src/libstddjb/dir_close.c | 15 ++++++++-------
src/libunixonacid/skaclient_end.c | 3 +++
src/libunixonacid/textclient_end.c | 3 +++
11 files changed, 38 insertions(+), 14 deletions(-)
create mode 100644 src/libposixplz/unlink_void.c
diff --git a/NEWS b/NEWS
index 910bf14..4cdcec5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
Changelog for skalibs.
-In 2.6.5.0
+In 2.7.0.0
----------
- Bugfixes.
- - New function: ipc_timed_sendv()
+ - New functions: ipc_timed_sendv(), unlink_void()
+ - dir_close() now returns void and leaves errno unchanged
In 2.6.4.0
diff --git a/doc/index.html b/doc/index.html
index 61529bc..491b54c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ with a standard C development environment
Download
- - The current released version of skalibs is 2.6.5.0.
+ - The current released version of skalibs is 2.7.0.0.
- Alternatively, you can checkout a copy of the
skalibs
git repository:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 8697c14..ee20c3b 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -16,10 +16,12 @@
skarnet.org
- in 2.6.5.0
+ in 2.7.0.0
- - New function: ipc_timed_sendv()
+ - New functions: ipc_timed_sendv(), unlink_void()
+ - The dir_close() function now returns void
+and leaves errno unchanged.
in 2.6.4.0
diff --git a/package/deps.mak b/package/deps.mak
index 3bacf3c..1564d7a 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -148,6 +148,7 @@ src/libposixplz/memmem.o src/libposixplz/memmem.lo: src/libposixplz/memmem.c src
src/libposixplz/setgroups.o src/libposixplz/setgroups.lo: src/libposixplz/setgroups.c src/include/skalibs/nonposix.h src/include/skalibs/setgroups.h src/include/skalibs/sysdeps.h
src/libposixplz/strnlen.o src/libposixplz/strnlen.lo: src/libposixplz/strnlen.c src/include/skalibs/bytestr.h src/include/skalibs/posixplz.h src/include/skalibs/sysdeps.h
src/libposixplz/touch.o src/libposixplz/touch.lo: src/libposixplz/touch.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/posixplz.h src/include/skalibs/sysdeps.h
+src/libposixplz/unlink_void.o src/libposixplz/unlink_void.lo: src/libposixplz/unlink_void.c src/include/skalibs/posixplz.h
src/librandom/random_char.o src/librandom/random_char.lo: src/librandom/random_char.c src/include/skalibs/random.h
src/librandom/random_finish.o src/librandom/random_finish.lo: src/librandom/random_finish.c src/include/skalibs/djbunix.h src/librandom/random-internal.h src/include/skalibs/random.h src/include/skalibs/sysdeps.h
src/librandom/random_init.o src/librandom/random_init.lo: src/librandom/random_init.c src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/librandom/random-internal.h src/include/skalibs/random.h src/include/skalibs/surf.h src/include/skalibs/sysdeps.h
diff --git a/package/info b/package/info
index d234e61..e818718 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=skalibs
-version=2.6.5.0
+version=2.7.0.0
category=prog
package_macro_name=SKALIBS
diff --git a/src/include/skalibs/direntry.h b/src/include/skalibs/direntry.h
index 70bd190..9f4615c 100644
--- a/src/include/skalibs/direntry.h
+++ b/src/include/skalibs/direntry.h
@@ -7,7 +7,7 @@
typedef struct dirent direntry, direntry_t, *direntry_ref, *direntry_t_ref ;
-extern int dir_close (DIR *) ;
+extern void dir_close (DIR *) ;
extern int dir_fd (DIR *) ; /* Solaris doesn't have dirfd() */
#endif
diff --git a/src/include/skalibs/posixplz.h b/src/include/skalibs/posixplz.h
index 1e7692d..97c1ef1 100644
--- a/src/include/skalibs/posixplz.h
+++ b/src/include/skalibs/posixplz.h
@@ -40,6 +40,7 @@ extern int getpeereid (int, uid_t *, gid_t *) ;
extern void execvep (char const *, char const *const *, char const *const *, char const *) ;
extern void execvep_loose (char const *, char const *const *, char const *const *, char const *) ;
+extern void unlink_void (char const *) ;
extern pid_t doublefork (void) ;
extern int touch (char const *) ;
diff --git a/src/libposixplz/unlink_void.c b/src/libposixplz/unlink_void.c
new file mode 100644
index 0000000..472bd6a
--- /dev/null
+++ b/src/libposixplz/unlink_void.c
@@ -0,0 +1,12 @@
+/* ISC license. */
+
+#include
+#include
+#include
+
+void unlink_void (char const *file)
+{
+ int e = errno ;
+ unlink(file) ;
+ errno = e ;
+}
diff --git a/src/libstddjb/dir_close.c b/src/libstddjb/dir_close.c
index 1b7b16a..4c5d0cf 100644
--- a/src/libstddjb/dir_close.c
+++ b/src/libstddjb/dir_close.c
@@ -3,12 +3,13 @@
#include
#include
-int dir_close (DIR *dir)
+void dir_close (DIR *dir)
{
- unsigned int done = 0 ;
-doit:
- done++ ;
- if (!closedir(dir)) return 0 ;
- if (errno == EINTR) goto doit ;
- return ((errno == EBADF) && (done > 1)) ? 0 : -1 ;
+ int e = errno ;
+ for (;;)
+ {
+ if (closedir(dir) == 0) break ;
+ if (errno != EINTR) break ;
+ }
+ errno = e ;
}
diff --git a/src/libunixonacid/skaclient_end.c b/src/libunixonacid/skaclient_end.c
index 23dafab..1b24303 100644
--- a/src/libunixonacid/skaclient_end.c
+++ b/src/libunixonacid/skaclient_end.c
@@ -1,5 +1,6 @@
/* ISC license. */
+#include
#include
#include
#include
@@ -14,8 +15,10 @@ void skaclient_end (skaclient_t *a)
unixmessage_receiver_free(&a->asyncin) ;
if (a->pid && a->options & SKACLIENT_OPTION_WAITPID)
{
+ int e = errno ;
int wstat ;
waitpid_nointr(a->pid, &wstat, 0) ;
+ errno = e ;
}
*a = skaclient_zero ;
}
diff --git a/src/libunixonacid/textclient_end.c b/src/libunixonacid/textclient_end.c
index 58fc930..1ddf93f 100644
--- a/src/libunixonacid/textclient_end.c
+++ b/src/libunixonacid/textclient_end.c
@@ -1,5 +1,6 @@
/* ISC license. */
+#include
#include
#include
#include
@@ -15,8 +16,10 @@ void textclient_end (textclient_t *a)
textmessage_receiver_free(&a->asyncin) ;
if (a->pid && a->options & TEXTCLIENT_OPTION_WAITPID)
{
+ int e = errno ;
int wstat ;
waitpid_nointr(a->pid, &wstat, 0) ;
+ errno = e ;
}
*a = textclient_zero ;
}
--
cgit v1.2.3