development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Windows fix.

* js/mingw-isatty-and-dup2:
  mingw: fix isatty() after dup2()
This commit is contained in:
Junio C Hamano 2018-11-13 22:37:20 +09:00
parent bce4fc60ca ff8978d533
commit fbfdc07511
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compat/mingw.h
View file

@ -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);

12
compat/winansi.c
View file

@ -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();