Merge remote-tracking branch 'upstream/master'

16 files changed, 235 insertions, 126 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index f6c7a11ea..85892d3fe 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -135,7 +135,7 @@ config FEATURE_NON_POSIX_CP
           and create a regular file. This does not conform to POSIX,
           but prevents a symlink attack.
           Similarly, "cp file device" will not send file's data
-          to the device.
+          to the device. (To do that, use "cat file >device")
 
 config FEATURE_VERBOSE_CP_MESSAGE
         bool "Give more precise messages when copy fails (cp, mv etc)"
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index e3866e456..b88fa8fe7 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -159,6 +159,7 @@ lib-$(CONFIG_RTCWAKE) += rtc.o
 
 lib-$(CONFIG_IOSTAT) += get_cpu_count.o
 lib-$(CONFIG_MPSTAT) += get_cpu_count.o
+lib-$(CONFIG_POWERTOP) += get_cpu_count.o
 
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
 # require regex.h to be in the include dir even if we don't need it thereby
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3b691f945..b1c772cf3 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -28,7 +28,11 @@
  */
 #include "busybox.h"
 #include <assert.h>
-#include <malloc.h>
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+        || defined(__APPLE__) \
+    )
+# include <malloc.h> /* for mallopt */
+#endif
 /* Try to pull in PAGE_SIZE */
 #ifdef __linux__
 # include <sys/user.h>
@@ -66,7 +70,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "unarchive.h"
+# include "archive.h"
 static const char *unpack_usage_messages(void)
 {
         char *outbuf = NULL;
@@ -75,7 +79,7 @@ static const char *unpack_usage_messages(void)
 
         i = start_bunzip(&bd,
                         /* src_fd: */ -1,
-                        /* inbuf:  */ (void *)packed_usage,
+                        /* inbuf:  */ packed_usage,
                         /* len:    */ sizeof(packed_usage));
         /* read_bunzip can longjmp to start_bunzip, and ultimately
          * end up here with i != 0 on read data errors! Not trivial */
@@ -103,14 +107,13 @@ void FAST_FUNC bb_show_usage(void)
         if (ENABLE_SHOW_USAGE) {
 #ifdef SINGLE_APPLET_STR
                 /* Imagine that this applet is "true". Dont suck in printf! */
-                const char *p;
-                const char *usage_string = p = unpack_usage_messages();
+                const char *usage_string = unpack_usage_messages();
 
-                if (*p == '\b') {
+                if (*usage_string == '\b') {
                         full_write2_str("No help available.\n\n");
                 } else {
                         full_write2_str("Usage: "SINGLE_APPLET_STR" ");
-                        full_write2_str(p);
+                        full_write2_str(usage_string);
                         full_write2_str("\n\n");
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
@@ -228,7 +231,7 @@ bool re_execed;
 
 IF_FEATURE_SUID(static uid_t ruid;)  /* real uid */
 
-#if ENABLE_FEATURE_SUID_CONFIG
+# if ENABLE_FEATURE_SUID_CONFIG
 
 /* applets[] is const, so we have to define this "override" structure */
 static struct BB_suid_config {
@@ -499,15 +502,15 @@ static void parse_config_file(void)
                 sct_head = sct;
         }
 }
-#else
+# else
 static inline void parse_config_file(void)
 {
         IF_FEATURE_SUID(ruid = getuid();)
 }
-#endif /* FEATURE_SUID_CONFIG */
+# endif /* FEATURE_SUID_CONFIG */
 
 
-#if ENABLE_FEATURE_SUID
+# if ENABLE_FEATURE_SUID
 static void check_suid(int applet_no)
 {
         gid_t rgid;  /* real gid */
@@ -516,7 +519,7 @@ static void check_suid(int applet_no)
                 return; /* run by root - no need to check more */
         rgid = getgid();
 
-#if ENABLE_FEATURE_SUID_CONFIG
+#  if ENABLE_FEATURE_SUID_CONFIG
         if (suid_cfg_readable) {
                 uid_t uid;
                 struct BB_suid_config *sct;
@@ -559,7 +562,7 @@ static void check_suid(int applet_no)
                         bb_perror_msg_and_die("setresuid");
                 return;
         }
-#if !ENABLE_FEATURE_SUID_CONFIG_QUIET
+#   if !ENABLE_FEATURE_SUID_CONFIG_QUIET
         {
                 static bool onetime = 0;
 
@@ -568,9 +571,9 @@ static void check_suid(int applet_no)
                         fprintf(stderr, "Using fallback suid method\n");
                 }
         }
-#endif
+#   endif
  check_need_suid:
-#endif
+#  endif
         if (APPLET_SUID(applet_no) == _BB_SUID_REQUIRE) {
                 /* Real uid is not 0. If euid isn't 0 too, suid bit
                  * is most probably not set on our executable */
@@ -581,25 +584,24 @@ static void check_suid(int applet_no)
                 xsetuid(ruid);
         }
 }
-#else
-#define check_suid(x) ((void)0)
-#endif /* FEATURE_SUID */
+# else
+#  define check_suid(x) ((void)0)
+# endif /* FEATURE_SUID */
 
 
-#if ENABLE_FEATURE_INSTALLER
+# if ENABLE_FEATURE_INSTALLER
 static const char usr_bin [] ALIGN1 = "/usr/bin/";
 static const char usr_sbin[] ALIGN1 = "/usr/sbin/";
 static const char *const install_dir[] = {
         &usr_bin [8], /* "/" */
         &usr_bin [4], /* "/bin/" */
         &usr_sbin[4]  /* "/sbin/" */
-# if !ENABLE_INSTALL_NO_USR
+#  if !ENABLE_INSTALL_NO_USR
         ,usr_bin
         ,usr_sbin
-# endif
+#  endif
 };
 
-
 /* create (sym)links for each applet */
 static void install_links(const char *busybox, int use_symbolic_links,
                 char *custom_install_dir)
@@ -629,9 +631,9 @@ static void install_links(const char *busybox, int use_symbolic_links,
                 free(fpc);
         }
 }
-#else
-# define install_links(x,y,z) ((void)0)
-#endif
+# else
+#  define install_links(x,y,z) ((void)0)
+# endif
 
 /* If we were called as "busybox..." */
 static int busybox_main(char **argv)
@@ -696,10 +698,10 @@ static int busybox_main(char **argv)
                 const char *a = applet_names;
                 dup2(1, 2);
                 while (*a) {
-#if ENABLE_FEATURE_INSTALLER
+# if ENABLE_FEATURE_INSTALLER
                         if (argv[1][6]) /* --list-path? */
                                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
-#endif
+# endif
                         full_write2_str(a);
                         full_write2_str("\n");
                         i++;
@@ -772,7 +774,7 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
         int applet = find_applet_by_name(name);
         if (applet >= 0)
                 run_applet_no_and_exit(applet, argv);
-        if (!strncmp(name, "busybox", 7))
+        if (strncmp(name, "busybox", 7) == 0)
                 exit(busybox_main(argv));
 }
 
@@ -804,14 +806,6 @@ int main(int argc UNUSED_PARAM, char **argv)
         mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256);
 #endif
 
