aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-04-18 13:25:10 +0100
committerRon Yorston <rmy@pobox.com>2012-04-18 13:25:10 +0100
commit2f57f008a2f7aaa0193b432f8d0c0ec4f42648c3 (patch)
tree2cd81ed159dfa7053cb8bff17151b875b7a6a597
parent7209ab16b8ef7ac9d7a298434aaf456d1cc6a982 (diff)
downloadbusybox-w32-2f57f008a2f7aaa0193b432f8d0c0ec4f42648c3.tar.gz
busybox-w32-2f57f008a2f7aaa0193b432f8d0c0ec4f42648c3.tar.bz2
busybox-w32-2f57f008a2f7aaa0193b432f8d0c0ec4f42648c3.zip
kill: no special treatment for MINGW32
-rw-r--r--procps/kill.c2
-rw-r--r--win32/process.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/procps/kill.c b/procps/kill.c
index 8aa0eb3e2..224e5ad1a 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -86,7 +86,6 @@ int kill_main(int argc, char **argv)
86 goto do_it_now; 86 goto do_it_now;
87 } 87 }
88 88
89#if !ENABLE_PLATFORM_MINGW32
90 /* The -l option, which prints out signal names. 89 /* The -l option, which prints out signal names.
91 * Intended usage in shell: 90 * Intended usage in shell:
92 * echo "Died of SIG`kill -l $?`" 91 * echo "Died of SIG`kill -l $?`"
@@ -152,7 +151,6 @@ int kill_main(int argc, char **argv)
152 } 151 }
153 arg = *++argv; 152 arg = *++argv;
154 argc--; 153 argc--;
155#endif /* ENABLE_PLATFORM_MINGW32 */
156 154
157 do_it_now: 155 do_it_now:
158 pid = getpid(); 156 pid = getpid();
diff --git a/win32/process.c b/win32/process.c
index 2cfec4fdf..7c94da6e3 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -360,7 +360,7 @@ int kill(pid_t pid, int sig)
360 360
361 if (sig != SIGTERM) { 361 if (sig != SIGTERM) {
362 bb_error_msg("kill only supports SIGTERM"); 362 bb_error_msg("kill only supports SIGTERM");
363 errno = ENOSYS; 363 errno = EINVAL;
364 return -1; 364 return -1;
365 } 365 }
366 h = OpenProcess(PROCESS_TERMINATE, FALSE, pid); 366 h = OpenProcess(PROCESS_TERMINATE, FALSE, pid);