mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 05:26:20 +02:00
Code

Merge branch 'ew/fd-cloexec-fix' into maint 

Portability/fallback fix.

* ew/fd-cloexec-fix:
  set FD_CLOEXEC properly when O_CLOEXEC is not supported
This commit is contained in:
Junio C Hamano 2017-07-21 15:03:40 -07:00
parent bae7e3f153 9fb9495dae
commit 38351249be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1_file.c
View File

@ -1684,14 +1684,14 @@ int git_open_cloexec(const char *name, int flags)
fd = open(name, flags | o_cloexec);
}
#if defined(F_GETFL) && defined(F_SETFL) && defined(FD_CLOEXEC)
#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
{
static int fd_cloexec = FD_CLOEXEC;
if (!o_cloexec && 0 <= fd && fd_cloexec) {
/* Opened w/o O_CLOEXEC? try with fcntl(2) to add it */
int flags = fcntl(fd, F_GETFL);
if (fcntl(fd, F_SETFL, flags | fd_cloexec))
int flags = fcntl(fd, F_GETFD);
if (fcntl(fd, F_SETFD, flags | fd_cloexec))
fd_cloexec = 0;
}
}