9 files changed, 76 insertions, 25 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 76c4d8ff3..0c0d14499 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -629,11 +629,11 @@ static int busybox_main(char **argv)
                 full_write2_str(bb_banner); /* reuse const string */
                 full_write2_str(" multi-call binary.\n"); /* reuse */
                 full_write2_str(
-                        "Copyright (C) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko\n"
-                        "and others. Licensed under GPLv2.\n"
-                        "See source distribution for full notice.\n"
+                        "BusyBox is copyrighted by many authors between 1998-2012.\n"
+                        "Licensed under GPLv2. See source distribution for detailed\n"
+                        "copyright notices.\n"
                         "\n"
-                        "Usage: busybox [function] [arguments]...\n"
+                        "Usage: busybox [function [arguments]...]\n"
                         "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
                         IF_FEATURE_INSTALLER(
                         "   or: busybox --install [-s] [DIR]\n"
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 6301589e6..7cabd33d0 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -41,12 +41,6 @@ int FAST_FUNC correct_password(const struct passwd *pw)
         char *unencrypted, *encrypted;
         const char *correct;
         int r;
-#if ENABLE_FEATURE_SHADOWPASSWDS
-        /* Using _r function to avoid pulling in static buffers */
-        struct spwd spw;
-        char buffer[256];
-#endif
-
         /* fake salt. crypt() can choke otherwise. */
         correct = "aa";
         if (!pw) {
@@ -55,7 +49,10 @@ int FAST_FUNC correct_password(const struct passwd *pw)
         }
         correct = pw->pw_passwd;
 #if ENABLE_FEATURE_SHADOWPASSWDS
+        /* Using _r function to avoid pulling in static buffers */
         if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+                struct spwd spw;
+                char buffer[256];
                 /* getspnam_r may return 0 yet set result to NULL.
                  * At least glibc 2.4 does this. Be extra paranoid here. */
                 struct spwd *result = NULL;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 6990b91b6..65dffe56d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2552,9 +2552,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                                         /* Delete word forward */
                                         int nc, sc = cursor;
                                         ctrl_right();
-                                        nc = cursor;
-                                        input_backward(cursor - sc);
-                                        while (--nc >= cursor)
+                                        nc = cursor - sc;
+                                        input_backward(nc);
+                                        while (--nc >= 0)
                                                 input_delete(1);
                                         break;
                                 }
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 8057f2cec..6f59fda29 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -114,6 +114,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                          * an error. */
                         if ((mode != -1) && (chmod(path, mode) < 0)) {
                                 fail_msg = "set permissions of";
+                                if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+                                        flags = 0;
+                                        goto print_err;
+                                }
                                 break;
                         }
                         goto ret0;
@@ -123,8 +127,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                 *s2 = c;
         } /* while (1) */
 
-        bb_perror_msg("can't %s directory '%s'", fail_msg, path);
         flags = -1;
+ print_err:
+        bb_perror_msg("can't %s directory '%s'", fail_msg, path);
         goto ret;
  ret0:
         flags = 0;
diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
new file mode 100644
index 000000000..c50308ba8
--- /dev/null
+++ b/libbb/missing_syscalls.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012, Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-$(CONFIG_PLATFORM_POSIX) += missing_syscalls.o
+
+/*#include <linux/timex.h> - for struct timex, but may collide with <time.h> */
+#include <sys/syscall.h>
+#include "libbb.h"
+
+#if defined(ANDROID) || defined(__ANDROID__)
+pid_t getsid(pid_t pid)
+{
+        return syscall(__NR_getsid, pid);
+}
+
+int stime(const time_t *t)
+{
+        struct timeval tv;
+        tv.tv_sec = *t;
+        tv.tv_usec = 0;
+        return settimeofday(&tv, NULL);
+}
+
+int sethostname(const char *name, size_t len)
+{
+        return syscall(__NR_sethostname, name, len);
+}
+
+struct timex;
+int adjtimex(struct timex *buf)
+{
+        return syscall(__NR_adjtimex, buf);
+}
+
+int pivot_root(const char *new_root, const char *put_old)
+{
+        return syscall(__NR_pivot_root, new_root, put_old);
+}
+#endif
diff --git a/libbb/procps.c b/libbb/procps.c
index dbae46e33..1080e0165 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -426,7 +426,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                         if (n < 11)
                                 continue; /* bogus data, get next /proc/XXX */
 # if ENABLE_FEATURE_TOP_SMP_PROCESS
