util/format: initialize non-important components to 0

[mesa.git] / src / util / os_file.c

diff --git a/src/util/os_file.c b/src/util/os_file.c
index 5771b27e5d0730d33a0a3a95235c2432320eb9a8..c5970ddb2431b058334dd6b97b0b142e2bb724ff 100644 (file)
--- a/src/util/os_file.c
+++ b/src/util/os_file.c
@@ -4,20 +4,25 @@
  */
 
 #include "os_file.h"
+#include "detect_os.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 
-
-#if defined(WIN32)
+#if DETECT_OS_WINDOWS
 #include <io.h>
 #define open _open
 #define fdopen _fdopen
 #define O_CREAT _O_CREAT
 #define O_EXCL _O_EXCL
 #define O_WRONLY _O_WRONLY
+#else
+#include <unistd.h>
+#ifndef F_DUPFD_CLOEXEC
+#define F_DUPFD_CLOEXEC 1030
+#endif
 #endif
 
 
@@ -31,7 +36,51 @@ os_file_create_unique(const char *filename, int filemode)
 }
 
 
-#if defined(__linux__)
+#if DETECT_OS_WINDOWS
+int
+os_dupfd_cloexec(int fd)
+{
+   /*
+    * On Windows child processes don't inherit handles by default:
+    * https://devblogs.microsoft.com/oldnewthing/20111216-00/?p=8873
+    */
+   return dup(fd);
+}
+#else
+int
+os_dupfd_cloexec(int fd)
+{
+   int minfd = 3;
+   int newfd = fcntl(fd, F_DUPFD_CLOEXEC, minfd);
+
+   if (newfd >= 0)
+      return newfd;
+
+   if (errno != EINVAL)
+      return -1;
+
+   newfd = fcntl(fd, F_DUPFD, minfd);
+
+   if (newfd < 0)
+      return -1;
+
+   long flags = fcntl(newfd, F_GETFD);
+   if (flags == -1) {
+      close(newfd);
+      return -1;
+   }
+
+   if (fcntl(newfd, F_SETFD, flags | FD_CLOEXEC) == -1) {
+      close(newfd);
+      return -1;
+   }
+
+   return newfd;
+}
+#endif
+
+
+#if DETECT_OS_LINUX
 
 #include <fcntl.h>
 #include <sys/stat.h>