From 5bf785a017482da9b87a141e91f91a07a4d433d0 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 19 Sep 2002 03:30:20 +0000
Subject: * cygthread.cc (cygthread::initialized): Avoid copying on fork or
 some threads may not end up in the pool. (cygthread::new): Avoid race when
 checking for initialized.  Add debugging code. * fhandler.cc
 (fhandler_base::raw_read): Add case for ERROR_INVALID_HANDLE due to Win95
 directories. (fhandler_base::open): Handle errors due to Win95 directories.
 (fhandler_base::close): Add get_nohandle () test.
 (fhandler_base::set_close_on_exec): Ditto. (fhandler_base::fork_fixup):
 Ditto. (fhandler_base::lock): Change error code to Posix EINVAL.
 (fhandler_base::dup): If get_nohandle (), set new value to
 INVALID_HANDLE_VALUE instead of NULL. * fhandler_disk_file.cc
 (fhandler_disk_file::fstat): Call fstat_by_name if get_nohandle ().  Remove
 extraneous element from strpbrk. (fhandler_disk_file::open): Remove test for
 Win95 directory. * fhandler_random.cc (fhandler_dev_random::open): Add
 set_nohandle (). * fhandler_clipboard.cc (fhandler_dev_clipboard::open):
 Ditto. * fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
 (fhandler_dev_zero::close): Delete. * fhandler.h (class fhandler_dev_zero):
 Ditto.

---
 winsup/cygwin/fhandler.cc | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

(limited to 'winsup/cygwin/fhandler.cc')

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 8ac42acdb..0b7bf65ee 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -234,8 +234,8 @@ fhandler_base::set_flags (int flags, int supplied_bin)
   else if (supplied_bin)
     bin = supplied_bin;
   else
-    bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT) ?
-      	  O_BINARY : O_TEXT;
+    bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT)
+	  ? O_BINARY : O_TEXT;
 
   openflags = flags | bin;
 
@@ -275,6 +275,7 @@ fhandler_base::raw_read (void *ptr, size_t ulen)
 	    return 0;
 	case ERROR_INVALID_FUNCTION:
 	case ERROR_INVALID_PARAMETER:
+	case ERROR_INVALID_HANDLE:
 	  if (openflags & O_DIROPEN)
 	    {
 	      set_errno (EISDIR);
@@ -441,11 +442,21 @@ fhandler_base::open (path_conv *pc, int flags, mode_t mode)
 
   if (x == INVALID_HANDLE_VALUE)
     {
-      if (GetLastError () == ERROR_INVALID_HANDLE)
+      if (pc->isdir () && !wincap.can_open_directories ())
+	{
+	  if (mode & (O_CREAT | O_EXCL) == (O_CREAT | O_EXCL))
+	    set_errno (EEXIST);
+	  else if (mode & (O_WRONLY | O_RDWR))
+	    set_errno (EISDIR);
+	  else
+	    set_nohandle (true);
+	}
+      else if (GetLastError () == ERROR_INVALID_HANDLE)
 	set_errno (ENOENT);
       else
 	__seterrno ();
-      goto done;
+      if (!get_nohandle ())
+	goto done;
     }
 
   /* Attributes may be set only if a file is _really_ created.
@@ -712,7 +723,7 @@ fhandler_base::readv (const struct iovec *const iov, const int iovcnt,
     {
       tot = 0;
       const struct iovec *iovptr = iov + iovcnt;
-      do 
+      do
 	{
 	  iovptr -= 1;
 	  tot += iovptr->iov_len;
@@ -764,7 +775,7 @@ fhandler_base::writev (const struct iovec *const iov, const int iovcnt,
     {
       tot = 0;
       const struct iovec *iovptr = iov + iovcnt;
-      do 
+      do
 	{
 	  iovptr -= 1;
 	  tot += iovptr->iov_len;
@@ -871,7 +882,7 @@ fhandler_base::close ()
   int res = -1;
 
   syscall_printf ("closing '%s' handle %p", get_name (), get_handle());
-  if (CloseHandle (get_handle()))
+  if (get_nohandle () || CloseHandle (get_handle()))
     res = 0;
   else
     {
@@ -898,7 +909,7 @@ fhandler_base::ioctl (unsigned int cmd, void *buf)
 int
 fhandler_base::lock (int, struct flock *)
 {
-  set_errno (ENOSYS);
+  set_errno (EINVAL);
   return -1;
 }
 
@@ -996,7 +1007,7 @@ fhandler_base::dup (fhandler_base *child)
 
   HANDLE nh;
   if (get_nohandle ())
-    nh = NULL;
+    nh = INVALID_HANDLE_VALUE;
   else if (!DuplicateHandle (hMainProc, get_handle(), hMainProc, &nh, 0, TRUE,
 			DUPLICATE_SAME_ACCESS))
     {
@@ -1207,7 +1218,8 @@ fhandler_base::fork_fixup (HANDLE parent, HANDLE &h, const char *name)
 void
 fhandler_base::set_close_on_exec (int val)
 {
-  set_inheritance (io_handle, val);
+  if (!get_nohandle ())
+    set_inheritance (io_handle, val);
   set_close_on_exec_flag (val);
   debug_printf ("set close_on_exec for %s to %d", get_name (), val);
 }
@@ -1216,7 +1228,8 @@ void
 fhandler_base::fixup_after_fork (HANDLE parent)
 {
   debug_printf ("inheriting '%s' from parent", get_name ());
-  fork_fixup (parent, io_handle, "io_handle");
+  if (!get_nohandle ())
+    fork_fixup (parent, io_handle, "io_handle");
 }
 
 bool
-- 
cgit v1.2.3