Merge branch 'busybox' into merge

4 files changed, 48 insertions, 36 deletions

diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index f778c6e89..378510063 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -517,7 +517,7 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
         }
 
         /* In case getopt32 was already called:
-         * reset the libc getopt() function, which keeps internal state.
+         * reset libc getopt() internal state.
          * run_nofork_applet() does this, but we might end up here
          * also via gunzip_main() -> gzip_main(). Play safe.
          */
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c2b0a3842..d85057e72 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2321,7 +2321,7 @@ static int32_t reverse_i_search(int timeout)
  */
 int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize)
 {
-        int len;
+        int len, n;
         int timeout;
 #if ENABLE_FEATURE_TAB_COMPLETION
         smallint lastWasTab = 0;
@@ -2336,15 +2336,15 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 
         INIT_S();
 
+        n = get_termios_and_make_raw(STDIN_FILENO, &new_settings, &initial_settings, 0
+                | TERMIOS_CLEAR_ISIG /* turn off INTR (ctrl-C), QUIT, SUSP */
+        );
 #if ENABLE_PLATFORM_MINGW32
-        memset(initial_settings.c_cc, 0, sizeof(initial_settings.c_cc));
         initial_settings.c_cc[VINTR] = CTRL('C');
         initial_settings.c_cc[VEOF] = CTRL('D');
-        if (!isatty(0) || !isatty(1)) {
+        if (n > 0 || !isatty(0) || !isatty(1)) {
 #else
-        if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
-         || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON
-        ) {
+        if (n != 0 || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON) {
 #endif
                 /* Happens when e.g. stty -echo was run before.
                  * But if ICANON is not set, we don't come here.
@@ -2398,18 +2398,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #endif
 #define command command_must_not_be_used
 
-        new_settings = initial_settings;
-        /* ~ICANON: unbuffered input (most c_cc[] are disabled, VMIN/VTIME are enabled) */
-        /* ~ECHO, ~ECHONL: turn off echoing, including newline echoing */
-        /* ~ISIG: turn off INTR (ctrl-C), QUIT, SUSP */
-        new_settings.c_lflag &= ~(ICANON | ECHO | ECHONL | ISIG);
-        /* reads will block only if < 1 char is available */
-        new_settings.c_cc[VMIN] = 1;
-        /* no timeout (reads block forever) */
-        new_settings.c_cc[VTIME] = 0;
-        /* Should be not needed if ISIG is off: */
-        /* Turn off CTRL-C */
-        /* new_settings.c_cc[VINTR] = _POSIX_VDISABLE; */
         tcsetattr_stdin_TCSANOW(&new_settings);
 
 #if ENABLE_USERNAME_OR_HOMEDIR
@@ -2942,7 +2930,7 @@ int main(int argc, char **argv)
 #if ENABLE_FEATURE_EDITING_FANCY_PROMPT
                 "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:"
                 "\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] "
-                "\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
+                "\\!\\[\\e[36;1m\\]\\$ \\[\\E[m\\]";
 #else
                 "% ";
 #endif
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index b82a706d8..b3038e32d 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -6,7 +6,6 @@
  *
  * 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
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 1b3a1667b..0dfb3e2d9 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -311,40 +311,65 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
         return tcsetattr(STDIN_FILENO, TCSANOW, tp);
 }
 
-int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags)
+int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct termios *oldterm, int flags)
 {
-//TODO: lineedit, microcom, slattach, less might be adapted to use this too:
-// grep for "tcsetattr"
-
-        struct termios newterm;
+//TODO: slattach, shell read might be adapted to use this too: grep for "tcsetattr", "[VTIME] = 0"
+        int r;
 
-        tcgetattr(fd, oldterm);
-        newterm = *oldterm;
+        memset(oldterm, 0, sizeof(*oldterm)); /* paranoia */
+        r = tcgetattr(fd, oldterm);
+        *newterm = *oldterm;
 
         /* Turn off buffered input (ICANON)
          * Turn off echoing (ECHO)
          * and separate echoing of newline (ECHONL, normally off anyway)
          */
-        newterm.c_lflag &= ~(ICANON | ECHO | ECHONL);
+        newterm->c_lflag &= ~(ICANON | ECHO | ECHONL);
         if (flags & TERMIOS_CLEAR_ISIG) {
                 /* dont recognize INT/QUIT/SUSP chars */
-                newterm.c_lflag &= ~ISIG;
+                newterm->c_lflag &= ~ISIG;
         }
         /* reads will block only if < 1 char is available */
-        newterm.c_cc[VMIN] = 1;
+        newterm->c_cc[VMIN] = 1;
         /* no timeout (reads block forever) */
-        newterm.c_cc[VTIME] = 0;
+        newterm->c_cc[VTIME] = 0;
         if (flags & TERMIOS_RAW_CRNL) {
+/* IXON, IXOFF, and IXANY:
+ * IXOFF=1: sw flow control is enabled on input queue:
+ * tty transmits a STOP char when input queue is close to full
+ * and transmits a START char when input queue is nearly empty.
+ * IXON=1: sw flow control is enabled on output queue:
+ * tty will stop sending if STOP char is received,
+ * and resume sending if START is received, or if any char
+ * is received and IXANY=1.
+ */
+                /* IXON=0: XON/XOFF chars are treated as normal chars (why we do this?) */
                 /* dont convert CR to NL on input */
-                newterm.c_iflag &= ~(IXON | ICRNL);
-                /* dont convert NL to CR on output */
-                newterm.c_oflag &= ~(ONLCR);
+                newterm->c_iflag &= ~(IXON | ICRNL);
+                /* dont convert NL to CR+NL on output */
+                newterm->c_oflag &= ~(ONLCR);
+                /* Maybe clear more c_oflag bits? Usually, only OPOST and ONLCR are set.
+                 * OPOST  Enable output processing (reqd for OLCUC and *NL* bits to work)
+                 * OLCUC  Map lowercase characters to uppercase on output.
+                 * OCRNL  Map CR to NL on output.
+                 * ONOCR  Don't output CR at column 0.
+                 * ONLRET Don't output CR.
+                 */
         }
         if (flags & TERMIOS_RAW_INPUT) {
+                /* IXOFF=0: disable sending XON/XOFF if input buf is full */
+                /* IXON=0: input XON/XOFF chars are not special */
                 /* dont convert anything on input */
-                newterm.c_iflag &= ~(BRKINT|INLCR|ICRNL|IXON|IXOFF|IUCLC|IXANY|IMAXBEL);
+                newterm->c_iflag &= ~(IXOFF|IXON|IXANY|BRKINT|INLCR|ICRNL|IUCLC|IMAXBEL);
         }
+        return r;
+}
+
+int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags)
+{
+        struct termios newterm;
 
+        get_termios_and_make_raw(fd, &newterm, oldterm, flags);
         return tcsetattr(fd, TCSANOW, &newterm);
 }