summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc7
2 files changed, 8 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9f05483a0..4768c0461 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2005-03-17 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_disk_file.cc (fhandler_disk_file::utimes): Handle opening
+ directories under 9x gracefully.
+
+2005-03-17 Corinna Vinschen <corinna@vinschen.de>
+
* fhandler_socket.cc (fhandler_socket::connect): Always set sun_path
in case of a successful or pending connect.
(fhandler_socket::accept): Don't run secret event and eid credential
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index f8d708e56..7842bcafa 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -807,14 +807,13 @@ fhandler_disk_file::utimes (const struct timeval *tvp)
{
syscall_printf ("Opening file failed");
__seterrno ();
- if (pc.isdir ()) /* What we can do with directories more? */
- return 0;
-
- __seterrno ();
return -1;
}
}
+ if (nohandle ()) /* Directory query_open on 9x. */
+ return 0;
+
gettimeofday (&tmp[0], 0);
if (!tvp)
{