-#if defined(SINGLE_APPLET_MAIN)
-        /* Only one applet is selected by the user! */
-        /* applet_names in this case is just "applet\0\0" */
-        lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
-        return SINGLE_APPLET_MAIN(argc, argv);
-#else
-        lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
-
 #if !BB_MMU
         /* NOMMU re-exec trick sets high-order bit in first byte of name */
         if (argv[0][0] & 0x80) {
@@ -819,6 +813,19 @@ int main(int argc UNUSED_PARAM, char **argv)
                 argv[0][0] &= 0x7f;
         }
 #endif
+
+#if defined(SINGLE_APPLET_MAIN)
+        /* Only one applet is selected in .config */
+        if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
+                /* "busybox <applet> <params>" should still work as expected */
+                argv++;
+        }
+        /* applet_names in this case is just "applet\0\0" */
+        lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv));
+        return SINGLE_APPLET_MAIN(argc, argv);
+#else
+        lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
+
         applet_name = argv[0];
         if (applet_name[0] == '-')
                 applet_name++;
diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c
index 32c86cea8..8436cd664 100644
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -29,14 +29,15 @@ static char *find_block_device_in_dir(struct arena *ap)
         char *retpath = NULL;
         int len, rem;
 
-        dir = opendir(ap->devpath);
-        if (!dir)
-                return NULL;
-
         len = strlen(ap->devpath);
         rem = DEVNAME_MAX-2 - len;
         if (rem <= 0)
                 return NULL;
