aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-11-01 20:20:37 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-11-01 20:20:37 +0000
commitdd539f76877000e333796da8f30ea760c080a69a (patch)
tree26f8642cd9e8cc1c2ca0b75a6b20801863b4e2cf /procps
parent92258541449581302e180d05e827e27d35030a18 (diff)
downloadbusybox-dd539f76877000e333796da8f30ea760c080a69a.tar.gz
busybox-dd539f76877000e333796da8f30ea760c080a69a.tar.bz2
Unneeded code removed, usused field "unsigned pscpu" removed
Diffstat (limited to 'procps')
-rw-r--r--procps/kill.c7
-rw-r--r--procps/ps.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/procps/kill.c b/procps/kill.c
index f22bdbe46..1b31a7291 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -84,9 +84,10 @@ do_it_now:
pid_t sid;
procps_status_t* p;
- /* kill(-1, sig) on Linux (at least 2.1.x)
- * might send signal to the calling process too */
- signal(SIGTERM, SIG_IGN);
+// Cannot happen anyway? We don't TERM ourself, we STOP
+// /* kill(-1, sig) on Linux (at least 2.1.x)
+// * might send signal to the calling process too */
+// signal(SIGTERM, SIG_IGN);
/* Now stop all processes */
kill(-1, SIGSTOP);
/* Find out our own session id */
diff --git a/procps/ps.c b/procps/ps.c
index da8c2a346..92608b114 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -25,7 +25,7 @@ int ps_main(int argc, char **argv)
#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
#if ENABLE_FEATURE_PS_WIDE
opt_complementary = "-:ww";
- USE_SELINUX(i =) getopt32(argc, argv, "w" USE_SELINUX("c"), &w_count);
+ USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("c") "w", &w_count);
/* if w is given once, GNU ps sets the width to 132,
* if w is given more than once, it is "unlimited"
*/
@@ -40,7 +40,7 @@ int ps_main(int argc, char **argv)
i = getopt32(argc, argv, "c");
#endif
#if ENABLE_SELINUX
- if ((i & (1+ENABLE_FEATURE_PS_WIDE)) && is_selinux_enabled())
+ if ((i & 1) && is_selinux_enabled())
use_selinux = 1;
#endif
#endif /* ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX */