1 files changed, 15 insertions, 1 deletions

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index b03af8542..7df1a4cd3 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -23,6 +23,7 @@
 #include "libbb.h"
 
 /* Turn on nonblocking I/O on a fd */
+#if !ENABLE_PLATFORM_MINGW32
 int FAST_FUNC ndelay_on(int fd)
 {
         int flags = fcntl(fd, F_GETFL);
@@ -45,6 +46,7 @@ void FAST_FUNC close_on_exec_on(int fd)
 {
         fcntl(fd, F_SETFD, FD_CLOEXEC);
 }
+#endif
 
 char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src)
 {
@@ -219,7 +221,12 @@ off_t FAST_FUNC fdlength(int fd)
 
 int FAST_FUNC bb_putchar_stderr(char ch)
 {
+#if ENABLE_PLATFORM_MINGW32 && !defined(_UCRT)
+        // Workaround for problems with stderr in MSVCRT
+        return fputc(ch, stderr);
+#else
         return write(STDERR_FILENO, &ch, 1);
+#endif
 }
 
 ssize_t FAST_FUNC full_write1_str(const char *str)
@@ -268,6 +275,7 @@ int FAST_FUNC get_terminal_width_height(int fd, unsigned *width, unsigned *heigh
         int err;
         int close_me = -1;
 
+#if !ENABLE_PLATFORM_MINGW32
         if (fd == -1) {
                 if (isatty(STDOUT_FILENO))
                         fd = STDOUT_FILENO;
@@ -280,6 +288,7 @@ int FAST_FUNC get_terminal_width_height(int fd, unsigned *width, unsigned *heigh
                 else
                         close_me = fd = open("/dev/tty", O_RDONLY);
         }
+#endif
 
         win.ws_row = 0;
         win.ws_col = 0;
@@ -314,7 +323,7 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp)
         return tcsetattr(STDIN_FILENO, TCSANOW, tp);
 }
 
-int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct termios *oldterm, int flags)
+int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct termios *oldterm, int flags IF_PLATFORM_MINGW32(UNUSED_PARAM))
 {
 //TODO: slattach, shell read might be adapted to use this too: grep for "tcsetattr", "[VTIME] = 0"
         int r;
@@ -323,6 +332,10 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
         r = tcgetattr(fd, oldterm);
         *newterm = *oldterm;
 
+#if ENABLE_PLATFORM_MINGW32
+        newterm->imode &=
+                ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+#else
         /* Turn off buffered input (ICANON)
          * Turn off echoing (ECHO)
          * and separate echoing of newline (ECHONL, normally off anyway)
@@ -379,6 +392,7 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
                  */
                 newterm->c_iflag &= ~(IXOFF|IXON|IXANY|BRKINT|INLCR|ICRNL|IUCLC|IMAXBEL);
         }
+#endif
         return r;
 }