+
+        dir = opendir(ap->devpath);
+        if (!dir)
+                return NULL;
+
         ap->devpath[len++] = '/';
 
         while ((entry = readdir(dir)) != NULL) {
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index ab77755fc..187cb3a79 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -115,7 +115,7 @@ const char *opt_complementary
         found.
 
  "ww"   Adjacent double options have a counter associated which indicates
-        the number of occurences of the option.
+        the number of occurrences of the option.
         For example the ps applet needs:
         if w is given once, GNU ps sets the width to 132,
         if w is given more than once, it is "unlimited"
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index e427f6080..b87d1dde8 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -158,11 +158,11 @@ static void FAST_FUNC md5_process_block64(md5_ctx_t *ctx)
         };
         static const char P_array[] ALIGN1 = {
 # if MD5_SIZE_VS_SPEED > 1
-                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,   /* 1 */
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* 1 */
 # endif
-                1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12,   /* 2 */
-                5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2,   /* 3 */
-                0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9    /* 4 */
+                1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, /* 2 */
+                5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, /* 3 */
+                0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9  /* 4 */
         };
 #endif
         uint32_t *words = (void*) ctx->wbuffer;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 182dfac13..f9658711a 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -94,8 +94,10 @@ static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); }
 #endif
 
 
-#define SEQ_CLEAR_TILL_END_OF_SCREEN "\033[J"
-//#define SEQ_CLEAR_TILL_END_OF_LINE   "\033[K"
+#define ESC "\033"
+
+#define SEQ_CLEAR_TILL_END_OF_SCREEN  ESC"[J"
+//#define SEQ_CLEAR_TILL_END_OF_LINE  ESC"[K"
 
 
 enum {
@@ -446,7 +448,7 @@ static void input_backward(unsigned num)
                         } while (--num);
                         return;
                 }
-                printf("\033[%uD", num);
+                printf(ESC"[%uD", num);
                 return;
         }
 
@@ -471,7 +473,7 @@ static void input_backward(unsigned num)
                  */
                 unsigned sv_cursor;
                 /* go to 1st column; go up to first line */
-                printf("\r" "\033[%uA", cmdedit_y);
+                printf("\r" ESC"[%uA", cmdedit_y);
                 cmdedit_y = 0;
                 sv_cursor = cursor;
                 put_prompt(); /* sets cursor to 0 */
@@ -488,12 +490,12 @@ static void input_backward(unsigned num)
                 cmdedit_x = (width * cmdedit_y - num) % width;
                 cmdedit_y -= lines_up;
                 /* go to 1st column; go up */
-                printf("\r" "\033[%uA", lines_up);
+                printf("\r" ESC"[%uA", lines_up);
                 /* go to correct column.
                  * xterm, konsole, Linux VT interpret 0 as 1 below! wow.
                  * need to *make sure* we skip it if cmdedit_x == 0 */
                 if (cmdedit_x)
-                        printf("\033[%uC", cmdedit_x);
+                        printf(ESC"[%uC", cmdedit_x);
         }
 }
 
@@ -501,7 +503,7 @@ static void input_backward(unsigned num)
 static void redraw(int y, int back_cursor)
 {
         if (y > 0) /* up y lines */
-                printf("\033[%uA", y);
+                printf(ESC"[%uA", y);
         bb_putchar('\r');
         put_prompt();
         put_till_end_and_adv_cursor();
@@ -582,6 +584,12 @@ static void input_forward(void)
 
 #if ENABLE_FEATURE_TAB_COMPLETION
 
+//FIXME:
+//needs to be more clever: currently it thinks that "foo\ b<TAB>
+//matches the file named "foo bar", which is untrue.
+//Also, perhaps "foo b<TAB> needs to complete to "foo bar" <cursor>,
+//not "foo bar <cursor>...
+
 static void free_tab_completion_data(void)
 {
         if (matches) {
@@ -599,7 +607,7 @@ static void add_match(char *matched)
         num_matches++;
 }
 
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
 /* Replace "~user/..." with "/homedir/...".
  * The parameter is malloced, free it or return it
  * unchanged if no user is matched.
@@ -655,7 +663,7 @@ static NOINLINE unsigned complete_username(const char *ud)
 
         return 1 + userlen;
 }
-#endif  /* FEATURE_USERNAME_COMPLETION */
+# endif  /* FEATURE_USERNAME_COMPLETION */
 
 enum {
         FIND_EXE_ONLY = 0,
@@ -740,10 +748,10 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 pfind++;
                 /* dirbuf = ".../.../.../" */
                 dirbuf = xstrndup(command, pfind - command);
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
                 if (dirbuf[0] == '~')   /* ~/... or ~user/... */
                         dirbuf = username_path_completion(dirbuf);
-#endif
+# endif
                 path1[0] = dirbuf;
         }
         pf_len = strlen(pfind);
@@ -1021,13 +1029,18 @@ static void showfiles(void)
         }
 }
 
