Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

9 files changed, 125 insertions, 77 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index a25af23b4..0ea8f43ab 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -80,11 +80,12 @@ config FEATURE_EDITING_VI
 
 config FEATURE_EDITING_HISTORY
         int "History size"
-        range 0 99999
+        # Don't allow way too big values here, code uses fixed "char *history[N]" struct member
+        range 0 9999
         default 255
         depends on FEATURE_EDITING
         help
-          Specify command history size.
+          Specify command history size (0 - disable).
 
 config FEATURE_EDITING_SAVEHISTORY
         bool "History saving"
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 50e53aa25..a934f11bb 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -442,7 +442,7 @@ static void parse_config_file(void)
                                         sct->m_mode |= mode_mask[(q - mode_chars) - i];
                                 }
 
-                                /* Now get the the user/group info. */
+                                /* Now get the user/group info. */
 
                                 s = skip_whitespace(e);
 
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index a0ed9193f..9be10687b 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -44,8 +44,12 @@ char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno
                         idx -= 2;
                 }
         }
-        if (end)
+        if (end) {
                 *end = idx;
+                /* handle corner case when the file is not ended with '\n' */
+                if (ch == EOF && lineno != NULL)
+                        (*lineno)++;
+        }
         if (linebuf) {
                 // huh, does fgets discard prior data on error like this?
                 // I don't think so....
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 92ecc330a..67c5e0baa 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -204,65 +204,82 @@ static void deinit_S(void)
 #if ENABLE_UNICODE_SUPPORT
 static size_t load_string(const char *src, int maxsize)
 {
-        ssize_t len = mbstowcs(command_ps, src, maxsize - 1);
-        if (len < 0)
-                len = 0;
-        command_ps[len] = BB_NUL;
-        return len;
+        if (unicode_status == UNICODE_ON) {
+                ssize_t len = mbstowcs(command_ps, src, 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)
+                        i++;
+                return i;
+        }
 }
 static unsigned save_string(char *dst, unsigned maxsize)
 {
+        if (unicode_status == UNICODE_ON) {
 # if !ENABLE_UNICODE_PRESERVE_BROKEN
-        ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
-        if (len < 0)
-                len = 0;
-        dst[len] = '\0';
-        return len;
+                ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
+                if (len < 0)
+                        len = 0;
+                dst[len] = '\0';
+                return len;
 # else
-        unsigned dstpos = 0;
-        unsigned srcpos = 0;
+                unsigned dstpos = 0;
+                unsigned srcpos = 0;
 
-        maxsize--;
-        while (dstpos < maxsize) {
-                wchar_t wc;
-                int n = srcpos;
+                maxsize--;
+                while (dstpos < maxsize) {
+                        wchar_t wc;
+                        int n = srcpos;
 
-                /* Convert up to 1st invalid byte (or up to end) */
-                while ((wc = command_ps[srcpos]) != BB_NUL
-                    && !unicode_is_raw_byte(wc)
-                ) {
+                        /* Convert up to 1st invalid byte (or up to end) */
+                        while ((wc = command_ps[srcpos]) != BB_NUL
+                            && !unicode_is_raw_byte(wc)
+                        ) {
+                                srcpos++;
+                        }
+                        command_ps[srcpos] = BB_NUL;
+                        n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
+                        if (n < 0) /* should not happen */
+                                break;
+                        dstpos += n;
+                        if (wc == BB_NUL) /* usually is */
+                                break;
+
+                        /* We do have invalid byte here! */
+                        command_ps[srcpos] = wc; /* restore it */
                         srcpos++;
+                        if (dstpos == maxsize)
+                                break;
+                        dst[dstpos++] = (char) wc;
                 }
-                command_ps[srcpos] = BB_NUL;
-                n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
-                if (n < 0) /* should not happen */
-                        break;
-                dstpos += n;
-                if (wc == BB_NUL) /* usually is */
-                        break;
-
-                /* We do have invalid byte here! */
-                command_ps[srcpos] = wc; /* restore it */
-                srcpos++;
-                if (dstpos == maxsize)
-                        break;
-                dst[dstpos++] = (char) wc;
-        }
-        dst[dstpos] = '\0';
-        return dstpos;
+                dst[dstpos] = '\0';
+                return dstpos;
 # endif
+        } else {
+                unsigned i = 0;
+                while ((dst[i] = command_ps[i]) != 0)
+                        i++;
+                return i;
+        }
 }
 /* I thought just fputwc(c, stdout) would work. But no... */
 static void BB_PUTCHAR(wchar_t c)
 {
-        char buf[MB_CUR_MAX + 1];
-        mbstate_t mbst = { 0 };
-        ssize_t len;
-
-        len = wcrtomb(buf, c, &mbst);
-        if (len > 0) {
-                buf[len] = '\0';
-                fputs(buf, stdout);
+        if (unicode_status == UNICODE_ON) {
+                char buf[MB_CUR_MAX + 1];
+                mbstate_t mbst = { 0 };
+                ssize_t len = wcrtomb(buf, c, &mbst);
+                if (len > 0) {
+                        buf[len] = '\0';
+                        fputs(buf, stdout);
+                }
+        } else {
+                /* In this case, c is always one byte */
+                putchar(c);
         }
 }
 # if ENABLE_UNICODE_COMBINING_WCHARS || ENABLE_UNICODE_WIDE_WCHARS
@@ -1234,12 +1251,26 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 {
         line_input_t *n = xzalloc(sizeof(*n));
         n->flags = flags;
+        n->max_history = MAX_HISTORY;
         return n;
 }
 
 
 #if MAX_HISTORY > 0
 
+unsigned size_from_HISTFILESIZE(const char *hp)
+{
+        int size = MAX_HISTORY;
+        if (hp) {
+                size = atoi(hp);
+                if (size <= 0)
+                        return 1;
+                if (size > MAX_HISTORY)
+                        return MAX_HISTORY;
+        }
+        return size;
+}
+
 static void save_command_ps_at_cur_history(void)
 {
         if (command_ps[0] != BB_NUL) {
@@ -1330,7 +1361,7 @@ static void load_history(line_input_t *st_parm)
                         temp_h[idx] = line;
                         st_parm->cnt_history_in_file++;
                         idx++;
-                        if (idx == MAX_HISTORY)
+                        if (idx == st_parm->max_history)
                                 idx = 0;
                 }
                 fclose(fp);
@@ -1339,18 +1370,18 @@ static void load_history(line_input_t *st_parm)
                 if (st_parm->cnt_history_in_file) {
                         while (temp_h[idx] == NULL) {
                                 idx++;
-                                if (idx == MAX_HISTORY)
+                                if (idx == st_parm->max_history)
                                         idx = 0;
                         }
                 }
 
                 /* copy temp_h[] to st_parm->history[] */
-                for (i = 0; i < MAX_HISTORY;) {
+                for (i = 0; i < st_parm->max_history;) {
                         line = temp_h[idx];
                         if (!line)
                                 break;
                         idx++;
-                        if (idx == MAX_HISTORY)
+                        if (idx == st_parm->max_history)
                                 idx = 0;
                         line_len = strlen(line);
                         if (line_len >= MAX_LINELEN)
@@ -1381,7 +1412,7 @@ 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) {
+        if (state->cnt_history_in_file > state->max_history * 4) {
                 char *new_name;
                 line_input_t *st_temp;
 
@@ -1389,6 +1420,7 @@ static void save_history(char *str)
                  * load them */
                 st_temp = new_line_input_t(state->flags);
                 st_temp->hist_file = state->hist_file;
+                st_temp->max_history = state->max_history;
                 load_history(st_temp);
 
                 /* write out temp file and replace hist_file atomically */
@@ -1427,20 +1459,20 @@ static void remember_in_history(char *str)
         if (i && strcmp(state->history[i-1], str) == 0)
                 return;
 
-        free(state->history[MAX_HISTORY]); /* redundant, paranoia */
-        state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
+        free(state->history[state->max_history]); /* redundant, paranoia */
+        state->history[state->max_history] = NULL; /* redundant, paranoia */
 
         /* If history[] is full, remove the oldest command */
-        /* we need to keep history[MAX_HISTORY] empty, hence >=, not > */
-        if (i >= MAX_HISTORY) {
+        /* we need to keep history[state->max_history] empty, hence >=, not > */
+        if (i >= state->max_history) {
                 free(state->history[0]);
-                for (i = 0; i < MAX_HISTORY-1; i++)
+                for (i = 0; i < state->max_history-1; i++)
                         state->history[i] = state->history[i+1];
-                /* i == MAX_HISTORY-1 */
+                /* i == state->max_history-1 */
         }
-        /* i <= MAX_HISTORY-1 */
+        /* i <= state->max_history-1 */
         state->history[i++] = xstrdup(str);
-        /* i <= MAX_HISTORY */
+        /* i <= state->max_history */
         state->cur_history = i;
         state->cnt_history = i;
 # if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
@@ -1968,7 +2000,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 maxsize = MAX_LINELEN;
         S.maxsize = maxsize;
 
-        /* With null flags, no other fields are ever used */
+        /* With zero flags, no other fields are ever used */
         state = st ? st : (line_input_t*) &const_int_0;
 #if MAX_HISTORY > 0
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
@@ -2020,7 +2052,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #endif
 
 #if 0
-        for (i = 0; i <= MAX_HISTORY; i++)
+        for (i = 0; i <= state->max_history; i++)
                 bb_error_msg("history[%d]:'%s'", i, state->history[i]);
         bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
 #endif
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index d471edbee..4b0236028 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -8,6 +8,12 @@
  * Also for use in uClibc (http://uclibc.org/) licensed under LGPLv2.1 or later.
  */
 
+/*
+//usage:#define parse_trivial_usage
+//usage:       "[-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
+//usage:#define parse_full_usage ""
+*/
+
 #include "libbb.h"
 
 #if defined ENABLE_PARSE && ENABLE_PARSE
diff --git a/libbb/platform.c b/libbb/platform.c
index 1441a84ac..c594dcb4a 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -42,9 +42,9 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
 }
 #endif
 
-#ifndef HAVE_FDPRINTF
-/* dprintf is now actually part of POSIX.1, but was only added in 2008 */
-int fdprintf(int fd, const char *format, ...)
+#ifndef HAVE_DPRINTF
+/* dprintf is now part of POSIX.1, but was only added in 2008 */
+int dprintf(int fd, const char *format, ...)
 {
         va_list p;
         int r;
diff --git a/libbb/single_argv.c b/libbb/single_argv.c
index 85137b40f..64844ddf8 100644
--- a/libbb/single_argv.c
+++ b/libbb/single_argv.c
@@ -10,6 +10,8 @@
 
 char* FAST_FUNC single_argv(char **argv)
 {
+        if (argv[1] && strcmp(argv[1], "--") == 0)
+                argv++;
         if (!argv[1] || argv[2])
                 bb_show_usage();
         return argv[1];
diff --git a/libbb/unicode.c b/libbb/unicode.c
index d01efd9a2..99dc1dfa6 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -23,12 +23,13 @@ uint8_t unicode_status;
 
 /* Unicode support using libc locale support. */
 
-void FAST_FUNC reinit_unicode(const char *LANG UNUSED_PARAM)
+void FAST_FUNC reinit_unicode(const char *LANG)
 {
         static const char unicode_0x394[] = { 0xce, 0x94, 0 };
         size_t width;
 
-//TODO: call setlocale(LC_ALL, LANG) here?
+//TODO: avoid repeated calls by caching last string?
+        setlocale(LC_ALL, (LANG && LANG[0]) ? LANG : "C");
 
         /* In unicode, this is a one character string */
 // can use unicode_strlen(string) too, but otherwise unicode_strlen() is unused
@@ -39,7 +40,7 @@ void FAST_FUNC reinit_unicode(const char *LANG UNUSED_PARAM)
 void FAST_FUNC init_unicode(void)
 {
         if (unicode_status == UNICODE_UNKNOWN)
-                reinit_unicode(NULL /*getenv("LANG")*/);
+                reinit_unicode(getenv("LANG"));
 }
 
 #else
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 127e2a5fc..4b7c110d3 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -134,16 +134,18 @@ int FAST_FUNC get_nport(const struct sockaddr *sa)
         return -1;
 }
 
-void FAST_FUNC set_nport(len_and_sockaddr *lsa, unsigned port)
+void FAST_FUNC set_nport(struct sockaddr *sa, unsigned port)
 {
 #if ENABLE_FEATURE_IPV6
-        if (lsa->u.sa.sa_family == AF_INET6) {
-                lsa->u.sin6.sin6_port = port;
+        if (sa->sa_family == AF_INET6) {
+                struct sockaddr_in6 *sin6 = (void*) sa;
+                sin6->sin6_port = port;
                 return;
         }
 #endif
-        if (lsa->u.sa.sa_family == AF_INET) {
-                lsa->u.sin.sin_port = port;
+        if (sa->sa_family == AF_INET) {
+                struct sockaddr_in *sin = (void*) sa;
+                sin->sin_port = port;
                 return;
         }
         /* What? UNIX socket? IPX?? :) */
@@ -283,7 +285,7 @@ IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
         memcpy(&r->u.sa, used_res->ai_addr, used_res->ai_addrlen);
 
  set_port:
-        set_nport(r, htons(port));
+        set_nport(&r->u.sa, htons(port));
  ret:
         if (result)
                 freeaddrinfo(result);
@@ -369,7 +371,7 @@ static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
                 fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
         } else {
                 fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
-                set_nport(lsa, htons(port));
+                set_nport(&lsa->u.sa, htons(port));
         }
         setsockopt_reuseaddr(fd);
         xbind(fd, &lsa->u.sa, lsa->len);