Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15646:b0c5a211d6fe
dup2: Support for MSVC.
* lib/dup2.c: Include msvc-inval.h.
(rpl_dup2): Handle invalid parameter notifications during dup2 and
_get_osfhandle calls.
* modules/dup2 (Depends-on): Add msvc-inval.
* doc/posix-functions/dup2.texi: Mention problem on MSVC.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 18 Sep 2011 10:34:24 +0200 |
| parents | 6ef4d991e582 |
| children | 19d798f9d14f |
| files | ChangeLog doc/posix-functions/dup2.texi lib/dup2.c modules/dup2 |
| diffstat | 4 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-09-18 Bruno Haible <bruno@clisp.org> + dup2: Support for MSVC. + * lib/dup2.c: Include msvc-inval.h. + (rpl_dup2): Handle invalid parameter notifications during dup2 and + _get_osfhandle calls. + * modules/dup2 (Depends-on): Add msvc-inval. + * doc/posix-functions/dup2.texi: Mention problem on MSVC. + New module 'msvc-inval'. * lib/msvc-inval.h: New file. * lib/msvc-inval.c: New file.
--- a/doc/posix-functions/dup2.texi +++ b/doc/posix-functions/dup2.texi @@ -17,6 +17,10 @@ mingw, MSVC 9. @item +This function crashes when invoked with invalid arguments on some platforms: +MSVC 9. + +@item This function resets the @code{FD_CLOEXEC} flag when duplicating an fd to itself on some platforms: Haiku.
--- a/lib/dup2.c +++ b/lib/dup2.c @@ -31,6 +31,8 @@ # include <windows.h> #endif +#include "msvc-inval.h" + #if HAVE_DUP2 # undef dup2 @@ -45,7 +47,19 @@ future dup2 calls will hang. */ if (fd == desired_fd) { - if ((HANDLE) _get_osfhandle (fd) == INVALID_HANDLE_VALUE) + HANDLE handle; + + TRY_MSVC_INVAL + { + handle = (HANDLE) _get_osfhandle (fd); + } + CATCH_MSVC_INVAL + { + handle = INVALID_HANDLE_VALUE; + } + DONE_MSVC_INVAL + + if (handle == INVALID_HANDLE_VALUE) { errno = EBADF; return -1; @@ -64,7 +78,18 @@ if (fd == desired_fd) return fcntl (fd, F_GETFL) == -1 ? -1 : fd; # endif - result = dup2 (fd, desired_fd); + + TRY_MSVC_INVAL + { + result = dup2 (fd, desired_fd); + } + CATCH_MSVC_INVAL + { + result = -1; + errno = EBADF; + } + DONE_MSVC_INVAL + # ifdef __linux__ /* Correct a Linux return value. <http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.30.y.git;a=commitdiff;h=2b79bc4f7ebbd5af3c8b867968f9f15602d5f802>