-static char *add_quote_for_spec_chars(char *found)
+static const char *is_special_char(char c)
+{
+        return strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", c);
+}
+
+static char *quote_special_chars(char *found)
 {
         int l = 0;
         char *s = xzalloc((strlen(found) + 1) * 2);
 
         while (*found) {
-                if (strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", *found))
+                if (is_special_char(*found))
                         s[l++] = '\\';
                 s[l++] = *found++;
         }
@@ -1044,10 +1057,10 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         /* Length of string used for matching */
         unsigned match_pfx_len = match_pfx_len;
         int find_type;
-#if ENABLE_UNICODE_SUPPORT
+# if ENABLE_UNICODE_SUPPORT
         /* cursor pos in command converted to multibyte form */
         int cursor_mb;
-#endif
+# endif
         if (!(state->flags & TAB_COMPLETION))
                 return;
 
@@ -1074,9 +1087,9 @@ static NOINLINE void input_tab(smallint *lastWasTab)
          * (we then also (ab)use this extra space later - see (**))
          */
         match_buf = xmalloc(MAX_LINELEN * sizeof(int16_t));
-#if !ENABLE_UNICODE_SUPPORT
+# if !ENABLE_UNICODE_SUPPORT
         save_string(match_buf, cursor + 1); /* +1 for NUL */
-#else
+# else
         {
                 CHAR_T wc = command_ps[cursor];
                 command_ps[cursor] = BB_NUL;
@@ -1084,26 +1097,37 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 command_ps[cursor] = wc;
                 cursor_mb = strlen(match_buf);
         }
-#endif
+# endif
         find_type = build_match_prefix(match_buf);
 
         /* Free up any memory already allocated */
         free_tab_completion_data();
 
-#if ENABLE_FEATURE_USERNAME_COMPLETION
-        /* If the word starts with `~' and there is no slash in the word,
+# if ENABLE_FEATURE_USERNAME_COMPLETION
+        /* If the word starts with ~ and there is no slash in the word,
          * then try completing this word as a username. */
         if (state->flags & USERNAME_COMPLETION)
                 if (match_buf[0] == '~' && strchr(match_buf, '/') == NULL)
                         match_pfx_len = complete_username(match_buf);
-#endif
-        /* Try to match a command in $PATH, or a directory, or a file */
+# endif
+        /* If complete_username() did not match,
+         * try to match a command in $PATH, or a directory, or a file */
         if (!matches)
                 match_pfx_len = complete_cmd_dir_file(match_buf, find_type);
+
+        /* Account for backslashes which will be inserted
+         * by quote_special_chars() later */
+        {
+                const char *e = match_buf + strlen(match_buf);
+                const char *s = e - match_pfx_len;
+                while (s < e)
+                        if (is_special_char(*s++))
+                                match_pfx_len++;
+        }
+
         /* Remove duplicates */
         if (matches) {
-                unsigned i;
-                unsigned n = 0;
+                unsigned i, n = 0;
                 qsort_string_vector(matches, num_matches);
                 for (i = 0; i < num_matches - 1; ++i) {
                         //if (matches[i] && matches[i+1]) { /* paranoia */
@@ -1118,6 +1142,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 matches[n++] = matches[i];
                 num_matches = n;
         }
+
         /* Did we find exactly one match? */
         if (num_matches != 1) { /* no */
                 char *cp;
@@ -1139,7 +1164,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         goto ret; /* no */
                 }
                 *cp = '\0';
-                cp = add_quote_for_spec_chars(chosen_match);
+                cp = quote_special_chars(chosen_match);
                 free(chosen_match);
                 chosen_match = cp;
                 len_found = strlen(chosen_match);
@@ -1147,7 +1172,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 /* Next <tab> is not a double-tab */
                 *lastWasTab = 0;
 
-                chosen_match = add_quote_for_spec_chars(matches[0]);
+                chosen_match = quote_special_chars(matches[0]);
                 len_found = strlen(chosen_match);
                 if (chosen_match[len_found-1] != '/') {
                         chosen_match[len_found] = ' ';
@@ -1155,7 +1180,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 }
         }
 
-#if !ENABLE_UNICODE_SUPPORT
+# if !ENABLE_UNICODE_SUPPORT
         /* Have space to place the match? */
         /* The result consists of three parts with these lengths: */
         /* cursor + (len_found - match_pfx_len) + (command_len - cursor) */
@@ -1172,7 +1197,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 /* write out the matched command */
                 redraw(cmdedit_y, command_len - pos);
         }
-#else
+# else
         {
                 /* Use 2nd half of match_buf as scratch space - see (**) */
                 char *command = match_buf + MAX_LINELEN;
@@ -1196,7 +1221,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         redraw(cmdedit_y, pos >= 0 ? pos : 0);
                 }
         }
