Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

1 files changed, 5 insertions, 7 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f9658711a..92ecc330a 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1817,10 +1817,9 @@ static void win_changed(int nsig)
         errno = sv_errno;
 }
 
-static int lineedit_read_key(char *read_key_buffer)
+static int lineedit_read_key(char *read_key_buffer, int timeout)
 {
         int64_t ic;
-        int timeout = -1;
 #if ENABLE_UNICODE_SUPPORT
         char unicode_buf[MB_CUR_MAX + 1];
         int unicode_idx = 0;
@@ -1925,7 +1924,7 @@ static int isrtl_str(void)
  * 0  on ctrl-C (the line entered is still returned in 'command'),
  * >0 length of input string, including terminating '\n'
  */
-int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
+int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
 {
         int len;
 #if ENABLE_FEATURE_TAB_COMPLETION
@@ -2006,7 +2005,6 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
         new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
         tcsetattr_stdin_TCSANOW(&new_settings);
 
-        /* Now initialize things */
         previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
         win_changed(0); /* do initial resizing */
 #if ENABLE_USERNAME_OR_HOMEDIR
@@ -2048,7 +2046,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 int32_t ic, ic_raw;
 
                 fflush_all();
-                ic = ic_raw = lineedit_read_key(read_key_buffer);
+                ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
 
 #if ENABLE_FEATURE_EDITING_VI
                 newdelflag = 1;
@@ -2209,7 +2207,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 case 'd'|VI_CMDMODE_BIT: {
                         int nc, sc;
 
-                        ic = lineedit_read_key(read_key_buffer);
+                        ic = lineedit_read_key(read_key_buffer, timeout);
                         if (errno) /* error */
                                 goto return_error_indicator;
                         if (ic == ic_raw) { /* "cc", "dd" */
@@ -2273,7 +2271,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                         break;
                 case 'r'|VI_CMDMODE_BIT:
 //FIXME: unicode case?
-                        ic = lineedit_read_key(read_key_buffer);
+                        ic = lineedit_read_key(read_key_buffer, timeout);
                         if (errno) /* error */
                                 goto return_error_indicator;
                         if (ic < ' ' || ic > 255) {