JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in: Display "..." when not-verbose.

Browse Source 
* kill.cc (forcekill): Default to entered pid when pinfo fails.  Issue some
warnings when things don't work.
This commit is contained in:
Christopher Faylor 2003-09-01 01:57:44 +00:00
parent 12ffca1d84
commit 40d885eb7b
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2003-08-31 Christopher Faylor <cgf@redhat.com>
* Makefile.in: Display "..." when not-verbose.
* kill.cc (forcekill): Default to entered pid when pinfo fails. Issue
some warnings when things don't work.
2003-08-17 David Rothenberger <daveroth@acm.org> 2003-08-17 David Rothenberger <daveroth@acm.org>
* dump_setup.cc (check_package_files): Strip leading / and ./ from * dump_setup.cc (check_package_files): Strip leading / and ./ from

2
winsup/utils/Makefile.in
View File

@ -205,7 +205,7 @@ endif
%.exe: %.o $(ALL_DEP_LDLIBS) %.exe: %.o $(ALL_DEP_LDLIBS)
ifdef VERBOSE ifdef VERBOSE
$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS) $(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ ... $(ALL_LDFLAGS)
else else
@echo $(CXX) -o $@ ${firstword $^} ${filter-out -B%, $(ALL_LDFLAGS)};\ @echo $(CXX) -o $@ ${firstword $^} ${filter-out -B%, $(ALL_LDFLAGS)};\
$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS) $(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)

11
winsup/utils/kill.cc
View File

@ -129,13 +129,16 @@ static void __stdcall
forcekill (int pid, int sig, int wait) forcekill (int pid, int sig, int wait)
{ {
external_pinfo *p = (external_pinfo *) cygwin_internal (CW_GETPINFO_FULL, pid); external_pinfo *p = (external_pinfo *) cygwin_internal (CW_GETPINFO_FULL, pid);
if (!p) DWORD dwpid = p ? p->dwProcessId : (DWORD) pid;
return; HANDLE h = OpenProcess (PROCESS_TERMINATE, FALSE, (DWORD) dwpid);
HANDLE h = OpenProcess (PROCESS_TERMINATE, FALSE, (DWORD) p->dwProcessId);
if (!h) if (!h)
{
fprintf (stderr, "couldn't open pid %u\n", dwpid);
return; return;
}
if (!wait || WaitForSingleObject (h, 200) != WAIT_OBJECT_0) if (!wait || WaitForSingleObject (h, 200) != WAIT_OBJECT_0)
TerminateProcess (h, sig << 8); if (!TerminateProcess (h, sig << 8))
fprintf (stderr, "couldn't kill pid %u, %d\n", dwpid, GetLastError ());
CloseHandle (h); CloseHandle (h);
} }