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

* fhandler.h (dirent_states): Add dirent_isroot, dirent_saw_cygdrive,

Browse Source 
dirent_saw_dev.
* dir.cc (opendir): Don't zero __flags here.  Push that responsibility to
opendir methods.
(seekdir): Preserve dirent_isrrot in __flags.
(rewinddir): Ditto.
* fhandler_disk_file.cc (fhandler_disk_file::opendir): Set dirent_isroot
appropriately.
(fhandler_disk_file::readdir): Fill in "cygdrive" and "dev" if it is the root
dir and they are missing.
* fhandler_process.cc (fhandler_process::opendir): Set __flags here.
* fhandler_virtual.cc (fhandler_virtual::opendir): Set __flags here.
This commit is contained in:
Christopher Faylor
2005-08-19 16:18:42 +00:00
parent 82ef66c933
commit 358063ace3
6 changed files with 77 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
winsup/cygwin/fhandler_disk_file.cc
View File

@@ -1287,6 +1287,7 @@ fhandler_disk_file::opendir ()
DIR *dir;
DIR *res = NULL;
size_t len;
path_conv rootdir ("/");
if (!pc.isdir ())
set_errno (ENOTDIR);
@@ -1332,7 +1333,7 @@ fhandler_disk_file::opendir ()
dir->__d_dirhash = get_namehash ();
res = dir;
dir->__flags = strcasematch (pc, rootdir) ? dirent_isroot : 0;
}
syscall_printf ("%p = opendir (%s)", res, get_name ());
@@ -1370,15 +1371,36 @@ fhandler_disk_file::readdir (DIR *dir)
return res;
else if (!FindNextFileA (dir->__handle, &buf))
{
DWORD lasterr = GetLastError ();
FindClose (dir->__handle);
dir->__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;
bool added = false;
if (!(dir->__flags & dirent_isroot))
/* nothing */;
else if (!(dir->__flags & dirent_saw_dev))
{
strcpy (buf.cFileName, "dev");
added = true;
}
else if (!(dir->__flags & dirent_saw_cygdrive)
&& mount_table->cygdrive_len > 1)
{
strcpy (buf.cFileName, mount_table->cygdrive + 1);
buf.cFileName[mount_table->cygdrive_len - 2] = '\0';
added = true;
}
if (added)
buf.dwFileAttributes = 0;
else
{
DWORD lasterr = GetLastError ();
FindClose (dir->__handle);
dir->__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;
}
}
/* Check for Windows shortcut. If it's a Cygwin or U/WIN
@@ -1403,11 +1425,22 @@ fhandler_disk_file::readdir (DIR *dir)
fnunmunge (dir->__d_dirent->d_name, buf.cFileName);
else
strcpy (dir->__d_dirent->d_name, buf.cFileName);
if (!(dir->__flags && dirent_isroot))
/* nothing */;
else
{
if (strcasematch (dir->__d_dirent->d_name, "dev"))
dir->__flags |= dirent_saw_dev;
if (strlen (dir->__d_dirent->d_name) == mount_table->cygdrive_len - 2
&& strncasematch (dir->__d_dirent->d_name, mount_table->cygdrive + 1,
mount_table->cygdrive_len - 2))
dir->__flags |= dirent_saw_cygdrive;
}
dir->__d_position++;
res = dir->__d_dirent;
syscall_printf ("%p = readdir (%p) (%s)",
&dir->__d_dirent, dir, buf.cFileName);
syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,
buf.cFileName);
return res;
}