-#endif
+# endif
  ret:
         free(chosen_match);
         free(match_buf);
@@ -1342,7 +1367,7 @@ static void save_history(char *str)
         int fd;
         int len, len2;
 
-        fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0666);
+        fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0600);
         if (fd < 0)
                 return;
         xlseek(fd, 0, SEEK_END); /* paranoia */
@@ -1357,10 +1382,8 @@ static void save_history(char *str)
         /* did we write so much that history file needs trimming? */
         state->cnt_history_in_file++;
         if (state->cnt_history_in_file > MAX_HISTORY * 4) {
-                FILE *fp;
                 char *new_name;
                 line_input_t *st_temp;
-                int i;
 
                 /* we may have concurrently written entries from others.
                  * load them */
@@ -1370,8 +1393,12 @@ static void save_history(char *str)
 
                 /* write out temp file and replace hist_file atomically */
                 new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
-                fp = fopen_for_write(new_name);
-                if (fp) {
+                fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+                if (fd >= 0) {
+                        FILE *fp;
+                        int i;
+
+                        fp = xfdopen_for_write(fd);
                         for (i = 0; i < st_temp->cnt_history; i++)
                                 fprintf(fp, "%s\n", st_temp->history[i]);
                         fclose(fp);
@@ -1634,7 +1661,7 @@ static void ask_terminal(void)
         pfd.events = POLLIN;
         if (safe_poll(&pfd, 1, 0) == 0) {
                 S.sent_ESC_br6n = 1;
-                fputs("\033" "[6n", stdout);
+                fputs(ESC"[6n", stdout);
                 fflush_all(); /* make terminal see it ASAP! */
         }
 }
@@ -2089,7 +2116,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 case CTRL('L'):
                 vi_case(CTRL('L')|VI_CMDMODE_BIT:)
                         /* Control-l -- clear screen */
-                        printf("\033[H"); /* cursor to top,left */
+                        printf(ESC"[H"); /* cursor to top,left */
                         redraw(0, command_len - cursor);
                         break;
 #if MAX_HISTORY > 0
diff --git a/libbb/procps.c b/libbb/procps.c
index ec43b221e..fcf86d9bb 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -303,6 +303,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                                 goto got_entry;
                         closedir(sp->task_dir);
                         sp->task_dir = NULL;
+                        sp->main_thread_pid = 0;
                 }
 #endif
                 entry = readdir(sp->dir);
@@ -322,6 +323,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                         char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3];
                         sprintf(task_dir, "/proc/%u/task", pid);
                         sp->task_dir = xopendir(task_dir);
+                        sp->main_thread_pid = pid;
                         continue;
                 }
 #endif
diff --git a/libbb/pw_encrypt_sha.c b/libbb/pw_encrypt_sha.c
index 070e0d442..8aeaacad6 100644
--- a/libbb/pw_encrypt_sha.c
+++ b/libbb/pw_encrypt_sha.c
@@ -3,7 +3,7 @@
  */
 
 /* Prefix for optional rounds specification.  */
-static const char str_rounds[] = "rounds=%u$";
+static const char str_rounds[] ALIGN1 = "rounds=%u$";
 
 /* Maximum salt string length.  */
 #define SALT_LEN_MAX 16
