lineedit: remove CRs from input

Commit 8ade494aeb (win32: add support for virtual terminal input)
made some changes to how input is handled in the line editing code.

In some circumstances (e.g. 'cat | sh -i') this results in input
being read using fgets(3) rather than from the keyboard.  Remove
CRs from input in this case.

Also, use fgets(3) if stdin is not a tty, but not stdout.

1 files changed, 6 insertions, 2 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index efc5f8805..976a7d87d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2673,7 +2673,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #if !ENABLE_PLATFORM_MINGW32
         if (n != 0 || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON) {
 #else
-        if (n != 0 || !isatty(0) || !isatty(1)) {
+        if (n != 0 || !isatty(0)) {
 #endif
                 /* Happens when e.g. stty -echo was run before.
                  * But if ICANON is not set, we don't come here.
@@ -2684,8 +2684,12 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 fflush_all();
                 if (fgets(command, maxsize, stdin) == NULL)
                         len = -1; /* EOF or error */
-                else
+                else {
                         len = strlen(command);
+#if ENABLE_PLATFORM_MINGW32
+                        len = remove_cr(command, len);
+#endif
+                }
                 DEINIT_S();
                 return len;
         }