提交 b9f7f2e8 编写于 作者: R Rich Felker

fix readdir not to set ENOENT when directory is removed while reading

per POSIX, ENOENT is reserved for invalid stream position; it is an
optional error and would only happen if the application performs
invalid seeks on the underlying file descriptor. however, linux's
getdents syscall also returns ENOENT if the directory was removed
between the time it was opened and the time of the read. we need to
catch this case and remap it to simple end-of-file condition (null
pointer return value like an error, but no change to errno). this
issue reportedly affects GNU make in certain corner cases.

rather than backing up and restoring errno, I've just changed the
syscall to be made in a way that doesn't affect errno (via an inline
syscall rather than a call to the __getdents function). the latter
still exists for the purpose of providing the public getdents alias
which sets errno.
上级 d82db855
#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) ...@@ -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); int len = __syscall(SYS_getdents, dir->fd, dir->buf, sizeof dir->buf);
if (len <= 0) return 0; 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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册