| OLD | NEW |
| 1 #include <dirent.h> | 1 #include <dirent.h> |
| 2 #include <errno.h> | 2 #include <errno.h> |
| 3 #include "__dirent.h" | 3 #include "__dirent.h" |
| 4 #include "syscall.h" | 4 #include "syscall.h" |
| 5 #include "libc.h" | 5 #include "libc.h" |
| 6 | 6 |
| 7 int __getdents(int, struct dirent *, size_t); | 7 int __getdents(int, struct dirent*, size_t); |
| 8 | 8 |
| 9 struct dirent *readdir(DIR *dir) | 9 struct dirent* readdir(DIR* dir) { |
| 10 { | 10 struct dirent* de; |
| 11 » struct dirent *de; | 11 |
| 12 » | 12 if (dir->buf_pos >= dir->buf_end) { |
| 13 » if (dir->buf_pos >= dir->buf_end) { | 13 int len = __syscall(SYS_getdents, dir->fd, dir->buf, sizeof dir->buf); |
| 14 » » int len = __syscall(SYS_getdents, dir->fd, dir->buf, sizeof dir-
>buf); | 14 if (len <= 0) { |
| 15 » » if (len <= 0) { | 15 if (len < 0 && len != -ENOENT) |
| 16 » » » if (len < 0 && len != -ENOENT) errno = -len; | 16 errno = -len; |
| 17 » » » return 0; | 17 return 0; |
| 18 » » } | 18 } |
| 19 » » dir->buf_end = len; | 19 dir->buf_end = len; |
| 20 » » dir->buf_pos = 0; | 20 dir->buf_pos = 0; |
| 21 » } | 21 } |
| 22 » de = (void *)(dir->buf + dir->buf_pos); | 22 de = (void*)(dir->buf + dir->buf_pos); |
| 23 » dir->buf_pos += de->d_reclen; | 23 dir->buf_pos += de->d_reclen; |
| 24 » dir->tell = de->d_off; | 24 dir->tell = de->d_off; |
| 25 » return de; | 25 return de; |
| 26 } | 26 } |
| 27 | 27 |
| 28 LFS64(readdir); | 28 LFS64(readdir); |
| OLD | NEW |