diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-07-13 20:56:24 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-07-13 20:56:24 +0000 |
| commit | e8bf2329496eb61558898c987b1a245d6f5ff40f (patch) | |
| tree | e1f1d488086b5b85134a94126d713252b73d86c8 /winsup | |
| parent | 94fe03664f7480ea1bb4ff63f12a337e69a424bd (diff) | |
| download | cygnal-e8bf2329496eb61558898c987b1a245d6f5ff40f.tar.gz cygnal-e8bf2329496eb61558898c987b1a245d6f5ff40f.tar.bz2 cygnal-e8bf2329496eb61558898c987b1a245d6f5ff40f.zip | |
* fhandler.cc (fhandler_base::raw_read): Only return EISDIR when we're really
trying to read a directory.
* sigproc.cc: Use "Static" where appropriate.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.cc | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 00e2b0f1b..e0f64e3ae 100644 --- 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 50bde0064..539c2e8fa 100644 --- 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 be0d91c8c..a14b26042 100644 --- 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 |