win32: exclude termios code

The code to manipulate terminal settings serves no purpose in WIN32.
Use conditional compilation to exclude much of it.

6 files changed, 26 insertions, 21 deletions

diff --git a/editors/vi.c b/editors/vi.c
index b54dd98dc..26487bee6 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -353,7 +353,9 @@ struct globals {
 #if ENABLE_FEATURE_VI_USE_SIGNALS
         sigjmp_buf restart;     // catch_sig()
 #endif
+#if !ENABLE_PLATFORM_MINGW32
         struct termios term_orig; // remember what the cooked mode was
+#endif
 #if ENABLE_FEATURE_VI_COLON
         char *initial_cmds[3];  // currently 2 entries, NULL terminated
 #endif
@@ -2738,15 +2740,19 @@ static char *swap_context(char *p) // goto new context for '' command make this
 //----- Set terminal attributes --------------------------------
 static void rawmode(void)
 {
+#if !ENABLE_PLATFORM_MINGW32
         // no TERMIOS_CLEAR_ISIG: leave ISIG on - allow signals
         set_termios_to_raw(STDIN_FILENO, &term_orig, TERMIOS_RAW_CRNL);
         erase_char = term_orig.c_cc[VERASE];
+#endif
 }
 
 static void cookmode(void)
 {
         fflush_all();
+#if !ENABLE_PLATFORM_MINGW32
         tcsetattr_stdin_TCSANOW(&term_orig);
+#endif
 }
 
 #if ENABLE_FEATURE_VI_USE_SIGNALS
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index b9ba71242..36b6abe2b 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2379,7 +2379,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, n;
+        int len IF_NOT_PLATFORM_MINGW32(, n);
         int timeout;
 #if ENABLE_FEATURE_TAB_COMPLETION
         smallint lastWasTab = 0;
@@ -2389,21 +2389,18 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         smallint vi_cmdmode = 0;
 #endif
         struct termios initial_settings;
+#if !ENABLE_PLATFORM_MINGW32
         struct termios new_settings;
+#endif
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
 
         INIT_S();
 
+#if !ENABLE_PLATFORM_MINGW32
         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
-        initial_settings.c_cc[VINTR] = CTRL('C');
-        initial_settings.c_cc[VEOF] = CTRL('D');
-        if (n > 0 || !isatty(0) || !isatty(1)) {
-#else
         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.
                  * (example: interactive python ^Z-backgrounded,
@@ -2418,6 +2415,10 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 DEINIT_S();
                 return len;
         }
+#else
+        initial_settings.c_cc[VINTR] = CTRL('C');
+        initial_settings.c_cc[VEOF] = CTRL('D');
+#endif
 
         init_unicode();
 
@@ -2456,7 +2457,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #endif
 #define command command_must_not_be_used
 
+#if !ENABLE_PLATFORM_MINGW32
         tcsetattr_stdin_TCSANOW(&new_settings);
+#endif
 
 #if ENABLE_USERNAME_OR_HOMEDIR
         {
@@ -2947,8 +2950,10 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         free_tab_completion_data();
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32
         /* restore initial_settings */
         tcsetattr_stdin_TCSANOW(&initial_settings);
+#endif
 #if ENABLE_FEATURE_EDITING_WINCH
         /* restore SIGWINCH handler */
         sigaction_set(SIGWINCH, &S.SIGWINCH_handler);
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index f2112aec9..6fa21ad00 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -305,6 +305,7 @@ int FAST_FUNC get_terminal_width(int fd)
         return width;
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
 {
         return tcsetattr(STDIN_FILENO, TCSANOW, tp);
@@ -380,6 +381,7 @@ int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags)
         get_termios_and_make_raw(fd, &newterm, oldterm, flags);
         return tcsetattr(fd, TCSANOW, &newterm);
 }
+#endif
 
 pid_t FAST_FUNC safe_waitpid(pid_t pid, int *wstat, int options)
 {
diff --git a/miscutils/less.c b/miscutils/less.c
index e4885db77..9c75ae7ac 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -238,7 +238,9 @@ struct globals {
         smallint winsize_err;
 #endif
         smallint terminated;
+#if !ENABLE_PLATFORM_MINGW32
         struct termios term_orig, term_less;
+#endif
         char kbd_input[KEYCODE_BUFFER_SIZE];
 };
 #define G (*ptr_to_globals)
@@ -300,7 +302,9 @@ struct globals {
 static void set_tty_cooked(void)
 {
         fflush_all();
+#if !ENABLE_PLATFORM_MINGW32
         tcsetattr(kbd_fd, TCSANOW, &term_orig);
+#endif
 }
 
 /* Move the cursor to a position (x,y), where (0,0) is the
@@ -1966,7 +1970,9 @@ int less_main(int argc, char **argv)
         kbd_fd = tty_fd = 0;
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32
         get_termios_and_make_raw(tty_fd, &term_less, &term_orig, TERMIOS_RAW_CRNL);
+#endif
 
         IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(tty_fd, &width, &max_displayed_line);
         /* 20: two tabstops + 4 */
diff --git a/win32/termios.c b/win32/termios.c
index a1329ceba..7115bc0da 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -1,15 +1,5 @@
 #include "libbb.h"
 
-int tcsetattr(int fd UNUSED_PARAM, int mode UNUSED_PARAM,  const struct termios *t UNUSED_PARAM)
-{
-        return -1;
-}
-
-int tcgetattr(int fd UNUSED_PARAM, struct termios *t UNUSED_PARAM)
-{
-        return -1;
-}
-
 int64_t FAST_FUNC read_key(int fd, char *buf UNUSED_PARAM, int timeout)
 {
         HANDLE cin = GetStdHandle(STD_INPUT_HANDLE);
diff --git a/win32/termios.h b/win32/termios.h
index 011a37eb9..c98d414f3 100644
--- a/win32/termios.h
+++ b/win32/termios.h
@@ -123,7 +123,3 @@ struct winsize {
         unsigned short ws_row, ws_col;
         unsigned short ws_xpixel, ws_ypixel;
 };
-
-int tcflush(int fd, int queue_selector);
-int tcgetattr(int fd, struct termios *t);
-int tcsetattr(int fd, int mode,  const struct termios *t);