From 4a42a25876662efc1fff97c6668a156ac2e39a8e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 12 Jul 2009 21:15:47 +0000 Subject: [PATCH] * Makefile.in: Don't do anything special with any RCS directories. * ntdll.h (PROCESSINFOCLASS): Remove unneeded trailing comma. * pinfo.cc (_pinfo::dup_proc_pipe): Remove unneeded assignment. * sigproc.cc (sig_send): Don't send signal to myself if this is an exec stub. --- winsup/cygwin/ChangeLog | 11 +++++++++++ winsup/cygwin/Makefile.in | 2 ++ winsup/cygwin/ntdll.h | 2 +- winsup/cygwin/pinfo.cc | 1 - winsup/cygwin/sigproc.cc | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 06f421bc1..d4527e15c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,14 @@ +2009-07-12 Christopher Faylor + + * Makefile.in: Don't do anything special with any RCS directories. + + * ntdll.h (PROCESSINFOCLASS): Remove unneeded trailing comma. + + * pinfo.cc (_pinfo::dup_proc_pipe): Remove unneeded assignment. + + * sigproc.cc (sig_send): Don't send signal to myself if this is an exec + stub. + 2009-07-12 Corinna Vinschen * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Don't use diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 306166cc9..d219f5a53 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -496,3 +496,5 @@ deps:=${wildcard *.d} ifneq (,$(deps)) include $(deps) endif + +%: RCS/%,v diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h index bf0062870..35cf77202 100644 --- a/winsup/cygwin/ntdll.h +++ b/winsup/cygwin/ntdll.h @@ -471,7 +471,7 @@ typedef enum _PROCESSINFOCLASS ProcessVmCounters = 3, ProcessTimes = 4, ProcessSessionInformation = 24, - ProcessWow64Information = 26, + ProcessWow64Information = 26 } PROCESSINFOCLASS; typedef struct _DEBUG_BUFFER diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 00e4db7ea..5ac29fc30 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -924,7 +924,6 @@ _pinfo::dup_proc_pipe (HANDLE hProcess) wr_proc_pipe_owner = dwProcessId; sigproc_printf ("duped wr_proc_pipe %p for pid %d(%u)", wr_proc_pipe, pid, dwProcessId); - res = true; } return orig_wr_proc_pipe; } diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index e21e09feb..91109977b 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -555,7 +555,7 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls) pack.wakeup = NULL; bool wait_for_completion; - if (!(its_me = (p == NULL || p == myself || p == myself_nowait))) + if (!(its_me = (!hExeced && (p == NULL || p == myself || p == myself_nowait)))) { /* It is possible that the process is not yet ready to receive messages * or that it has exited. Detect this.