fix segfault in lutimes when tv argument is NULL

[musl] / src / dirent / readdir.c

diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c
index 1aeb25a..569fc70 100644 (file)
--- a/src/dirent/readdir.c
+++ b/src/dirent/readdir.c
@@ -1,25 +1,22 @@
 #include <dirent.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <stddef.h>
 #include "__dirent.h"
 #include "syscall.h"
-#include "libc.h"
 
-int __getdents(int, struct dirent *, size_t);
+typedef char dirstream_buf_alignment_check[1-2*(int)(
+       offsetof(struct __dirstream, buf) % sizeof(off_t))];
 
 struct dirent *readdir(DIR *dir)
 {
        struct dirent *de;
        
        if (dir->buf_pos >= dir->buf_end) {
-               int len = __getdents(dir->fd, (void *)dir->buf, sizeof dir->buf);
-               if (len < 0) {
-                       dir->lock = 0;
-                       return NULL;
-               } else if (len == 0) return 0;
+               int len = __syscall(SYS_getdents, dir->fd, dir->buf, sizeof dir->buf);
+               if (len <= 0) {
+                       if (len < 0 && len != -ENOENT) errno = -len;
+                       return 0;
+               }
                dir->buf_end = len;
                dir->buf_pos = 0;
        }
@@ -29,4 +26,4 @@ struct dirent *readdir(DIR *dir)
        return de;
 }
 
-LFS64(readdir);
+weak_alias(readdir, readdir64);