Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

9 files changed, 216 insertions, 26 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 0ea8f43ab..aa442365a 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -94,6 +94,14 @@ config FEATURE_EDITING_SAVEHISTORY
         help
           Enable history saving in shells.
 
+config FEATURE_REVERSE_SEARCH
+        bool "Reverse history search"
+        default y
+        depends on FEATURE_EDITING_SAVEHISTORY
+        help
+          Enable readline-like Ctrl-R combination for reverse history search.
+          Increases code by about 0.5k.
+
 config FEATURE_TAB_COMPLETION
         bool "Tab completion"
         default y
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index fcab184e0..b5e9afc78 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -128,6 +128,15 @@ lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o
 lib-$(CONFIG_UNICODE_SUPPORT) += unicode.o
 lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o
 
+lib-$(CONFIG_NC) += udp_io.o
+lib-$(CONFIG_DNSD) += udp_io.o
+lib-$(CONFIG_NTPD) += udp_io.o
+lib-$(CONFIG_TFTP) += udp_io.o
+lib-$(CONFIG_TFTPD) += udp_io.o
+lib-$(CONFIG_TCPSVD) += udp_io.o
+lib-$(CONFIG_UDPSVD) += udp_io.o
+lib-$(CONFIG_TRACEROUTE) += udp_io.o
+
 lib-$(CONFIG_LOSETUP) += loop.o
 lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
 
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index b824b4775..6d002b0dd 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -627,7 +627,7 @@ 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-2009 Erik Andersen, Rob Landley, Denys Vlasenko\n"
+                        "Copyright (C) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko\n"
                         "and others. Licensed under GPLv2.\n"
                         "See source distribution for full notice.\n"
                         "\n"
diff --git a/libbb/die_if_bad_username.c b/libbb/die_if_bad_username.c
index 9946e3a1d..cf1297bd6 100644
--- a/libbb/die_if_bad_username.c
+++ b/libbb/die_if_bad_username.c
@@ -18,23 +18,45 @@
 
 void FAST_FUNC die_if_bad_username(const char *name)
 {
-        /* 1st char being dash or dot isn't valid: */
-        goto skip;
-        /* For example, name like ".." can make adduser
-         * chown "/home/.." recursively - NOT GOOD
+        const char *start = name;
+
+        /* 1st char being dash or dot isn't valid:
+         * for example, name like ".." can make adduser
+         * chown "/home/.." recursively - NOT GOOD.
+         * Name of just a single "$" is also rejected.
          */
+        goto skip;
 
         do {
-                if (*name == '-' || *name == '.')
+                unsigned char ch;
+
+                /* These chars are valid unless they are at the 1st pos: */
+                if (*name == '-'
+                 || *name == '.'
+                /* $ is allowed if it's the last char: */
+                 || (*name == '$' && !name[1])
+                ) {
                         continue;
+                }
  skip:
-                if (isalnum(*name)
-                 || *name == '_'
-                 || *name == '@'
-                 || (*name == '$' && !name[1])
+                ch = *name;
+                if (ch == '_'
+                /* || ch == '@' -- we disallow this too. Think about "user@host" */
+                /* open-coded isalnum: */
+                 || (ch >= '0' && ch <= '9')
+                 || ((ch|0x20) >= 'a' && (ch|0x20) <= 'z')
                 ) {
                         continue;
                 }
-                bb_error_msg_and_die("illegal character '%c'", *name);
+                bb_error_msg_and_die("illegal character with code %u at position %u",
+                                (unsigned)ch, (unsigned)(name - start));
         } while (*++name);
+
+        /* The minimum size of the login name is one char or two if
+         * last char is the '$'. Violations of this are caught above.
+         * The maximum size of the login name is LOGIN_NAME_MAX
+         * including the terminating null byte.
+         */
+        if (name - start >= LOGIN_NAME_MAX)
+                bb_error_msg_and_die("name is too long");
 }
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 02cbefec9..ae019b26b 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -467,13 +467,17 @@ getopt32(char **argv, const char *applet_opts, ...)
                 }
                 for (on_off = complementary; on_off->opt_char; on_off++)
                         if (on_off->opt_char == *s)
-                                break;
+                                goto found_opt;
+                /* Without this, diagnostic of such bugs is not easy */
+                bb_error_msg_and_die("NO OPT %c!", *s);
+ found_opt:
                 if (c == ':' && s[2] == ':') {
                         on_off->param_type = PARAM_LIST;
                         continue;
                 }
                 if (c == '+' && (s[2] == ':' || s[2] == '\0')) {
                         on_off->param_type = PARAM_INT;
+                        s++;
                         continue;
                 }
                 if (c == ':' || c == '\0') {
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 207720e96..7208db9ea 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -175,7 +175,8 @@ int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
                 return -1;
         }
         memcpy(sin6, ai->ai_addr, sizeof(*sin6));
