--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-11  Bruno Haible  <bruno@clisp.org>
+
+	Move pipe2-safer code to its own file.
+	* lib/pipe2-safer.c: New file, extracted from lib/pipe-safer.c.
+	* lib/pipe-safer.c (pipe2_safer): Remove function.
+	* modules/pipe2-safer (Files): Add lib/pipe2-safer.c.
+	(Makefile.am): Add it to lib_SOURCES.
+
 2009-12-10  Bruno Haible  <bruno@clisp.org>
 
 	* lib/recvfrom.c (rpl_recvfrom): Allow the from argument to be NULL.

--- a/lib/pipe-safer.c
+++ b/lib/pipe-safer.c
@@ -54,31 +54,3 @@
 
   return -1;
 }
-
-#if GNULIB_PIPE2_SAFER
-/* Like pipe2, but ensure that neither of the file descriptors is
-   STDIN_FILENO, STDOUT_FILENO, or STDERR_FILENO.  */
-
-int
-pipe2_safer (int fd[2], int flags)
-{
-  if (pipe2 (fd, flags) == 0)
-    {
-      int i;
-      for (i = 0; i < 2; i++)
-        {
-          fd[i] = fd_safer_flag (fd[i], flags);
-          if (fd[i] < 0)
-            {
-              int e = errno;
-              close (fd[1 - i]);
-              errno = e;
-              return -1;
-            }
-        }
-
-      return 0;
-    }
-  return -1;
-}
-#endif /* GNULIB_PIPE2 */

new file mode 100644
--- /dev/null
+++ b/lib/pipe2-safer.c
@@ -0,0 +1,52 @@
+/* Invoke pipe2, but avoid some glitches.
+   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistd-safer.h"
+
+#include <unistd.h>
+#include <errno.h>
+
+/* Like pipe2, but ensure that neither of the file descriptors is
+   STDIN_FILENO, STDOUT_FILENO, or STDERR_FILENO.  */
+
+int
+pipe2_safer (int fd[2], int flags)
+{
+  /* This is a generalization of the pipe_safer implementation.  */
+  if (pipe2 (fd, flags) == 0)
+    {
+      int i;
+      for (i = 0; i < 2; i++)
+        {
+          fd[i] = fd_safer_flag (fd[i], flags);
+          if (fd[i] < 0)
+            {
+              int e = errno;
+              close (fd[1 - i]);
+              errno = e;
+              return -1;
+            }
+        }
+
+      return 0;
+    }
+  return -1;
+}

--- a/modules/pipe2-safer
+++ b/modules/pipe2-safer
@@ -3,6 +3,7 @@
 without clobbering std{in,out,err}.
 
 Files:
+lib/pipe2-safer.c
 
 Depends-on:
 cloexec
@@ -13,6 +14,7 @@
 gl_MODULE_INDICATOR([pipe2-safer])
 
 Makefile.am:
+lib_SOURCES += pipe2-safer.c
 
 Include:
 "unistd-safer.h"