[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] accept4, dup3, pipe2: port to Cygwin
From: |
Paul Eggert |
Subject: |
[PATCH] accept4, dup3, pipe2: port to Cygwin |
Date: |
Tue, 09 Jul 2013 10:02:15 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 |
Problem reported for Emacs by Ken Brown in <http://bugs.gnu.org/14821>.
* lib/accept4.c (accept4) [O_BINARY]:
* lib/dup3.c (dup3) [O_BINARY]:
* lib/pipe2.c (pipe2) [O_BINARY]:
Use set_binary_mode, not setmode.
* lib/pipe2.c [!GNULIB_BINARY_IO]: Include binary-io.h.
* modules/binary-io (Depends-on): Remove module indicator.
These last two bits undo the previous change to pipe2 and binary-io.
---
ChangeLog | 12 ++++++++++++
lib/accept4.c | 4 ++--
lib/dup3.c | 4 ++--
lib/pipe2.c | 13 +++++--------
modules/binary-io | 1 -
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 39fd40b..484484a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-09 Paul Eggert <address@hidden>
+
+ accept4, dup3, pipe2: port to Cygwin
+ Problem reported for Emacs by Ken Brown in <http://bugs.gnu.org/14821>.
+ * lib/accept4.c (accept4) [O_BINARY]:
+ * lib/dup3.c (dup3) [O_BINARY]:
+ * lib/pipe2.c (pipe2) [O_BINARY]:
+ Use set_binary_mode, not setmode.
+ * lib/pipe2.c [!GNULIB_BINARY_IO]: Include binary-io.h.
+ * modules/binary-io (Depends-on): Remove module indicator.
+ These last two bits undo the previous change to pipe2 and binary-io.
+
2013-07-09 Pádraig Brady <address@hidden>
mountlist: add support for deallocating returned list entries
diff --git a/lib/accept4.c b/lib/accept4.c
index 4dcb542..906f251 100644
--- a/lib/accept4.c
+++ b/lib/accept4.c
@@ -119,9 +119,9 @@ accept4 (int sockfd, struct sockaddr *addr, socklen_t
*addrlen, int flags)
#if O_BINARY
if (flags & O_BINARY)
- setmode (fd, O_BINARY);
+ set_binary_mode (fd, O_BINARY);
else if (flags & O_TEXT)
- setmode (fd, O_TEXT);
+ set_binary_mode (fd, O_TEXT);
#endif
return fd;
diff --git a/lib/dup3.c b/lib/dup3.c
index 99851d1..b2b5705 100644
--- a/lib/dup3.c
+++ b/lib/dup3.c
@@ -92,9 +92,9 @@ dup3 (int oldfd, int newfd, int flags)
#if O_BINARY
if (flags & O_BINARY)
- setmode (newfd, O_BINARY);
+ set_binary_mode (newfd, O_BINARY);
else if (flags & O_TEXT)
- setmode (newfd, O_TEXT);
+ set_binary_mode (newfd, O_TEXT);
#endif
return newfd;
diff --git a/lib/pipe2.c b/lib/pipe2.c
index 9569073..aca18e3 100644
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -22,10 +22,7 @@
#include <errno.h>
#include <fcntl.h>
-#if GNULIB_BINARY_IO
-# include "binary-io.h"
-#endif
-
+#include "binary-io.h"
#include "verify.h"
#if GNULIB_defined_O_NONBLOCK
@@ -141,13 +138,13 @@ pipe2 (int fd[2], int flags)
# 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)
{
- 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
diff --git a/modules/binary-io b/modules/binary-io
index 1f646dc..4860252 100644
--- a/modules/binary-io
+++ b/modules/binary-io
@@ -10,7 +10,6 @@ extern-inline
fcntl-h
configure.ac:
-gl_MODULE_INDICATOR([binary-io])
Makefile.am:
lib_SOURCES += binary-io.h binary-io.c
--
1.7.11.7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] accept4, dup3, pipe2: port to Cygwin,
Paul Eggert <=