Eric Blake wrote on 2009-12-06:
> pipe2-safer: new module
> Add pipe2_safer, and use it in the pipe module.
Is there any reason why the pipe2_safer code is not in a file of its own?
It's nice to be able to guess the file which contains a particular function,
without resorting to 'grep -r'. Also, in situations where you have multiple
gnulib-tool invocations in a single package, uses of
"#if GNULIB_<indicator macro>" often lead to trouble.
Here is a proposed patch:
2009-12-10 Bruno Haible <br...@clisp.org>
* 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.
(Depends-on): Remove cloexec.
--- lib/pipe-safer.c.orig 2009-12-11 02:14:10.000000000 +0100
+++ lib/pipe-safer.c 2009-12-11 02:06:18.000000000 +0100
@@ -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 */
Changing permissions from . to 100644
--- lib/pipe2-safer.c.orig 2009-04-14 12:31:40.000000000 +0200
+++ lib/pipe2-safer.c 2009-12-11 02:07:08.000000000 +0100
@@ -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;
+}
--- modules/pipe2-safer.orig 2009-12-11 02:14:10.000000000 +0100
+++ modules/pipe2-safer 2009-12-11 02:13:03.000000000 +0100
@@ -3,9 +3,9 @@
without clobbering std{in,out,err}.
Files:
+lib/pipe2-safer.c
Depends-on:
-cloexec
pipe2
unistd-safer
@@ -13,6 +13,7 @@
gl_MODULE_INDICATOR([pipe2-safer])
Makefile.am:
+lib_SOURCES += pipe2-safer.c
Include:
"unistd-safer.h"
