Merge branch 'busybox' into merge

2 files changed, 7 insertions, 6 deletions

diff --git a/procps/kill.c b/procps/kill.c
index 5cff24475..09beefb2d 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -188,7 +188,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                 arg = *++argv;
         } /* else it must be -SIG */
         signo = get_signum(arg);
-        if (signo < 0) { /* || signo > MAX_SIGNUM ? */
+        if (signo < 0) {
                 bb_error_msg("bad signal name '%s'", arg);
                 return EXIT_FAILURE;
         }
diff --git a/procps/ps.c b/procps/ps.c
index c1da921bd..3e83a3e03 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -345,6 +345,11 @@ static void func_pgid(char *buf, int size, const procps_status_t *ps)
         sprintf(buf, "%*u", size, ps->pgid);
 }
 
+static void func_sid(char *buf, int size, const procps_status_t *ps)
+{
+        sprintf(buf, "%*u", size, ps->sid);
+}
+
 static void put_lu(char *buf, int size, unsigned long u)
 {
         char buf4[5];
@@ -430,11 +435,6 @@ static void func_label(char *buf, int size, const procps_status_t *ps)
 #endif
 
 /*
-static void func_nice(char *buf, int size, const procps_status_t *ps)
-{
-        ps->???
-}
-
 static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 {
 }
@@ -471,6 +471,7 @@ static const ps_out_t out_spec[] = {
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
         { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
 /* Not mandated, but useful: */
+        { 5                  , "sid"   ,"SID"    ,func_sid   ,PSSCAN_SID     },
         { 4                  , "stat"  ,"STAT"   ,func_state ,PSSCAN_STATE   },
         { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
 #endif