-                        if (n < 11+15)
+                        if (n == 11)
                                 sp->last_seen_on_cpu = 0;
 # endif
 
diff --git a/libbb/read_key.c b/libbb/read_key.c
index 8d72d2a63..ace23defb 100644
--- a/libbb/read_key.c
+++ b/libbb/read_key.c
@@ -15,7 +15,10 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
         const char *seq;
         int n;
 
-        /* Known escape sequences for cursor and function keys */
+        /* Known escape sequences for cursor and function keys.
+         * See "Xterm Control Sequences"
+         * http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+         */
         static const char esccmds[] ALIGN1 = {
                 'O','A'        |0x80,KEYCODE_UP      ,
                 'O','B'        |0x80,KEYCODE_DOWN    ,
@@ -44,6 +47,8 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
                 /* ESC [ 1 ; 4 x, where x = A/B/C/D: Alt-Shift-<arrow> */
                 /* ESC [ 1 ; 5 x, where x = A/B/C/D: Ctrl-<arrow> - implemented below */
                 /* ESC [ 1 ; 6 x, where x = A/B/C/D: Ctrl-Shift-<arrow> */
+                /* ESC [ 1 ; 7 x, where x = A/B/C/D: Ctrl-Alt-<arrow> */
+                /* ESC [ 1 ; 8 x, where x = A/B/C/D: Ctrl-Alt-Shift-<arrow> */
                 '[','H'        |0x80,KEYCODE_HOME    , /* xterm */
                 '[','F'        |0x80,KEYCODE_END     , /* xterm */
                 /* [ESC] ESC [ [2] H - [Alt-][Shift-]Home (End similarly?) */
@@ -64,10 +69,10 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
                 '[','7','~'    |0x80,KEYCODE_HOME    , /* vt100? linux vt? or what? */
                 '[','8','~'    |0x80,KEYCODE_END     , /* vt100? linux vt? or what? */
 #if 0
-                '[','1','1','~'|0x80,KEYCODE_FUN1    ,
-                '[','1','2','~'|0x80,KEYCODE_FUN2    ,
-                '[','1','3','~'|0x80,KEYCODE_FUN3    ,
-                '[','1','4','~'|0x80,KEYCODE_FUN4    ,
+                '[','1','1','~'|0x80,KEYCODE_FUN1    , /* old xterm, deprecated by ESC O P */
+                '[','1','2','~'|0x80,KEYCODE_FUN2    , /* old xterm... */
+                '[','1','3','~'|0x80,KEYCODE_FUN3    , /* old xterm... */
+                '[','1','4','~'|0x80,KEYCODE_FUN4    , /* old xterm... */
                 '[','1','5','~'|0x80,KEYCODE_FUN5    ,
                 /* [ESC] ESC [ 1 5 [;2] ~ - [Alt-][Shift-]F5 */
                 '[','1','7','~'|0x80,KEYCODE_FUN6    ,
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 73229ca6c..4258656fe 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -37,9 +37,11 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
 
         /* Change the current working directory to be the home directory
          * of the user */
-        if (chdir(pw->pw_dir)) {
-                xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
-                bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+        if (!(flags & SETUP_ENV_NO_CHDIR)) {
+                if (chdir(pw->pw_dir) != 0) {
+                        bb_error_msg("can't change directory to '%s'", pw->pw_dir);
+                        xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
+                }
         }
 
         if (flags & SETUP_ENV_CLEARENV) {
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index d8a42ba0b..05aa07ce8 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -355,13 +355,13 @@ void FAST_FUNC xsetuid(uid_t uid)
 void FAST_FUNC xchdir(const char *path)
 {
         if (chdir(path))
-                bb_perror_msg_and_die("chdir(%s)", path);
+                bb_perror_msg_and_die("can't change directory to '%s'", path);
 }
 
 void FAST_FUNC xchroot(const char *path)
 {
         if (chroot(path))
-                bb_perror_msg_and_die("can't change root directory to %s", path);
+                bb_perror_msg_and_die("can't change root directory to '%s'", path);
         xchdir("/");
 }