From c17e8306d06f795755b751fa8c0021c16d34fa25 Mon Sep 17 00:00:00 2001 From: Pierre Humblet Date: Sun, 1 Jun 2003 19:37:13 +0000 Subject: [PATCH] 2003-06-01 Pierre Humblet * fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Assume an existing directory is a root if FindFirstFile fails. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_disk_file.cc | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a2049a252..b61433503 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2003-06-01 Pierre Humblet + + * fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Assume + an existing directory is a root if FindFirstFile fails. + 2003-05-30 Christopher Faylor * path.cc (mount_info::conv_to_win32_path): gcc warning about chroot_ok diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 30e6785bb..c595022f7 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -108,18 +108,7 @@ fhandler_disk_file::fstat_by_name (struct __stat64 *buf, path_conv *pc) set_errno (ENOENT); res = -1; } - else if (pc->isdir () && strlen (*pc) <= strlen (pc->root_dir ())) - { - FILETIME ft = {}; - res = fstat_helper (buf, pc, ft, ft, ft, 0, 0); - } - else if ((handle = FindFirstFile (*pc, &local)) == INVALID_HANDLE_VALUE) - { - debug_printf ("FindFirstFile failed for '%s', %E", (char *) *pc); - __seterrno (); - res = -1; - } - else + else if ((handle = FindFirstFile (*pc, &local)) != INVALID_HANDLE_VALUE) { FindClose (handle); res = fstat_helper (buf, pc, @@ -129,6 +118,17 @@ fhandler_disk_file::fstat_by_name (struct __stat64 *buf, path_conv *pc) local.nFileSizeHigh, local.nFileSizeLow); } + else if (pc->isdir ()) + { + FILETIME ft = {}; + res = fstat_helper (buf, pc, ft, ft, ft, 0, 0); + } + else + { + debug_printf ("FindFirstFile failed for '%s', %E", (char *) *pc); + __seterrno (); + res = -1; + } return res; }