@@ -19,8 +19,8 @@ NOINLINE
 sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 {
         void (*sha_begin)(void *ctx) FAST_FUNC;
-        void (*sha_hash)(const void *buffer, size_t len, void *ctx) FAST_FUNC;
-        void (*sha_end)(void *resbuf, void *ctx) FAST_FUNC;
+        void (*sha_hash)(void *ctx, const void *buffer, size_t len) FAST_FUNC;
+        void (*sha_end)(void *ctx, void *resbuf) FAST_FUNC;
         int _32or64;
 
         char *result, *resptr;
@@ -103,40 +103,40 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 
         /* Add KEY, SALT.  */
         sha_begin(&ctx);
-        sha_hash(key_data, key_len, &ctx);
-        sha_hash(salt_data, salt_len, &ctx);
+        sha_hash(&ctx, key_data, key_len);
+        sha_hash(&ctx, salt_data, salt_len);
 
         /* Compute alternate SHA sum with input KEY, SALT, and KEY.
            The final result will be added to the first context.  */
         sha_begin(&alt_ctx);
-        sha_hash(key_data, key_len, &alt_ctx);
-        sha_hash(salt_data, salt_len, &alt_ctx);
-        sha_hash(key_data, key_len, &alt_ctx);
-        sha_end(alt_result, &alt_ctx);
+        sha_hash(&alt_ctx, key_data, key_len);
+        sha_hash(&alt_ctx, salt_data, salt_len);
+        sha_hash(&alt_ctx, key_data, key_len);
+        sha_end(&alt_ctx, alt_result);
 
         /* Add result of this to the other context.  */
         /* Add for any character in the key one byte of the alternate sum.  */
         for (cnt = key_len; cnt > _32or64; cnt -= _32or64)
-                sha_hash(alt_result, _32or64, &ctx);
-        sha_hash(alt_result, cnt, &ctx);
+                sha_hash(&ctx, alt_result, _32or64);
+        sha_hash(&ctx, alt_result, cnt);
 
         /* Take the binary representation of the length of the key and for every
            1 add the alternate sum, for every 0 the key.  */
         for (cnt = key_len; cnt != 0; cnt >>= 1)
                 if ((cnt & 1) != 0)
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 else
-                        sha_hash(key_data, key_len, &ctx);
+                        sha_hash(&ctx, key_data, key_len);
 
         /* Create intermediate result.  */
-        sha_end(alt_result, &ctx);
+        sha_end(&ctx, alt_result);
 
         /* Start computation of P byte sequence.  */
         /* For every character in the password add the entire password.  */
         sha_begin(&alt_ctx);
         for (cnt = 0; cnt < key_len; ++cnt)
-                sha_hash(key_data, key_len, &alt_ctx);
-        sha_end(temp_result, &alt_ctx);
+                sha_hash(&alt_ctx, key_data, key_len);
+        sha_end(&alt_ctx, temp_result);
 
         /* NB: past this point, raw key_data is not used anymore */
 
@@ -153,8 +153,8 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
         /* For every character in the password add the entire password.  */
         sha_begin(&alt_ctx);
         for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
-                sha_hash(salt_data, salt_len, &alt_ctx);
-        sha_end(temp_result, &alt_ctx);
+                sha_hash(&alt_ctx, salt_data, salt_len);
+        sha_end(&alt_ctx, temp_result);
 
         /* NB: past this point, raw salt_data is not used anymore */
 
@@ -174,31 +174,31 @@ sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
 
                 /* Add key or last result.  */
                 if ((cnt & 1) != 0)
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
                 else
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 /* Add salt for numbers not divisible by 3.  */
                 if (cnt % 3 != 0)
-                        sha_hash(s_bytes, salt_len, &ctx);
+                        sha_hash(&ctx, s_bytes, salt_len);
                 /* Add key for numbers not divisible by 7.  */
                 if (cnt % 7 != 0)
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
                 /* Add key or last result.  */
                 if ((cnt & 1) != 0)
-                        sha_hash(alt_result, _32or64, &ctx);
+                        sha_hash(&ctx, alt_result, _32or64);
                 else
-                        sha_hash(p_bytes, key_len, &ctx);
+                        sha_hash(&ctx, p_bytes, key_len);
 
-                sha_end(alt_result, &ctx);
+                sha_end(&ctx, alt_result);
         }
 
         /* Append encrypted password to result buffer */
 //TODO: replace with something like
 //      bb_uuencode(cp, src, length, bb_uuenc_tbl_XXXbase64);
 #define b64_from_24bit(B2, B1, B0, N) \
