Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17243:b0688a78cfaf
dup2: work around cygwin bug
Detected by './gnulib-tool --test dup2 cloexec'.
Reported upstream: http://cygwin.com/ml/cygwin/2012-12/msg00377.html
and fixed already: http://cygwin.com/ml/cygwin-cvs/2012-q4/msg00202.html
but as we want to work with older cygwin, we'll have to carry this
in gnulib for a while.
* m4/dup2.m4 (gl_FUNC_DUP2): Flush out cygwin core dump.
* lib/dup2.c (rpl_dup2): Work around it.
* doc/posix-functions/dup2.texi (dup2): Document it.
Signed-off-by: Eric Blake <eblake@redhat.com>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Mon, 31 Dec 2012 11:15:53 -0700 |
| parents | 45ae6ce33a1f |
| children | 3b0b0f3b01a6 |
| files | ChangeLog doc/posix-functions/dup2.texi lib/dup2.c m4/dup2.m4 |
| diffstat | 4 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-12-31 Eric Blake <eblake@redhat.com> + + dup2: work around cygwin bug + * m4/dup2.m4 (gl_FUNC_DUP2): Flush out cygwin core dump. + * lib/dup2.c (rpl_dup2): Work around it. + * doc/posix-functions/dup2.texi (dup2): Document it. + 2012-12-30 Paul Eggert <eggert@cs.ucla.edu> regex: remove unnecessary dependency on localcharset.h
--- a/doc/posix-functions/dup2.texi +++ b/doc/posix-functions/dup2.texi @@ -18,7 +18,7 @@ @item This function crashes when invoked with invalid arguments on some platforms: -MSVC 9. +Cygwin 1.7.17, MSVC 9. @item This function resets the @code{FD_CLOEXEC} flag when duplicating an fd
--- a/lib/dup2.c +++ b/lib/dup2.c @@ -95,7 +95,10 @@ # ifdef F_GETFL /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF. On Cygwin 1.5.x, dup2 (1, 1) returns 0. + On Cygwin 1.7.17, dup2 (1, -1) dumps core. On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ + if (desired_fd < 0) + fd = desired_fd; if (fd == desired_fd) return fcntl (fd, F_GETFL) == -1 ? -1 : fd; # endif
--- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 18 +#serial 19 dnl Copyright (C) 2002, 2005, 2007, 2009-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -39,6 +39,9 @@ /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; + /* Flush out a cygwin core dump. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; return result; ]) ],