-        freeaddrinfo(ai);
+        if (ai)
+                freeaddrinfo(ai);
         return 0;
 }
 
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e443c7a3e..1b97e8609 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -207,18 +207,21 @@ static void deinit_S(void)
 
 
 #if ENABLE_UNICODE_SUPPORT
-static size_t load_string(const char *src, int maxsize)
+static size_t load_string(const char *src)
 {
         if (unicode_status == UNICODE_ON) {
-                ssize_t len = mbstowcs(command_ps, src, maxsize - 1);
+                ssize_t len = mbstowcs(command_ps, src, S.maxsize - 1);
                 if (len < 0)
                         len = 0;
                 command_ps[len] = BB_NUL;
                 return len;
         } else {
                 unsigned i = 0;
-                while ((command_ps[i] = src[i]) != 0)
+                while (src[i] && i < S.maxsize - 1) {
+                        command_ps[i] = src[i];
                         i++;
+                }
+                command_ps[i] = BB_NUL;
                 return i;
         }
 }
@@ -319,9 +322,9 @@ static wchar_t adjust_width_and_validate_wc(wchar_t wc)
         return wc;
 }
 #else /* !UNICODE */
-static size_t load_string(const char *src, int maxsize)
+static size_t load_string(const char *src)
 {
-        safe_strncpy(command_ps, src, maxsize);
+        safe_strncpy(command_ps, src, S.maxsize);
         return strlen(command_ps);
 }
 # if ENABLE_FEATURE_TAB_COMPLETION
@@ -1232,10 +1235,10 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                         strcpy(match_buf, &command[cursor_mb]);
                         /* where do we want to have cursor after all? */
                         strcpy(&command[cursor_mb], chosen_match + match_pfx_len);
-                        len = load_string(command, S.maxsize);
+                        len = load_string(command);
                         /* add match and tail */
                         sprintf(&command[cursor_mb], "%s%s", chosen_match + match_pfx_len, match_buf);
-                        command_len = load_string(command, S.maxsize);
+                        command_len = load_string(command);
                         /* write out the matched command */
                         /* paranoia: load_string can return 0 on conv error,
                          * prevent passing pos = (0 - 12) to redraw */
@@ -1956,6 +1959,140 @@ static int isrtl_str(void)
 #undef CTRL
 #define CTRL(a) ((a) & ~0x40)
 
+enum {
+        VI_CMDMODE_BIT = 0x40000000,
+        /* 0x80000000 bit flags KEYCODE_xxx */
+};
+
+#if ENABLE_FEATURE_REVERSE_SEARCH
+/* Mimic readline Ctrl-R reverse history search.
+ * When invoked, it shows the following prompt:
+ * (reverse-i-search)'': user_input [cursor pos unchanged by Ctrl-R]
+ * and typing results in search being performed:
+ * (reverse-i-search)'tmp': cd /tmp [cursor under t in /tmp]
+ * Search is performed by looking at progressively older lines in history.
+ * Ctrl-R again searches for the next match in history.
+ * Backspace deletes last matched char.
+ * Control keys exit search and return to normal editing (at current history line).
+ */
+static int32_t reverse_i_search(void)
+{
+        char match_buf[128]; /* for user input */
+        char read_key_buffer[KEYCODE_BUFFER_SIZE];
+        const char *matched_history_line;
+        const char *saved_prompt;
+        int32_t ic;
+
+        matched_history_line = NULL;
+        read_key_buffer[0] = 0;
+        match_buf[0] = '\0';
+
+        /* Save and replace the prompt */
+        saved_prompt = cmdedit_prompt;
+        goto set_prompt;
+
+        while (1) {
+                int h;
+                unsigned match_buf_len = strlen(match_buf);
+
+                fflush_all();
+//FIXME: correct timeout?
+                ic = lineedit_read_key(read_key_buffer, -1);
+
+                switch (ic) {
+                case CTRL('R'): /* searching for the next match */
+                        break;
+
+                case '\b':
+                case '\x7f':
+                        /* Backspace */
+                        if (unicode_status == UNICODE_ON) {
+                                while (match_buf_len != 0) {
+                                        uint8_t c = match_buf[--match_buf_len];
+                                        if ((c & 0xc0) != 0x80) /* start of UTF-8 char? */
+                                                break; /* yes */
+                                }
+                        } else {
+                                if (match_buf_len != 0)
+                                        match_buf_len--;
+                        }
+                        match_buf[match_buf_len] = '\0';
+                        break;
+
+                default:
+                        if (ic < ' '
+                         || (!ENABLE_UNICODE_SUPPORT && ic >= 256)
+                         || (ENABLE_UNICODE_SUPPORT && ic >= VI_CMDMODE_BIT)
+                        ) {
+                                goto ret;
+                        }
+
+                        /* Append this char */
+#if ENABLE_UNICODE_SUPPORT
+                        if (unicode_status == UNICODE_ON) {
+                                mbstate_t mbstate = { 0 };
+                                char buf[MB_CUR_MAX + 1];
+                                int len = wcrtomb(buf, ic, &mbstate);
+                                if (len > 0) {
+                                        buf[len] = '\0';
+                                        if (match_buf_len + len < sizeof(match_buf))
+                                                strcpy(match_buf + match_buf_len, buf);
+                                }
+                        } else
+#endif
+                        if (match_buf_len < sizeof(match_buf) - 1) {
+                                match_buf[match_buf_len] = ic;
+                                match_buf[match_buf_len + 1] = '\0';
+                        }
+                        break;
+                } /* switch (ic) */
+
+                /* Search in history for match_buf */
+                h = state->cur_history;
+                if (ic == CTRL('R'))
+                        h--;
+                while (h >= 0) {
+                        if (state->history[h]) {
+                                char *match = strstr(state->history[h], match_buf);
+                                if (match) {
+                                        state->cur_history = h;
+                                        matched_history_line = state->history[h];
+                                        command_len = load_string(matched_history_line);
+                                        cursor = match - matched_history_line;
+//FIXME: cursor position for Unicode case
+
+                                        free((char*)cmdedit_prompt);
+ set_prompt:
+                                        cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
+                                        cmdedit_prmt_len = strlen(cmdedit_prompt);
+                                        goto do_redraw;
+                                }
+                        }
+                        h--;
+                }
+
+                /* Not found */
+                match_buf[match_buf_len] = '\0';
+                beep();
+                continue;
+
+ do_redraw:
+                redraw(cmdedit_y, command_len - cursor);
+        } /* while (1) */
+
+ ret:
+        if (matched_history_line)
+                command_len = load_string(matched_history_line);
+
+        free((char*)cmdedit_prompt);
+        cmdedit_prompt = saved_prompt;
+        cmdedit_prmt_len = strlen(cmdedit_prompt);
+        redraw(cmdedit_y, command_len - cursor);
+
+        return ic;
+}
+#endif
+
 /* maxsize must be >= 2.
  * Returns:
  * -1 on read errors or EOF, or on bare Ctrl-D,
@@ -2077,15 +2214,14 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                  * clutters the big switch a bit, but keeps all the code
                  * in one place.
                  */
