select: fix 64-bit timeout truncation on pre-time64 kernels

[musl] / src / stdio / remove.c

diff --git a/src/stdio/remove.c b/src/stdio/remove.c
index fc12f7c..942e301 100644 (file)
--- a/src/stdio/remove.c
+++ b/src/stdio/remove.c
@@ -1,9 +1,19 @@
 #include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include "syscall.h"
 
 int remove(const char *path)
 {
-       return (syscall(SYS_unlink, path) && errno == EISDIR)
-               ? syscall(SYS_rmdir, path) : 0;
+#ifdef SYS_unlink
+       int r = __syscall(SYS_unlink, path);
+#else
+       int r = __syscall(SYS_unlinkat, AT_FDCWD, path, 0);
+#endif
+#ifdef SYS_rmdir
+       if (r==-EISDIR) r = __syscall(SYS_rmdir, path);
+#else
+       if (r==-EISDIR) r = __syscall(SYS_unlinkat, AT_FDCWD, path, AT_REMOVEDIR);
+#endif
+       return __syscall_ret(r);
 }