Mercurial > hg > octave-nkf > gnulib-hg
changeset 17447:d8be19310ad9
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.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 09 Jul 2013 10:00:58 -0700 |
parents | 62bc285cb037 |
children | b3516a31a386 |
files | ChangeLog lib/accept4.c lib/dup3.c lib/pipe2.c modules/binary-io |
diffstat | 5 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-07-09 Paul Eggert <eggert@cs.ucla.edu> + + 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 <P@draigBrady.com> mountlist: add support for deallocating returned list entries
--- a/lib/accept4.c +++ b/lib/accept4.c @@ -119,9 +119,9 @@ #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;
--- a/lib/dup3.c +++ b/lib/dup3.c @@ -92,9 +92,9 @@ #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;
--- 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 @@ # 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