diff options
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/kill.c | 7 | ||||
| -rw-r--r-- | procps/ps.c | 4 |
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 */ |