fd_util: added function pipe_cloexec()

Same as pipe_cloexec_nonblock(), but doesn't set non-blocking mode.

2 files changed, 31 insertions, 2 deletions

diff --git a/src/fd_util.c b/src/fd_util.c
index 8f142e34a..f296aab97 100644
--- a/src/fd_util.c
+++ b/src/fd_util.c
@@ -140,6 +140,30 @@ creat_cloexec(const char *path_fs, int mode)
 }
 
 int
+pipe_cloexec(int fd[2])
+{
+#ifdef WIN32
+	return _pipe(event_pipe, 512, _O_BINARY);
+#else
+	int ret;
+
+#ifdef HAVE_PIPE2
+	ret = pipe2(fd, O_CLOEXEC);
+	if (ret >= 0 || errno != ENOSYS)
+		return ret;
+#endif
+
+	ret = pipe(fd);
+	if (ret >= 0) {
+		fd_set_cloexec(fd[0], true);
+		fd_set_cloexec(fd[1], true);
+	}
+
+	return ret;
+#endif
+}
+
+int
 pipe_cloexec_nonblock(int fd[2])
 {
 #ifdef WIN32
@@ -158,10 +182,8 @@ pipe_cloexec_nonblock(int fd[2])
 		fd_set_cloexec(fd[0], true);
 		fd_set_cloexec(fd[1], true);
 
-#ifndef WIN32
 		fd_set_nonblock(fd[0]);
 		fd_set_nonblock(fd[1]);
-#endif
 	}
 
 	return ret;
diff --git a/src/fd_util.h b/src/fd_util.h
index 68a7d86ab..8b94a3a27 100644
--- a/src/fd_util.h
+++ b/src/fd_util.h
@@ -58,6 +58,13 @@ creat_cloexec(const char *path_fs, int mode);
 /**
  * Wrapper for pipe(), which sets the CLOEXEC flag (atomically if
  * supported by the OS).
+ */
+int
+pipe_cloexec(int fd[2]);
+
+/**
+ * Wrapper for pipe(), which sets the CLOEXEC flag (atomically if
+ * supported by the OS).
  *
  * On systems that supports it (everybody except for Windows), it also
  * sets the NONBLOCK flag.