win32: improvements to get_terminal_width_height

- move winansi_get_terminal_width_height from winansi.c to ioctl.c,
  the only caller;
- check both stdout and stderr for a connection to a console;
- omit unnecessary code in get_terminal_width_height (because the
  WIN32 implementation ignores the file descriptor).

1 files changed, 2 insertions, 0 deletions

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index e8c027f17..f2112aec9 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -268,6 +268,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 +281,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;