X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-dup2.c;h=3bad63a00916fee261c0d929b373b954e0942c80;hb=116440ae18064c1495285a42767547b3ffa418d4;hp=b65fcad614e6f29941703ec4abac463a326ba1e0;hpb=1d0664a751fdfdcae30e22a5e6bd82f442111b36;p=gnulib.git diff --git a/tests/test-dup2.c b/tests/test-dup2.c index b65fcad61..3bad63a00 100644 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -1,5 +1,5 @@ /* Test duplicating file descriptors. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010 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 @@ -57,11 +57,12 @@ is_open (int fd) #endif } +#if GNULIB_CLOEXEC /* Return non-zero if FD is open and inheritable across exec/spawn. */ static int is_inheritable (int fd) { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* On Win32, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ @@ -70,14 +71,15 @@ is_inheritable (int fd) if (h == INVALID_HANDLE_VALUE || GetHandleInformation (h, &flags) == 0) return 0; return (flags & HANDLE_FLAG_INHERIT) != 0; -#else -# ifndef F_GETFD -# error Please port fcntl to your platform -# endif +# else +# ifndef F_GETFD +# error Please port fcntl to your platform +# endif int i = fcntl (fd, F_GETFD); return 0 <= i && (i & FD_CLOEXEC) == 0; -#endif +# endif } +#endif /* GNULIB_CLOEXEC */ #if !O_BINARY # define setmode(f,m) zero ()