diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-21 15:03:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-21 15:03:40 -0700 |
| commit | 38351249be61687234243c9e0b007dee402be26a (patch) | |
| tree | 406c413c609653383f2b5db9f2dbb35530a0a367 | |
| parent | bae7e3f153f90b96438e6972e31c540ae9cf8ca0 (diff) | |
| parent | 9fb9495dae744098a6eb16f62b4876c87b2c773f (diff) | |
| download | git-38351249be61687234243c9e0b007dee402be26a.tar.gz | |
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
| -rw-r--r-- | sha1_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c index 59a4ed2ed3..dd90a78541 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -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; } } |