projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strptime: Fix C++ test error on mingw.
[gnulib.git]
/
lib
/
pipe-safer.c
diff --git
a/lib/pipe-safer.c
b/lib/pipe-safer.c
index
646cd5d
..
ae9f2e3
100644
(file)
--- a/
lib/pipe-safer.c
+++ b/
lib/pipe-safer.c
@@
-1,10
+1,10
@@
/* Invoke pipe, but avoid some glitches.
/* Invoke pipe, but avoid some glitches.
- Copyright (C) 2005
, 2006
Free Software Foundation, Inc.
+ Copyright (C) 2005
-2006, 2009-2010
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ 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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,14
+12,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "unistd-safer.h"
#include "unistd-safer.h"
@@
-33,25
+30,27
@@
int
pipe_safer (int fd[2])
{
int
pipe_safer (int fd[2])
{
-#if HAVE_FUNC_PIPE
- int fail = pipe (fd);
- if (fail)
- return fail;
-
- {
- int i;
- for (i = 0; i < 2; i++)
- {
- int f = fd_safer (fd[i]);
- if (f < 0)
- return -1;
- fd[i] = f;
- }
- }
-
- return 0;
-#else /* ! HAVE_FUNC_PIPE */
+#if HAVE_PIPE
+ if (pipe (fd) == 0)
+ {
+ int i;
+ for (i = 0; i < 2; i++)
+ {
+ fd[i] = fd_safer (fd[i]);
+ if (fd[i] < 0)
+ {
+ int e = errno;
+ close (fd[1 - i]);
+ errno = e;
+ return -1;
+ }
+ }
+
+ return 0;
+ }
+#else
errno = ENOSYS;
errno = ENOSYS;
- return -1;
#endif
#endif
+
+ return -1;
}
}