Merge branch 'js/mingw-isatty-and-dup2'

Windows fix.

* js/mingw-isatty-and-dup2:
mingw: fix isatty() after dup2()

diff --git a/compat/mingw.h b/compat/mingw.h
index 4c14e3083535f58964c6d57e2e15fb4763c129db..a577df0d74aa2b920c7d6779356127c215ec73d9 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -406,6 +406,9 @@ int mingw_raise(int sig);
 int winansi_isatty(int fd);
 #define isatty winansi_isatty
 
+int winansi_dup2(int oldfd, int newfd);
+#define dup2 winansi_dup2
+
 void winansi_init(void);
 HANDLE winansi_get_osfhandle(int fd);
 

diff --git a/compat/winansi.c b/compat/winansi.c
index a11a0f16d276470381587236ae513994d92af477..f4f08237f9ed513e0dd3b3bfd9494f19944e3239 100644 (file)
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -474,6 +474,18 @@ static void die_lasterr(const char *fmt, ...)
        va_end(params);
 }
 
+#undef dup2
+int winansi_dup2(int oldfd, int newfd)
+{
+       int ret = dup2(oldfd, newfd);
+
+       if (!ret && newfd >= 0 && newfd <= 2)
+               fd_is_interactive[newfd] = oldfd < 0 || oldfd > 2 ?
+                       0 : fd_is_interactive[oldfd];
+
+       return ret;
+}
+
 static HANDLE duplicate_handle(HANDLE hnd)
 {
        HANDLE hresult, hproc = GetCurrentProcess();