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

* fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Remove label

Browse Source 
"out".  Move test for NULL __handle ...
	(fhandler_disk_file::rewinddir_9x): ... here.
This commit is contained in:
Corinna Vinschen
2006-02-05 11:17:03 +00:00
parent a80fb27643
commit da3374d695
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,9 @@
2006-02-05 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Remove label
"out". Move test for NULL __handle ...
(fhandler_disk_file::rewinddir_9x): ... here.
2006-02-05 Corinna Vinschen <corinna@vinschen.de> 2006-02-05 Corinna Vinschen <corinna@vinschen.de>
* dir.cc (rewinddir): Keep dirent_get_d_ino and dirent_set_d_ino flags. * dir.cc (rewinddir): Keep dirent_get_d_ino and dirent_set_d_ino flags.

13
winsup/cygwin/fhandler_disk_file.cc
View File

@@ -1591,12 +1591,6 @@ fhandler_disk_file::readdir (DIR *dir, dirent *de)
char fname[CYG_MAX_PATH]; char fname[CYG_MAX_PATH];
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
if (!dir->__handle)
{
res = ENMFILE;
goto out;
}
if (!wincap.is_winnt ()) if (!wincap.is_winnt ())
return readdir_9x (dir, de); return readdir_9x (dir, de);
@@ -1691,7 +1685,6 @@ fhandler_disk_file::readdir (DIR *dir, dirent *de)
res = 0; res = 0;
} }
out:
syscall_printf ("%d = readdir (%p) (%s)", dir, &de, de->d_name); syscall_printf ("%d = readdir (%p) (%s)", dir, &de, de->d_name);
return res; return res;
} }
@@ -1703,6 +1696,12 @@ fhandler_disk_file::readdir_9x (DIR *dir, dirent *de)
int res = 0; int res = 0;
BOOL ret = TRUE; BOOL ret = TRUE;
if (!dir->__handle)
{
res = ENMFILE;
goto out;
}
if (dir->__handle == INVALID_HANDLE_VALUE && dir->__d_position == 0) if (dir->__handle == INVALID_HANDLE_VALUE && dir->__d_position == 0)
{ {
int len = strlen (dir->__d_dirname); int len = strlen (dir->__d_dirname);