Merge pull request libgit2#1670 from arrbee/open-cloexec

Vicent Martí · Vicent Martí · commit 09ee60c6d408 · 2013-06-24T11:21:09.000-07:00
Add O_CLOEXEC to open calls
diff --git a/src/fileops.c b/src/fileops.c
@@ -61,9 +61,11 @@ int git_futils_creat_locked(const char *path, const mode_t mode)
 	wchar_t buf[GIT_WIN_PATH];
 
 	git__utf8_to_16(buf, GIT_WIN_PATH, path);
-	fd = _wopen(buf, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_EXCL, mode);
+	fd = _wopen(buf, O_WRONLY | O_CREAT | O_TRUNC |
+		O_EXCL | O_BINARY | O_CLOEXEC, mode);
 #else
-	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_EXCL, mode);
+	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC |
+		O_EXCL | O_BINARY | O_CLOEXEC, mode);
 #endif
 
 	if (fd < 0) {
diff --git a/src/posix.c b/src/posix.c
@@ -111,12 +111,12 @@ int p_open(const char *path, int flags, ...)
 		va_end(arg_list);
 	}
 
-	return open(path, flags | O_BINARY, mode);
+	return open(path, flags | O_BINARY | O_CLOEXEC, mode);
 }
 
 int p_creat(const char *path, mode_t mode)
 {
-	return open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, mode);
+	return open(path, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_CLOEXEC, mode);
 }
 
 int p_getcwd(char *buffer_out, size_t size)
diff --git a/src/posix.h b/src/posix.h
@@ -25,6 +25,9 @@
 #if !defined(O_BINARY)
 #define O_BINARY 0
 #endif
+#if !defined(O_CLOEXEC)
+#define O_CLOEXEC 0
+#endif
 
 typedef int git_file;
 

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,12 @@ int p_open(const char *path, int flags, ...)`
`111`	`111`	`va_end(arg_list);`
`112`	`112`	`}`
`113`	`113`
`114`		`- return open(path, flags \| O_BINARY, mode);`
	`114`	`+ return open(path, flags \| O_BINARY \| O_CLOEXEC, mode);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`int p_creat(const char *path, mode_t mode)`
`118`	`118`	`{`
`119`		`- return open(path, O_WRONLY \| O_CREAT \| O_TRUNC \| O_BINARY, mode);`
	`119`	`+ return open(path, O_WRONLY \| O_CREAT \| O_TRUNC \| O_BINARY \| O_CLOEXEC, mode);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`int p_getcwd(char *buffer_out, size_t size)`