Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

3 files changed, 58 insertions, 13 deletions

diff --git a/procps/kill.c b/procps/kill.c
index 3da39f030..e6f27af50 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -208,9 +208,27 @@ int kill_main(int argc, char **argv)
 
         /* Looks like they want to do a kill. Do that */
         while (arg) {
-                /* Support shell 'space' trick */
-                if (arg[0] == ' ')
-                        arg++;
+#if ENABLE_ASH || ENABLE_HUSH
+                /*
+                 * We need to support shell's "hack formats" of
+                 * " -PRGP_ID" (yes, with a leading space)
+                 * and " PID1 PID2 PID3" (with degenerate case "")
+                 */
+                while (*arg != '\0') {
+                        char *end;
+                        if (*arg == ' ')
+                                arg++;
+                        pid = bb_strtoi(arg, &end, 10);
+                        if (errno && (errno != EINVAL || *end != ' ')) {
+                                bb_error_msg("invalid number '%s'", arg);
+                                errors++;
+                        } else if (kill(pid, signo) != 0) {
+                                bb_perror_msg("can't kill pid %d", (int)pid);
+                                errors++;
+                        }
+                        arg = end; /* can only point to ' ' or '\0' now */
+                }
+#else
                 pid = bb_strtoi(arg, NULL, 10);
                 if (errno) {
                         bb_error_msg("invalid number '%s'", arg);
@@ -219,6 +237,7 @@ int kill_main(int argc, char **argv)
                         bb_perror_msg("can't kill pid %d", (int)pid);
                         errors++;
                 }
+#endif
                 arg = *++argv;
         }
         return errors;
diff --git a/procps/ps.c b/procps/ps.c
index 3f7437b38..c54618248 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -18,17 +18,36 @@ enum { MAX_WIDTH = 2*1024 };
 
 #include <sys/times.h> /* for times() */
 #ifndef AT_CLKTCK
-#define AT_CLKTCK 17
+# define AT_CLKTCK 17
 #endif
 
-
+/* TODO:
+ * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html
+ * specifies (for XSI-conformant systems) following default columns
+ * (l and f mark columns shown with -l and -f respectively):
+ * F     l   Flags (octal and additive) associated with the process (??)
+ * S     l   The state of the process
+ * UID   f,l The user ID; the login name is printed with -f
+ * PID       The process ID
+ * PPID  f,l The parent process
+ * C     f,l Processor utilization
+ * PRI   l   The priority of the process; higher numbers mean lower priority
+ * NI    l   Nice value
+ * ADDR  l   The address of the process
+ * SZ    l   The size in blocks of the core image of the process
+ * WCHAN l   The event for which the process is waiting or sleeping
+ * STIME f   Starting time of the process
+ * TTY       The controlling terminal for the process
+ * TIME      The cumulative execution time for the process
+ * CMD       The command name; the full command line is shown with -f
+ */
 #if ENABLE_SELINUX
-#define SELINUX_O_PREFIX "label,"
-#define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+# define SELINUX_O_PREFIX "label,"
+# define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
 #elif ENABLE_PLATFORM_MINGW32
-#define DEFAULT_O_STR    ("pid,comm")
+# define DEFAULT_O_STR    ("pid,comm")
 #else
-#define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+# define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
 #endif
 
 typedef struct {
@@ -70,7 +89,8 @@ static ptrdiff_t find_elf_note(ptrdiff_t findme)
 {
         ptrdiff_t *ep = (ptrdiff_t *) environ;
 
-        while (*ep++);
+        while (*ep++)
+                continue;
         while (*ep) {
                 if (ep[0] == findme) {
                         return ep[1];
@@ -186,6 +206,11 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
         safe_strncpy(buf, ps->comm, size+1);
 }
 
+static void func_stat(char *buf, int size, const procps_status_t *ps)
+{
+        safe_strncpy(buf, ps->state, size+1);
+}
+
 static void func_args(char *buf, int size, const procps_status_t *ps)
 {
         read_cmdline(buf, size+1, ps->pid, ps->comm);
@@ -302,7 +327,7 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps)
 */
 
 static const ps_out_t out_spec[] = {
-// Mandated by POSIX:
+/* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
 #if !ENABLE_PLATFORM_MINGW32
         { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
         { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
@@ -331,7 +356,8 @@ static const ps_out_t out_spec[] = {
 #if !ENABLE_PLATFORM_MINGW32
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
         { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
-// Not mandated by POSIX, but useful:
+/* Not mandated, but useful: */
+        { 4                  , "stat"  ,"STAT"   ,func_stat  ,PSSCAN_STAT    },
         { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
 #endif
 #if ENABLE_SELINUX
diff --git a/procps/pstree.c b/procps/pstree.c
index ddf5dba59..4cd8cb458 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -76,7 +76,7 @@ struct globals {
 };
 #define G (*ptr_to_globals)
 #define INIT_G() do { \
-        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
 } while (0)