From edd7573015b4348ea982203096c8adb8fe1dbbee Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 9 Nov 2000 13:32:33 +0000 Subject: [PATCH] * dir.cc (readdir): Avoid reading from the beginning when readdir is called after a previous call has returned NULL. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/dir.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 90424c834..fbb2e4c4f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 9 14:30:00 2000 Corinna Vinschen + + * dir.cc (readdir): Avoid reading from the beginning when + readdir is called after a previous call has returned NULL. + Wed Nov 8 21:00:31 2000 Christopher Faylor * select.cc (peek_pipe): Deal with pending newline in pty_master. diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index d73eeac9f..d2b8bfec0 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -145,7 +145,8 @@ 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 + && dir->__d_position == 0) { handle = FindFirstFileA (dir->__d_dirname, &buf); DWORD lasterr = GetLastError ();