summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libstddjb/fd_sync.c2
-rw-r--r--src/libunixonacid/opendir_at.c31
-rw-r--r--src/sysdeps/tryfdopendir.c22
3 files changed, 49 insertions, 6 deletions
diff --git a/src/libstddjb/fd_sync.c b/src/libstddjb/fd_sync.c
index c4d359b..4506523 100644
--- a/src/libstddjb/fd_sync.c
+++ b/src/libstddjb/fd_sync.c
@@ -1,7 +1,5 @@
/* ISC license. */
-#include <skalibs/nonposix.h> /* lol MacOS */
-
#include <unistd.h>
#include <errno.h>
diff --git a/src/libunixonacid/opendir_at.c b/src/libunixonacid/opendir_at.c
index c1de4f1..d5a3221 100644
--- a/src/libunixonacid/opendir_at.c
+++ b/src/libunixonacid/opendir_at.c
@@ -1,19 +1,42 @@
/* ISC license. */
-/* Should not be necessary but old NetBSD/OpenBSD fail to
- properly expose fdopendir() otherwise */
+#include <skalibs/sysdeps.h>
#include <skalibs/nonposix.h>
-
#include <skalibs/direntry.h>
#include <skalibs/djbunix.h>
#include <skalibs/unix-transactional.h>
+#ifdef SKALIBS_HASFDOPENDIR
+
DIR *opendir_at (int dfd, char const *name)
{
DIR *dir ;
int fd = openc_readatb(dfd, name) ;
- if (fd < 0) return 0 ;
+ if (fd == -1) return 0 ;
dir = fdopendir(fd) ;
if (!dir) fd_close(fd) ;
return dir ;
}
+
+#else
+
+#include <unistd.h>
+#include <stdlib.h>
+
+DIR *opendir_at (int dfd, char const *name)
+{
+ DIR *dir ;
+ int here = open_read(".") ;
+ if (here == -1) return 0 ;
+ if (fchdir(dfd) == -1)
+ {
+ fd_close(here) ;
+ return 0 ;
+ }
+ dir = opendir(name) ;
+ if (fchdir(here) == -1) abort() ;
+ fd_close(here) ;
+ return dir ;
+}
+
+#endif
diff --git a/src/sysdeps/tryfdopendir.c b/src/sysdeps/tryfdopendir.c
new file mode 100644
index 0000000..d9a8f01
--- /dev/null
+++ b/src/sysdeps/tryfdopendir.c
@@ -0,0 +1,22 @@
+/* ISC license. */
+
+#undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifndef _NETBSD_SOURCE
+#define _NETBSD_SOURCE
+#endif
+#ifndef __EXTENSIONS__
+#define __EXTENSIONS__
+#endif
+
+#include <dirent.h>
+
+int main (void)
+{
+ DIR *dir = fdopendir(0) ;
+ return !dir ;
+}