set FD_CLOEXEC properly when O_CLOEXEC is not supported

Eric Wong · gitster · commit 9fb9495dae74 · 2017-07-17T14:52:16.000-07:00
FD_CLOEXEC only applies to the file descriptor, so it needs to be
manipuluated via F_GETFD/F_SETFD.  F_GETFL/F_SETFL are for file
description flags.

Verified via strace with o_cloexec set to zero.

Signed-off-by: Eric Wong &lt;e@80x24.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/sha1_file.c b/sha1_file.c
@@ -1571,14 +1571,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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1571,14 +1571,14 @@ int git_open_cloexec(const char *name, int flags)`
`1571`	`1571`	`fd = open(name, flags \| o_cloexec);`
`1572`	`1572`	`}`
`1573`	`1573`
`1574`		`-#if defined(F_GETFL) && defined(F_SETFL) && defined(FD_CLOEXEC)`
	`1574`	`+#if defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)`
`1575`	`1575`	`{`
`1576`	`1576`	`static int fd_cloexec = FD_CLOEXEC;`
`1577`	`1577`
`1578`	`1578`	`if (!o_cloexec && 0 <= fd && fd_cloexec) {`
`1579`	`1579`	`/* Opened w/o O_CLOEXEC? try with fcntl(2) to add it */`
`1580`		`- int flags = fcntl(fd, F_GETFL);`
`1581`		`- if (fcntl(fd, F_SETFL, flags \| fd_cloexec))`
	`1580`	`+ int flags = fcntl(fd, F_GETFD);`
	`1581`	`+ if (fcntl(fd, F_SETFD, flags \| fd_cloexec))`
`1582`	`1582`	`fd_cloexec = 0;`
`1583`	`1583`	`}`
`1584`	`1584`	`}`