|
@@ -1,5 +1,7 @@
|
|
#include <dirent.h>
|
|
#include <dirent.h>
|
|
|
|
+#include <errno.h>
|
|
#include "__dirent.h"
|
|
#include "__dirent.h"
|
|
|
|
+#include "syscall.h"
|
|
#include "libc.h"
|
|
#include "libc.h"
|
|
|
|
|
|
int __getdents(int, struct dirent *, size_t);
|
|
int __getdents(int, struct dirent *, size_t);
|
|
@@ -9,8 +11,11 @@ struct dirent *readdir(DIR *dir)
|
|
struct dirent *de;
|
|
struct dirent *de;
|
|
|
|
|
|
if (dir->buf_pos >= dir->buf_end) {
|
|
if (dir->buf_pos >= dir->buf_end) {
|
|
- int len = __getdents(dir->fd, (void *)dir->buf, sizeof dir->buf);
|
|
|
|
- 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_end = len;
|
|
dir->buf_pos = 0;
|
|
dir->buf_pos = 0;
|
|
}
|
|
}
|