projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dup2, dup3: work around another cygwin crasher
[gnulib.git]
/
tests
/
test-dup2.c
diff --git
a/tests/test-dup2.c
b/tests/test-dup2.c
index
eddf5ae
..
44039f1
100644
(file)
--- a/
tests/test-dup2.c
+++ b/
tests/test-dup2.c
@@
-1,5
+1,5
@@
/* Test duplicating file descriptors.
/* Test duplicating file descriptors.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
-2013
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
@@
-26,16
+26,22
@@
SIGNATURE_CHECK (dup2, int, (int, int));
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
+#if HAVE_SYS_RESOURCE_H
+# include <sys/resource.h>
+#endif
+
#include "binary-io.h"
#include "binary-io.h"
-#if GNULIB_CLOEXEC
+#if GNULIB_
TEST_
CLOEXEC
# include "cloexec.h"
#endif
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# include "cloexec.h"
#endif
#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>
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
+/* Get _get_osfhandle. */
+# include "msvc-nothrow.h"
#endif
#include "macros.h"
#endif
#include "macros.h"
@@
-45,7
+51,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;
@@
-57,13
+63,13
@@
is_open (int fd)
#endif
}
#endif
}
-#if GNULIB_CLOEXEC
+#if GNULIB_
TEST_
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__
/* 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__
- /* 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. */
HANDLE h = (HANDLE) _get_osfhandle (fd);
descriptors is that they are open but point to an
INVALID_HANDLE_VALUE, and there is no fcntl. */
HANDLE h = (HANDLE) _get_osfhandle (fd);
@@
-79,7
+85,7
@@
is_inheritable (int fd)
return 0 <= i && (i & FD_CLOEXEC) == 0;
# endif
}
return 0 <= i && (i & FD_CLOEXEC) == 0;
# endif
}
-#endif /* GNULIB_CLOEXEC */
+#endif /* GNULIB_
TEST_
CLOEXEC */
#if !O_BINARY
# define setmode(f,m) zero ()
#if !O_BINARY
# define setmode(f,m) zero ()
@@
-101,6
+107,7
@@
main (void)
{
const char *file = "test-dup2.tmp";
char buffer[1];
{
const char *file = "test-dup2.tmp";
char buffer[1];
+ int bad_fd = getdtablesize ();
int fd = open (file, O_CREAT | O_TRUNC | O_RDWR, 0600);
/* Assume std descriptors were provided by invoker. */
int fd = open (file, O_CREAT | O_TRUNC | O_RDWR, 0600);
/* Assume std descriptors were provided by invoker. */
@@
-120,6
+127,10
@@
main (void)
errno = 0;
ASSERT (dup2 (-1, fd) == -1);
ASSERT (errno == EBADF);
errno = 0;
ASSERT (dup2 (-1, fd) == -1);
ASSERT (errno == EBADF);
+ close (99);
+ errno = 0;
+ ASSERT (dup2 (99, fd) == -1);
+ ASSERT (errno == EBADF);
errno = 0;
ASSERT (dup2 (AT_FDCWD, fd) == -1);
ASSERT (errno == EBADF);
errno = 0;
ASSERT (dup2 (AT_FDCWD, fd) == -1);
ASSERT (errno == EBADF);
@@
-139,8
+150,17
@@
main (void)
errno = 0;
ASSERT (dup2 (fd, -2) == -1);
ASSERT (errno == EBADF);
errno = 0;
ASSERT (dup2 (fd, -2) == -1);
ASSERT (errno == EBADF);
+ if (bad_fd > 256)
+ {
+ ASSERT (dup2 (fd, 255) == 255);
+ ASSERT (dup2 (fd, 256) == 256);
+ ASSERT (close (255) == 0);
+ ASSERT (close (256) == 0);
+ }
+ ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
+ ASSERT (close (bad_fd - 1) == 0);
errno = 0;
errno = 0;
- ASSERT (dup2 (fd,
10000000
) == -1);
+ ASSERT (dup2 (fd,
bad_fd
) == -1);
ASSERT (errno == EBADF);
/* Using dup2 can skip fds. */
ASSERT (errno == EBADF);
/* Using dup2 can skip fds. */
@@
-161,7
+181,7
@@
main (void)
ASSERT (read (fd, buffer, 1) == 1);
ASSERT (*buffer == '2');
ASSERT (read (fd, buffer, 1) == 1);
ASSERT (*buffer == '2');
-#if GNULIB_CLOEXEC
+#if GNULIB_
TEST_
CLOEXEC
/* Any new fd created by dup2 must not be cloexec. */
ASSERT (close (fd + 2) == 0);
ASSERT (dup_cloexec (fd) == fd + 1);
/* Any new fd created by dup2 must not be cloexec. */
ASSERT (close (fd + 2) == 0);
ASSERT (dup_cloexec (fd) == fd + 1);
@@
-169,7
+189,12
@@
main (void)
ASSERT (dup2 (fd + 1, fd + 1) == fd + 1);
ASSERT (!is_inheritable (fd + 1));
ASSERT (dup2 (fd + 1, fd + 2) == fd + 2);
ASSERT (dup2 (fd + 1, fd + 1) == fd + 1);
ASSERT (!is_inheritable (fd + 1));
ASSERT (dup2 (fd + 1, fd + 2) == fd + 2);
+ ASSERT (!is_inheritable (fd + 1));
ASSERT (is_inheritable (fd + 2));
ASSERT (is_inheritable (fd + 2));
+ errno = 0;
+ ASSERT (dup2 (fd + 1, -1) == -1);
+ ASSERT (errno == EBADF);
+ ASSERT (!is_inheritable (fd + 1));
#endif
/* On systems that distinguish between text and binary mode, dup2
#endif
/* On systems that distinguish between text and binary mode, dup2