JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dir.cc (readdir): Ensure that errno is *only* set when we've run out of

Browse Source 
filenames.
* fhandler.cc (fhandler_disk_file::fstat): Use modern method for saving errno,
making it effective for the whole function.
This commit is contained in:
Christopher Faylor
2000-08-10 19:20:11 +00:00
parent 38a6bf987b
commit b58f5598cb
3 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
winsup/cygwin/dir.cc
View File

@@ -128,8 +128,7 @@ readdir (DIR * dir)
{
WIN32_FIND_DATA buf;
HANDLE handle;
struct dirent *res = 0;
int prior_errno;
struct dirent *res = NULL;
if (dir->__d_cookie != __DIRENT_COOKIE)
{
@@ -138,40 +137,28 @@ readdir (DIR * dir)
return res;
}
if (dir->__d_u.__d_data.__handle != INVALID_HANDLE_VALUE)
if (dir->__d_u.__d_data.__handle == INVALID_HANDLE_VALUE)
{
if (FindNextFileA (dir->__d_u.__d_data.__handle, &buf) == 0)
handle = FindFirstFileA (dir->__d_dirname, &buf);
DWORD lasterr = GetLastError ();
dir->__d_u.__d_data.__handle = handle;
if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES))
{
prior_errno = get_errno();
(void) FindClose (dir->__d_u.__d_data.__handle);
dir->__d_u.__d_data.__handle = INVALID_HANDLE_VALUE;
__seterrno ();
/* POSIX says you shouldn't set errno when readdir can't
find any more files; if another error we leave it set. */
if (get_errno () == ENMFILE)
set_errno (prior_errno);
syscall_printf ("%p = readdir (%p)", res, dir);
seterrno_from_win_error (__FILE__, __LINE__, lasterr);
return res;
}
}
else
else if (!FindNextFileA (dir->__d_u.__d_data.__handle, &buf))
{
handle = FindFirstFileA (dir->__d_dirname, &buf);
if (handle == INVALID_HANDLE_VALUE)
{
/* It's possible that someone else deleted or emptied the directory
or some such between the opendir () call and here. */
prior_errno = get_errno ();
__seterrno ();
/* POSIX says you shouldn't set errno when readdir can't
find any more files; if another error we leave it set. */
if (get_errno () == ENMFILE)
set_errno (prior_errno);
syscall_printf ("%p = readdir (%p)", res, dir);
return res;
}
dir->__d_u.__d_data.__handle = handle;
DWORD lasterr = GetLastError ();
(void) FindClose (dir->__d_u.__d_data.__handle);
dir->__d_u.__d_data.__handle = INVALID_HANDLE_VALUE;
/* POSIX says you shouldn't set errno when readdir can't
find any more files; so, if another error we leave it set. */
if (lasterr != ERROR_NO_MORE_FILES)
seterrno_from_win_error (__FILE__, __LINE__, lasterr);
syscall_printf ("%p = readdir (%p)", res, dir);
return res;
}
/* We get here if `buf' contains valid data. */