mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
Merge branch 'js/mingw-isatty-and-dup2'
Windows fix. * js/mingw-isatty-and-dup2: mingw: fix isatty() after dup2()
This commit is contained in:
commit
fbfdc07511
|
@ -406,6 +406,9 @@ int mingw_raise(int sig);
|
||||||
int winansi_isatty(int fd);
|
int winansi_isatty(int fd);
|
||||||
#define isatty winansi_isatty
|
#define isatty winansi_isatty
|
||||||
|
|
||||||
|
int winansi_dup2(int oldfd, int newfd);
|
||||||
|
#define dup2 winansi_dup2
|
||||||
|
|
||||||
void winansi_init(void);
|
void winansi_init(void);
|
||||||
HANDLE winansi_get_osfhandle(int fd);
|
HANDLE winansi_get_osfhandle(int fd);
|
||||||
|
|
||||||
|
|
|
@ -474,6 +474,18 @@ static void die_lasterr(const char *fmt, ...)
|
||||||
va_end(params);
|
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)
|
static HANDLE duplicate_handle(HANDLE hnd)
|
||||||
{
|
{
|
||||||
HANDLE hresult, hproc = GetCurrentProcess();
|
HANDLE hresult, hproc = GetCurrentProcess();
|
||||||
|
|
Loading…
Reference in a new issue