-do {                                                    \
-        unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \
-        resptr = to64(resptr, w, N);                    \
+do { \
+        unsigned w = ((B2) << 16) | ((B1) << 8) | (B0); \
+        resptr = to64(resptr, w, N); \
 } while (0)
         if (is_sha512 == '5') {
                 unsigned i = 0;
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 7ca3d68c3..8664bc625 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -15,7 +15,7 @@
 )
 
 #if ZIPPED
-# include "unarchive.h"
+# include "archive.h"
 #endif
 
 
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index 3818d32be..89dc5bdf2 100644
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -15,17 +15,17 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
         p = s = start;
         do {
                 if (*p == '/') {
-                        if (*s == '/') {        /* skip duplicate (or initial) slash */
+                        if (*s == '/') {  /* skip duplicate (or initial) slash */
                                 continue;
                         }
                         if (*s == '.') {
-                                if (s[1] == '/' || !s[1]) {     /* remove extra '.' */
+                                if (s[1] == '/' || !s[1]) {  /* remove extra '.' */
                                         continue;
                                 }
                                 if ((s[1] == '.') && (s[2] == '/' || !s[2])) {
                                         ++s;
                                         if (p > start) {
-                                                while (*--p != '/')     /* omit previous dir */
+                                                while (*--p != '/')  /* omit previous dir */
                                                         continue;
                                         }
                                         continue;
@@ -35,8 +35,8 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
                 *++p = *s;
         } while (*++s);
 
-        if ((p == start) || (*p != '/')) {      /* not a trailing slash */
-                ++p;                                    /* so keep last character */
+        if ((p == start) || (*p != '/')) {  /* not a trailing slash */
+                ++p;  /* so keep last character */
         }
         *p = '\0';
         return p;
diff --git a/libbb/time.c b/libbb/time.c
index 2a74d34c2..1eb2d75c2 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -93,6 +93,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                  *
                  * This coincides with the format of "touch -t TIME"
                  */
+                unsigned cur_year = ptm->tm_year;
                 int len = strchrnul(date_str, '.') - date_str;
 
                 /* MM[.SS] */
@@ -133,6 +134,17 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                         &end) >= 5) {
                         /* Adjust month from 1-12 to 0-11 */
                         ptm->tm_mon -= 1;
+                        if ((int)cur_year >= 50) { /* >= 1950 */
+                                /* Adjust year: */
+                                /* 1. Put it in the current century */
+                                ptm->tm_year += (cur_year / 100) * 100;
+                                /* 2. If too far in the past, +100 years */
+                                if (ptm->tm_year < cur_year - 50)
+                                        ptm->tm_year += 100;
+                                /* 3. If too far in the future, -100 years */
+                                if (ptm->tm_year > cur_year + 50)
+                                        ptm->tm_year -= 100;
+                        }
                 } else
                 /* ccyymmddHHMM[.SS] */
                 if (len == 12 && sscanf(date_str, "%4u%2u%2u%2u%2u%c",
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 9263859f5..8c78f5e20 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -7,6 +7,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//config:config FEATURE_RTMINMAX
+//config:       bool "Support RTMIN[+n] and RTMAX[-n] signal names"
+//config:       default y
+//config:       help
+//config:         Support RTMIN[+n] and RTMAX[-n] signal names
+//config:         in kill, killall etc. This costs ~250 bytes.
+
 #include "libbb.h"
 
 /* Believe it or not, but some arches have more than 32 SIGs!
@@ -117,6 +124,16 @@ static const char signals[][7] = {
 #ifdef SIGSYS
         [SIGSYS   ] = "SYS",
 #endif
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMIN
+        [__SIGRTMIN] = "RTMIN",
+# endif
+// This makes array about x2 bigger.
+// More compact approach is to special-case SIGRTMAX in print_signames()
+//# ifdef __SIGRTMAX
+//      [__SIGRTMAX] = "RTMAX",
+//# endif
+#endif
 };
 
 // Convert signal name to number.
@@ -134,20 +151,54 @@ int FAST_FUNC get_signum(const char *name)
                 if (strcasecmp(name, signals[i]) == 0)
                         return i;
 
-#if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO))
+#if ENABLE_DESKTOP
+# if defined(SIGIOT) || defined(SIGIO)
         /* SIGIO[T] are aliased to other names,
          * thus cannot be stored in the signals[] array.
          * Need special code to recognize them */
         if ((name[0] | 0x20) == 'i' && (name[1] | 0x20) == 'o') {
-#ifdef SIGIO
+#  ifdef SIGIO
                 if (!name[2])
                         return SIGIO;
-#endif
-#ifdef SIGIOT
+#  endif
+#  ifdef SIGIOT
                 if ((name[2] | 0x20) == 't' && !name[3])
                         return SIGIOT;
-#endif
+#  endif
         }
+# endif
+#endif
+
+#if ENABLE_FEATURE_RTMINMAX
+# if defined(SIGRTMIN) && defined(SIGRTMAX)
+/* libc may use some rt sigs for pthreads and therefore "remap" SIGRTMIN/MAX,
+ * but we want to use "raw" SIGRTMIN/MAX. Underscored names, if exist, provide
+ * them. If they don't exist, fall back to non-underscored ones: */
+#  if !defined(__SIGRTMIN)
+#   define __SIGRTMIN SIGRTMIN
+#  endif
+#  if !defined(__SIGRTMAX)
+#   define __SIGRTMAX SIGRTMAX
+#  endif
+        if (strncasecmp(name, "RTMIN", 5) == 0) {
+                if (!name[5])
+                        return __SIGRTMIN;
+                if (name[5] == '+') {
+                        i = bb_strtou(name + 6, NULL, 10);
+                        if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                                return __SIGRTMIN + i;
+                }
+        }
+        else if (strncasecmp(name, "RTMAX", 5) == 0) {
+                if (!name[5])
+                        return __SIGRTMAX;
+                if (name[5] == '-') {
+                        i = bb_strtou(name + 6, NULL, 10);
+                        if (!errno && i <= __SIGRTMAX - __SIGRTMIN)
+                                return __SIGRTMAX - i;
+                }
+        }
+# endif
 #endif
 
         return -1;
@@ -175,6 +226,11 @@ void FAST_FUNC print_signames(void)
         for (signo = 1; signo < ARRAY_SIZE(signals); signo++) {
                 const char *name = signals[signo];
                 if (name[0])
-                        puts(name);
+                        printf("%2u) %s\n", signo, name);
         }
+#if ENABLE_FEATURE_RTMINMAX
+# ifdef __SIGRTMAX
+        printf("%2u) %s\n", __SIGRTMAX, "RTMAX");
+# endif
+#endif
 }
diff --git a/libbb/unicode.c b/libbb/unicode.c
index 70c6abe00..cf0c6bed9 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -1005,8 +1005,11 @@ static char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char
                                 d++;
                         }
                 }
-                if (stats)
-                        stats->byte_count = stats->unicode_count = (d - dst);
+                if (stats) {
+                        stats->byte_count = (d - dst);
+                        stats->unicode_count = (d - dst);
+                        stats->unicode_width = (d - dst);
+                }
                 return dst;
         }
 
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index dc5029223..a30af6f72 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -58,7 +58,7 @@ static void check_selinux_update_passwd(const char *username)
  6) delete a user from a group: update_passwd(FILE, GROUP, NULL, MEMBER)
     only if CONFIG_FEATURE_DEL_USER_FROM_GROUP=y and member != NULL
 
- 7) change user's passord: update_passwd(FILE, USER, NEW_PASSWD, NULL)
+ 7) change user's password: update_passwd(FILE, USER, NEW_PASSWD, NULL)
     only if CONFIG_PASSWD=y and applet_name[0] == 'p' like in passwd
     or if CONFIG_CHPASSWD=y and applet_name[0] == 'c' like in chpasswd
 
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 07504b75b..a02a504b0 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -234,7 +234,7 @@ static int wh_helper(int value, int def_val, const char *env_name, int *err)
                 char *s = getenv(env_name);
                 if (s) {
                         value = atoi(s);
-                        /* If LINES/COLUMNS are set, pretent that there is
+                        /* If LINES/COLUMNS are set, pretend that there is
                          * no error getting w/h, this prevents some ugly
                          * cursor tricks by our callers */
                         *err = 0;