-                enum {
-                        VI_CMDMODE_BIT = 0x40000000,
-                        /* 0x80000000 bit flags KEYCODE_xxx */
-                };
                 int32_t ic, ic_raw;
 
                 fflush_all();
                 ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
 
+#if ENABLE_FEATURE_REVERSE_SEARCH
+ again:
+#endif
 #if ENABLE_FEATURE_EDITING_VI
                 newdelflag = 1;
                 if (vi_cmdmode) {
@@ -2189,6 +2325,11 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                         while (cursor > 0 && !BB_isspace(command_ps[cursor-1]))
                                 input_backspace();
                         break;
+#if ENABLE_FEATURE_REVERSE_SEARCH
+                case CTRL('R'):
+                        ic = ic_raw = reverse_i_search();
+                        goto again;
+#endif
 
 #if ENABLE_FEATURE_EDITING_VI
                 case 'i'|VI_CMDMODE_BIT:
@@ -2342,7 +2483,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                         /* Rewrite the line with the selected history item */
                         /* change command */
                         command_len = load_string(state->history[state->cur_history] ?
-                                        state->history[state->cur_history] : "", maxsize);
+                                        state->history[state->cur_history] : "");
                         /* redraw and go to eol (bol, in vi) */
                         redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
                         break;
diff --git a/libbb/obscure.c b/libbb/obscure.c
index dd8cd319a..9ecc1f672 100644
--- a/libbb/obscure.c
+++ b/libbb/obscure.c
@@ -109,10 +109,12 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
         if (string_checker(new_p, pw->pw_name)) {
                 return "similar to username";
         }
+#ifndef __BIONIC__
         /* no gecos as-is, as sub-string, reversed, capitalized, doubled */
         if (pw->pw_gecos[0] && string_checker(new_p, pw->pw_gecos)) {
                 return "similar to gecos";
         }
+#endif
         /* hostname as-is, as sub-string, reversed, capitalized, doubled */
         hostname = safe_gethostname();
         i = string_checker(new_p, hostname);
diff --git a/libbb/read_key.c b/libbb/read_key.c
index 840325c99..5dcd19c3f 100644
--- a/libbb/read_key.c
+++ b/libbb/read_key.c
@@ -214,7 +214,10 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
                 }
                 n++;
                 /* Try to decipher "ESC [ NNN ; NNN R" sequence */
-                if ((ENABLE_FEATURE_EDITING_ASK_TERMINAL || ENABLE_FEATURE_VI_ASK_TERMINAL)
+                if ((ENABLE_FEATURE_EDITING_ASK_TERMINAL
+                    || ENABLE_FEATURE_VI_ASK_TERMINAL
+                    || ENABLE_FEATURE_LESS_ASK_TERMINAL
+                    )
                  && n >= 5
                  && buffer[0] == '['
                  && buffer[n-1] == 'R'