diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-07-14 08:23:32 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-07-14 08:23:32 +0000 |
| commit | bdd74c60b70f1175b869b53880145139b22a7bb4 (patch) | |
| tree | 7bd1f825115411da90f5e3392cf21ed4393a12c0 | |
| parent | a06a18c69e555f925a9cd32dedec2ec66cd4e0c5 (diff) | |
| download | newlib-bdd74c60b70f1175b869b53880145139b22a7bb4.zip newlib-bdd74c60b70f1175b869b53880145139b22a7bb4.tar.gz newlib-bdd74c60b70f1175b869b53880145139b22a7bb4.tar.bz2 | |
* Merge HEAD into cv-branch.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 12 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.cc | 10 | ||||
| -rw-r--r-- | winsup/cygwin/sigproc.h | 4 |
4 files changed, 20 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d1c3468..e4a8605 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,15 @@ +2006-07-13 Christopher Faylor <cgf@timesys.com> + + * sigproc.cc (waitq_head): Don't initialize to zero. + * sigproc.h: Update copyright, fix whitespace. + +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> * include/netinet/in.h: Update copyright. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 50bde00..539c2e8 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 be0d91c..d2c9109 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -61,18 +61,18 @@ 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 #define procs ((pinfo *) cprocs) // All this just to avoid expensive // constructor operation at DLL startup -Static waitq waitq_head = {0, 0, 0, 0, 0, 0, 0};// Start of queue for wait'ing threads +Static waitq waitq_head; // 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 diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h index 4657f6d..5fef01d 100644 --- a/winsup/cygwin/sigproc.h +++ b/winsup/cygwin/sigproc.h @@ -1,6 +1,6 @@ /* sigproc.h - Copyright 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc. + Copyright 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. This file is part of Cygwin. @@ -94,5 +94,5 @@ extern struct sigaction *global_sigs; #define WAIT_SIG_PRIORITY THREAD_PRIORITY_NORMAL -#define myself_nowait ((_pinfo *)myself_nowait_dummy) +#define myself_nowait ((_pinfo *) myself_nowait_dummy) #endif /*_SIGPROC_H*/ |