projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-aux/ylwrap: restore x bit
[gnulib.git]
/
tests
/
test-spawn-pipe-child.c
diff --git
a/tests/test-spawn-pipe-child.c
b/tests/test-spawn-pipe-child.c
index
f1d3f0f
..
ee73c83
100644
(file)
--- a/
tests/test-spawn-pipe-child.c
+++ b/
tests/test-spawn-pipe-child.c
@@
-1,5
+1,5
@@
-/* Child program invoked by test-spawn-pipe
.
.
- Copyright (C) 2009-201
1
Free Software Foundation, Inc.
+/* Child program invoked by test-spawn-pipe
-main
.
+ Copyright (C) 2009-201
2
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
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
@@
-24,7
+24,7
@@
#include <unistd.h>
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
#include <unistd.h>
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the
Win32
API functions. */
+/* Get declarations of the
native Windows
API functions. */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
@@
-45,6
+45,8
@@
static FILE *myerr;
#undef close
#undef fcntl
#undef fdopen
#undef close
#undef fcntl
#undef fdopen
+#undef fflush
+#undef fprintf
#undef read
#undef write
#undef read
#undef write
@@
-53,7
+55,7
@@
static int
is_open (int fd)
{
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
is_open (int fd)
{
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
- /* On
Win32
, the initial state of unassigned standard file
+ /* On
native Windows
, 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. */
return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
descriptors is that they are open but point to an
INVALID_HANDLE_VALUE, and there is no fcntl. */
return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@
-95,8
+97,13
@@
main (int argc, char *argv[])
ASSERT (is_open (STDERR_FILENO));
break;
case 1:
ASSERT (is_open (STDERR_FILENO));
break;
case 1:
- /* Expect fd 2 is closed. */
+ /* Expect fd 2 is closed.
+ But on HP-UX 11, fd 2 gets automatically re-opened to /dev/null if it
+ was closed. Future POSIX will allow this, see
+ <http://austingroupbugs.net/view.php?id=173>. */
+#if !defined __hpux
ASSERT (! is_open (STDERR_FILENO));
ASSERT (! is_open (STDERR_FILENO));
+#endif
break;
default:
ASSERT (0);
break;
default:
ASSERT (0);