* fhandler.cc (fhandler_base::raw_read): Only return EISDIR when we're really

trying to read a directory.
* sigproc.cc: Use "Static" where appropriate.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 00e2b0f..e0f64e3 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-13  Christopher Faylor  <cgf@timesys.com>
+
+       * fhandler.cc (fhandler_base::raw_read): Only return EISDIR when we're
+       really trying to read a directory.
+
+       * sigproc.cc: Use "Static" where appropriate.
+
 2006-07-13  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_socket.cc: Update copyright.

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 50bde00..539c2e8 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -262,7 +262,7 @@ fhandler_base::raw_read (void *ptr, size_t& ulen)
        case ERROR_INVALID_FUNCTION:
        case ERROR_INVALID_PARAMETER:
        case ERROR_INVALID_HANDLE:
-         if (openflags & O_DIROPEN)
+         if (pc.isdir ())
            {
              set_errno (EISDIR);
              bytes_read = (size_t) -1;

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index be0d91c..a14b260 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -61,10 +61,10 @@ HANDLE NO_COPY signal_arrived;              // Event signaled when a signal has
 
 HANDLE NO_COPY sigCONT;                        // Used to "STOP" a process
 
-cygthread *hwait_sig;
+cygthread NO_COPY *hwait_sig;
 Static HANDLE wait_sig_inited;         // Control synchronization of
                                        //  message queue startup
-static NO_COPY bool sigheld;           // True if holding signals
+Static bool sigheld;                   // True if holding signals
 
 Static int nprocs;                     // Number of deceased children
 Static char cprocs[(NPROCS + 1) * sizeof (pinfo)];// All my children info
@@ -72,7 +72,7 @@ Static char cprocs[(NPROCS + 1) * sizeof (pinfo)];// All my children info
                                        // constructor operation  at DLL startup
 Static waitq waitq_head = {0, 0, 0, 0, 0, 0, 0};// Start of queue for wait'ing threads
 
-static muto NO_COPY sync_proc_subproc; // Control access to subproc stuff
+Static muto sync_proc_subproc; // Control access to subproc stuff
 
 _cygtls NO_COPY *_sig_tls;
 
@@ -106,7 +106,7 @@ public:
   friend DWORD WINAPI wait_sig (VOID *arg);
 };
 
-static pending_signals sigq;
+Static pending_signals sigq;
 
 /* Functions */
 void __stdcall