зеркало из https://github.com/github/ruby.git
* win32/win32.c (kill): fix typo and add signal 0 support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
f5a6a36471
Коммит
277d89447a
|
@ -1,3 +1,7 @@
|
||||||
|
Thu May 15 09:32:25 2003 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* win32/win32.c (kill): fix typo and add signal 0 support.
|
||||||
|
|
||||||
Wed May 14 20:09:26 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
|
Wed May 14 20:09:26 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
|
||||||
|
|
||||||
* ext/syck/gram.c: sequence-in-map shortcut, transfer methods on
|
* ext/syck/gram.c: sequence-in-map shortcut, transfer methods on
|
||||||
|
|
|
@ -2540,10 +2540,30 @@ kill(int pid, int sig)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsWin95()) pid = -pid;
|
if (IsWin95()) pid = -pid;
|
||||||
if ((unsigned int)pid == GetCurrentProcessId() && sig != SIGKILL)
|
if ((unsigned int)pid == GetCurrentProcessId() &&
|
||||||
|
(sig != 0 && sig != SIGKILL))
|
||||||
return raise(sig);
|
return raise(sig);
|
||||||
|
|
||||||
switch (sig) {
|
switch (sig) {
|
||||||
|
case 0:
|
||||||
|
RUBY_CRITICAL({
|
||||||
|
HANDLE hProc =
|
||||||
|
OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pid);
|
||||||
|
if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
|
||||||
|
if (GetLastError() == ERROR_INVALID_PARAMETER) {
|
||||||
|
errno = ESRCH;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
errno = EPERM;
|
||||||
|
}
|
||||||
|
ret = -1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
CloseHandle(hProc);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
case SIGINT:
|
case SIGINT:
|
||||||
RUBY_CRITICAL({
|
RUBY_CRITICAL({
|
||||||
if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, (DWORD)pid)) {
|
if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, (DWORD)pid)) {
|
||||||
|
@ -2576,7 +2596,7 @@ kill(int pid, int sig)
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
define:
|
default:
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
ret = -1;
|
ret = -1;
|
||||||
break;
|
break;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче