Merge branch 'busybox' into merge

Conflicts:
	archival/Config.src
	shell/ash.c

6 files changed, 31 insertions, 36 deletions

diff --git a/procps/kill.c b/procps/kill.c
index cd189bcd6..c5c7a8d72 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -60,7 +60,7 @@
  * This is needed to avoid collision with kill -9 ... syntax
  */
 
-int kill_main(int argc, char **argv)
+int kill_main(int argc UNUSED_PARAM, char **argv)
 {
         char *arg;
         pid_t pid;
@@ -79,10 +79,9 @@ int kill_main(int argc, char **argv)
 #endif
 
         /* Parse any options */
-        argc--;
         arg = *++argv;
 
-        if (argc < 1 || arg[0] != '-') {
+        if (!arg || arg[0] != '-') {
                 goto do_it_now;
         }
 
@@ -91,13 +90,14 @@ int kill_main(int argc, char **argv)
          * echo "Died of SIG`kill -l $?`"
          * We try to mimic what kill from coreutils-6.8 does */
         if (arg[1] == 'l' && arg[2] == '\0') {
-                if (argc == 1) {
+                arg = *++argv;
+                if (!arg) {
                         /* Print the whole signal list */
                         print_signames();
                         return 0;
                 }
                 /* -l <sig list> */
-                while ((arg = *++argv)) {
+                do {
                         if (isdigit(arg[0])) {
                                 signo = bb_strtou(arg, NULL, 10);
                                 if (errno) {
@@ -118,8 +118,8 @@ int kill_main(int argc, char **argv)
                                 }
                                 printf("%d\n", signo);
                         }
-                }
-                /* If they specified -l, we are all done */
+                        arg = *++argv;
+                } while (arg);
                 return EXIT_SUCCESS;
         }
 
@@ -127,8 +127,7 @@ int kill_main(int argc, char **argv)
         if (killall && arg[1] == 'q' && arg[2] == '\0') {
                 quiet = 1;
                 arg = *++argv;
-                argc--;
-                if (argc < 1)
+                if (!arg)
                         bb_show_usage();
                 if (arg[0] != '-')
                         goto do_it_now;
@@ -140,8 +139,7 @@ int kill_main(int argc, char **argv)
         if (killall5 && arg[0] == 'o')
                 goto do_it_now;
 
-        if (argc > 1 && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
-                argc--;
+        if (argv[1] && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
                 arg = *++argv;
         } /* else it must be -SIG */
         signo = get_signum(arg);
@@ -150,7 +148,6 @@ int kill_main(int argc, char **argv)
                 return EXIT_FAILURE;
         }
         arg = *++argv;
-        argc--;
 
  do_it_now:
         pid = getpid();
@@ -158,7 +155,8 @@ int kill_main(int argc, char **argv)
         if (killall5) {
                 pid_t sid;
                 procps_status_t* p = NULL;
-                int ret = 0;
+                /* compat: exitcode 2 is "no one was signaled" */
+                int ret = 2;
 
                 /* Find out our session id */
                 sid = getsid(pid);
@@ -167,9 +165,10 @@ int kill_main(int argc, char **argv)
                         kill(-1, SIGSTOP);
                 /* Signal all processes except those in our session */
                 while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID)) != NULL) {
-                        int i;
+                        char **args;
 
                         if (p->sid == (unsigned)sid
+                         || p->sid == 0 /* compat: kernel thread, don't signal it */
                          || p->pid == (unsigned)pid
                          || p->pid == 1
                         ) {
@@ -178,18 +177,19 @@ int kill_main(int argc, char **argv)
 
                         /* All remaining args must be -o PID options.
                          * Check p->pid against them. */
-                        for (i = 0; i < argc; i++) {
+                        args = argv;
+                        while (*args) {
                                 pid_t omit;
 
-                                arg = argv[i];
+                                arg = *args++;
                                 if (arg[0] != '-' || arg[1] != 'o') {
                                         bb_error_msg("bad option '%s'", arg);
                                         ret = 1;
                                         goto resume;
                                 }
                                 arg += 2;
-                                if (!arg[0] && argv[++i])
-                                        arg = argv[i];
+                                if (!arg[0] && *args)
+                                        arg = *args++;
                                 omit = bb_strtoi(arg, NULL, 10);
                                 if (errno) {
                                         bb_error_msg("invalid number '%s'", arg);
@@ -200,6 +200,7 @@ int kill_main(int argc, char **argv)
                                         goto dont_kill;
                         }
                         kill(p->pid, signo);
+                        ret = 0;
  dont_kill: ;
                 }
  resume:
@@ -210,14 +211,14 @@ int kill_main(int argc, char **argv)
         }
 
         /* Pid or name is required for kill/killall */
-        if (argc < 1) {
+        if (!arg) {
                 bb_error_msg("you need to specify whom to kill");
                 return EXIT_FAILURE;
         }
 
         if (killall) {
                 /* Looks like they want to do a killall.  Do that */
-                while (arg) {
+                do {
                         pid_t* pidList;
 
                         pidList = find_pid_by_name(arg);
@@ -240,7 +241,7 @@ int kill_main(int argc, char **argv)
                         }
                         free(pidList);
                         arg = *++argv;
-                }
+                } while (arg);
                 return errors;
         }
 
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 6a3b32743..5d5b83b8d 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -333,8 +333,7 @@ static void scale(ullong ul)
         char buf[5];
 
         /* see http://en.wikipedia.org/wiki/Tera */
-        smart_ulltoa4(ul, buf, " kmgtpezy");
-        buf[4] = '\0';
+        smart_ulltoa4(ul, buf, " kmgtpezy")[0] = '\0';
         put(buf);
 }
 
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 8daf5b28a..1c7c7c48b 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -65,9 +65,9 @@ static void act(unsigned pid, char *cmd, int signo)
 {
         if (pgrep) {
                 if (option_mask32 & (1 << OPTBIT_L)) /* OPT_LIST */
-                        printf("%d %s\n", pid, cmd);
+                        printf("%u %s\n", pid, cmd);
                 else
-                        printf("%d\n", pid);
+                        printf("%u\n", pid);
         } else
                 kill(pid, signo);
 }
diff --git a/procps/powertop.c b/procps/powertop.c
index 71988a295..e3c29d1c3 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -627,7 +627,6 @@ static void show_timerstats(void)
                 int i, n = 0;
                 char strbuf6[6];
 
-                strbuf6[5] = '\0';
                 puts("\nTop causes for wakeups:");
                 for (i = 0; i < G.lines_cnt; i++) {
                         if ((G.lines[i].count > 0 /*|| G.lines[i].disk_count > 0*/)
@@ -639,7 +638,7 @@ static void show_timerstats(void)
                                 /*char c = ' ';
                                 if (G.lines[i].disk_count)
                                         c = 'D';*/
-                                smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY");
+                                smart_ulltoa5(G.lines[i].count, strbuf6, " KMGTPEZY")[0] = '\0';
                                 printf(/*" %5.1f%% (%s)%c  %s\n"*/
                                         " %5.1f%% (%s)   %s\n",
                                         G.lines[i].count * 100.0 / G.lines_cumulative_count,
diff --git a/procps/ps.c b/procps/ps.c
index 0dfda2039..32563776d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -299,8 +299,7 @@ static void put_lu(char *buf, int size, unsigned long u)
         char buf4[5];
 
         /* see http://en.wikipedia.org/wiki/Tera */
-        smart_ulltoa4(u, buf4, " mgtpezy");
-        buf4[4] = '\0';
+        smart_ulltoa4(u, buf4, " mgtpezy")[0] = '\0';
         sprintf(buf, "%.*s", size, buf4);
 }
 
@@ -750,8 +749,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #endif
                 {
                         char buf6[6];
-                        smart_ulltoa5(p->vsz, buf6, " mgtpezy");
-                        buf6[5] = '\0';
+                        smart_ulltoa5(p->vsz, buf6, " mgtpezy")[0] = '\0';
 #if ENABLE_FEATURE_PS_LONG
                         if (opts & OPT_l) {
                                 char bufr[6], stime_str[6];
@@ -762,8 +760,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                                 time_t start = now - elapsed;
                                 struct tm *tm = localtime(&start);
 
-                                smart_ulltoa5(p->rss, bufr, " mgtpezy");
-                                bufr[5] = '\0';
+                                smart_ulltoa5(p->rss, bufr, " mgtpezy")[0] = '\0';
 
                                 if (p->tty_major == 136)
                                         /* It should be pts/N, not ptsN, but N > 9
diff --git a/procps/top.c b/procps/top.c
index abee69806..51f1c1aed 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -677,7 +677,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
                 if (s->vsz >= 100000)
                         sprintf(vsz_str_buf, "%6ldm", s->vsz/1024);
                 else
-                        sprintf(vsz_str_buf, "%7ld", s->vsz);
+                        sprintf(vsz_str_buf, "%7lu", s->vsz);
                 /* PID PPID USER STAT VSZ %VSZ [%CPU] COMMAND */
                 col = snprintf(line_buf, scr_width,
                                 "\n" "%5u%6u %-8.8s %s%s" FMT
@@ -847,8 +847,7 @@ static void display_topmem_header(int scr_width, int *lines_rem_p)
 static void ulltoa6_and_space(unsigned long long ul, char buf[6])
 {
         /* see http://en.wikipedia.org/wiki/Tera */
-        smart_ulltoa5(ul, buf, " mgtpezy");
-        buf[5] = ' ';
+        smart_ulltoa5(ul, buf, " mgtpezy")[0] = ' ';
 }
 
 static NOINLINE void display_topmem_process_list(int lines_rem, int scr_width)