projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfreopen: fix typo: s/frepoen/freopen/
[gnulib.git]
/
lib
/
pipe2.c
diff --git
a/lib/pipe2.c
b/lib/pipe2.c
index
18098c4
..
aca18e3
100644
(file)
--- a/
lib/pipe2.c
+++ b/
lib/pipe2.c
@@
-1,5
+1,5
@@
/* Create a pipe, with specific opening flags.
/* Create a pipe, with specific opening flags.
- Copyright (C) 2009-201
1
Free Software Foundation, Inc.
+ Copyright (C) 2009-201
3
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
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
@@
-12,8
+12,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
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. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
@@
-24,10
+23,14
@@
#include <fcntl.h>
#include "binary-io.h"
#include <fcntl.h>
#include "binary-io.h"
-#include "nonblocking.h"
+#include "verify.h"
+
+#if GNULIB_defined_O_NONBLOCK
+# include "nonblocking.h"
+#endif
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native W
oe32
API. */
+/* Native W
indows
API. */
# include <io.h>
# include <io.h>
@@
-36,6
+39,13
@@
int
pipe2 (int fd[2], int flags)
{
int
pipe2 (int fd[2], int flags)
{
+ /* Mingw _pipe() corrupts fd on failure; also, if we succeed at
+ creating the pipe but later fail at changing fcntl, we want
+ to leave fd unchanged: http://austingroupbugs.net/view.php?id=467 */
+ int tmp[2];
+ tmp[0] = fd[0];
+ tmp[1] = fd[1];
+
#if HAVE_PIPE2
# undef pipe2
/* Try the system call first, if it exists. (We may be running with a glibc
#if HAVE_PIPE2
# undef pipe2
/* Try the system call first, if it exists. (We may be running with a glibc
@@
-64,17
+74,30
@@
pipe2 (int fd[2], int flags)
}
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
}
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native W
oe32
API. */
+/* Native W
indows
API. */
if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
- return -1;
+ {
+ fd[0] = tmp[0];
+ fd[1] = tmp[1];
+ return -1;
+ }
+ /* O_NONBLOCK handling.
+ On native Windows platforms, O_NONBLOCK is defined by gnulib. Use the
+ functions defined by the gnulib module 'nonblocking'. */
+# if GNULIB_defined_O_NONBLOCK
if (flags & O_NONBLOCK)
{
if (set_nonblocking_flag (fd[0], true) != 0
|| set_nonblocking_flag (fd[1], true) != 0)
goto fail;
}
if (flags & O_NONBLOCK)
{
if (set_nonblocking_flag (fd[0], true) != 0
|| set_nonblocking_flag (fd[1], true) != 0)
goto fail;
}
+# else
+ {
+ verify (O_NONBLOCK == 0);
+ }
+# endif
return 0;
return 0;
@@
-88,6
+111,8
@@
pipe2 (int fd[2], int flags)
says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
both fd[0] and fd[1]. */
says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
both fd[0] and fd[1]. */
+ /* O_NONBLOCK handling.
+ On Unix platforms, O_NONBLOCK is defined by the system. Use fcntl(). */
if (flags & O_NONBLOCK)
{
int fcntl_flags;
if (flags & O_NONBLOCK)
{
int fcntl_flags;
@@
-113,13
+138,13
@@
pipe2 (int fd[2], int flags)
# if O_BINARY
if (flags & O_BINARY)
{
# if O_BINARY
if (flags & O_BINARY)
{
- setmode (fd[1], O_BINARY);
- setmode (fd[0], O_BINARY);
+ set
_binary_
mode (fd[1], O_BINARY);
+ set
_binary_
mode (fd[0], O_BINARY);
}
else if (flags & O_TEXT)
{
}
else if (flags & O_TEXT)
{
- setmode (fd[1], O_TEXT);
- setmode (fd[0], O_TEXT);
+ set
_binary_
mode (fd[1], O_TEXT);
+ set
_binary_
mode (fd[0], O_TEXT);
}
# endif
}
# endif
@@
-127,12
+152,17
@@
pipe2 (int fd[2], int flags)
#endif
#endif
+#if GNULIB_defined_O_NONBLOCK || \
+ !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
fail:
{
int saved_errno = errno;
close (fd[0]);
close (fd[1]);
fail:
{
int saved_errno = errno;
close (fd[0]);
close (fd[1]);
+ fd[0] = tmp[0];
+ fd[1] = tmp[1];
errno = saved_errno;
return -1;
}
errno = saved_errno;
return -1;
}
+#endif
}
}