mirror of
https://git.savannah.gnu.org/git/gnulib.git
synced 2025-08-20 11:01:20 +03:00
* lib/classpath.c: Update comments to mention native Windows. * lib/csharpexec.c: Likewise. * lib/dup2.c: Likewise. * lib/error.c: Likewise. * lib/fcntl.c: Likewise. * lib/filename.h: Likewise. * lib/findprog.c: Likewise. * lib/get-rusage-as.c: Likewise. * lib/get-rusage-data.c: Likewise. * lib/getpagesize.c: Likewise. * lib/javaexec.c: Likewise. * lib/msvc-inval.c: Likewise. * lib/msvc-nothrow.c: Likewise. * lib/nanosleep.c: Likewise. * lib/nonblocking.c: Likewise. * lib/printf-parse.c: Likewise. * lib/setlocale.c: Likewise. * lib/sigaction.c: Likewise. * lib/strerror_r.c: Likewise. * lib/tmpdir.c: Likewise. * lib/vasnprintf.c: Likewise. * lib/w32spawn.h: Likewise. * lib/waitpid.c: Likewise. * lib/stdio.in.h (fdopen, fopen, freopen): Likewise. * m4/locale-ar.m4: Likewise. * m4/locale-fr.m4: Likewise. * m4/locale-ja.m4: Likewise. * m4/locale-tr.m4: Likewise. * m4/locale-zh.m4: Likewise. * m4/printf.m4: Likewise. * tests/test-cloexec.c: Likewise. * tests/test-copy-acl.sh: Likewise. * tests/test-copy-file.sh: Likewise. * tests/test-file-has-acl.sh: Likewise. * tests/test-set-mode-acl.sh: Likewise. * tests/test-dup-safer.c: Likewise. * tests/test-dup2.c: Likewise. * tests/test-dup3.c: Likewise. * tests/test-fcntl.c: Likewise. * tests/test-nonblocking-pipe.h: Likewise. * tests/test-nonblocking-socket.h: Likewise. * tests/test-pipe.c: Likewise. * tests/test-pipe2.c: Likewise. * tests/test-spawn-pipe-child.c: Likewise. * doc/acl-resources.txt: Likewise. * lib/getaddrinfo.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. * tests/test-poll.c (WINDOWS_NATIVE): Likewise. * tests/test-select.h (WINDOWS_NATIVE): Likewise. * lib/localcharset.c: Update comments to mention native Windows. (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. * lib/localename.c: Likewise. * lib/progreloc.c: Likewise. * lib/relocatable.c: Likewise. * lib/poll.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. (windows_compute_revents): Renamed from win32_compute_revents. (windows_compute_revents_socket): Renamed from win32_compute_revents_socket. * lib/select.c: Update comments to mention native Windows. (windows_poll_handle): Renamed from win32_poll_handle. * m4/threadlib.m4: Update comments to mention native Windows. (gl_THREADLIB_EARLY_BODY, gl_THREADLIB_BODY): Expect --enable-threads=windows instead of --enable-threads=win32. Set USE_WINDOWS_THREADS, not USE_WIN32_THREADS. * lib/glthread/lock.h: Update comments to mention native Windows. (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS. * lib/glthread/lock.c (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS. * lib/glthread/cond.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/cond.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/thread.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/thread.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/tls.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/tls.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/yield.h (USE_WINDOWS_THREADS): Likewise. * tests/test-cond.c (USE_WINDOWS_THREADS): Likewise. * tests/test-thread_create.c (USE_WINDOWS_THREADS): Likewise. * tests/test-lock.c (USE_WINDOWS_THREADS): Likewise. (TEST_WINDOWS_THREADS): Renamed from TEST_WIN32_THREADS. * tests/test-tls.c: Likewise. Rationale: Microsoft renamed the "Win32 API" to "Windows API", as it is available on both 32-bit and 64-bit Windows systems. But in gnulib, we treat Cygwin like a Unix platform, therefore the main line of distinction is between "native Windows" on one side and Unix/ POSIX systems on the other side. More details in <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00027.html>. Suggested by Paul Eggert.
175 lines
4.8 KiB
C
175 lines
4.8 KiB
C
/* Test that dup_safer leaves standard fds alone.
|
|
Copyright (C) 2009-2012 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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Eric Blake <ebb9@byu.net>, 2009. */
|
|
|
|
#include <config.h>
|
|
|
|
#include "unistd--.h"
|
|
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <stdbool.h>
|
|
#include <stdio.h>
|
|
|
|
#include "binary-io.h"
|
|
#include "cloexec.h"
|
|
|
|
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
|
/* Get declarations of the native Windows API functions. */
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
/* Get _get_osfhandle. */
|
|
# include "msvc-nothrow.h"
|
|
#endif
|
|
|
|
#if !O_BINARY
|
|
# define setmode(f,m) zero ()
|
|
static int zero (void) { return 0; }
|
|
#endif
|
|
|
|
/* This test intentionally closes stderr. So, we arrange to have fd 10
|
|
(outside the range of interesting fd's during the test) set up to
|
|
duplicate the original stderr. */
|
|
|
|
#define BACKUP_STDERR_FILENO 10
|
|
#define ASSERT_STREAM myerr
|
|
#include "macros.h"
|
|
|
|
static FILE *myerr;
|
|
|
|
/* Return true if FD is open. */
|
|
static bool
|
|
is_open (int fd)
|
|
{
|
|
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
|
/* 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;
|
|
#else
|
|
# ifndef F_GETFL
|
|
# error Please port fcntl to your platform
|
|
# endif
|
|
return 0 <= fcntl (fd, F_GETFL);
|
|
#endif
|
|
}
|
|
|
|
/* Return true if FD is open and inheritable across exec/spawn. */
|
|
static bool
|
|
is_inheritable (int fd)
|
|
{
|
|
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
|
/* 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);
|
|
DWORD flags;
|
|
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
|
|
int i = fcntl (fd, F_GETFD);
|
|
return 0 <= i && (i & FD_CLOEXEC) == 0;
|
|
#endif
|
|
}
|
|
|
|
/* Return true if FD is open in the given MODE, which is either
|
|
O_TEXT or O_BINARY. */
|
|
static bool
|
|
is_mode (int fd, int mode)
|
|
{
|
|
int value = setmode (fd, O_BINARY);
|
|
setmode (fd, value);
|
|
return mode == value;
|
|
}
|
|
|
|
#define witness "test-dup-safer.txt"
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
int i;
|
|
int fd;
|
|
|
|
/* We close fd 2 later, so save it in fd 10. */
|
|
if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
|
|
|| (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
|
|
return 2;
|
|
|
|
/* Create file for later checks. */
|
|
fd = creat (witness, 0600);
|
|
ASSERT (STDERR_FILENO < fd);
|
|
|
|
/* Four iterations, with progressively more standard descriptors
|
|
closed. */
|
|
for (i = -1; i <= STDERR_FILENO; i++)
|
|
{
|
|
if (0 <= i)
|
|
ASSERT (close (i) == 0);
|
|
|
|
/* Detect errors. */
|
|
errno = 0;
|
|
ASSERT (dup (-1) == -1);
|
|
ASSERT (errno == EBADF);
|
|
errno = 0;
|
|
ASSERT (dup (10000000) == -1);
|
|
ASSERT (errno == EBADF);
|
|
close (fd + 1);
|
|
errno = 0;
|
|
ASSERT (dup (fd + 1) == -1);
|
|
ASSERT (errno == EBADF);
|
|
|
|
/* Preserve text vs. binary. */
|
|
setmode (fd, O_BINARY);
|
|
ASSERT (dup (fd) == fd + 1);
|
|
ASSERT (is_open (fd + 1));
|
|
ASSERT (is_inheritable (fd + 1));
|
|
ASSERT (is_mode (fd + 1, O_BINARY));
|
|
|
|
ASSERT (close (fd + 1) == 0);
|
|
setmode (fd, O_TEXT);
|
|
ASSERT (dup (fd) == fd + 1);
|
|
ASSERT (is_open (fd + 1));
|
|
ASSERT (is_inheritable (fd + 1));
|
|
ASSERT (is_mode (fd + 1, O_TEXT));
|
|
|
|
/* Create cloexec copy. */
|
|
ASSERT (close (fd + 1) == 0);
|
|
ASSERT (fd_safer_flag (dup_cloexec (fd), O_CLOEXEC) == fd + 1);
|
|
ASSERT (set_cloexec_flag (fd + 1, true) == 0);
|
|
ASSERT (is_open (fd + 1));
|
|
ASSERT (!is_inheritable (fd + 1));
|
|
ASSERT (close (fd) == 0);
|
|
|
|
/* dup always creates inheritable copies. Also, check that
|
|
earliest slot past std fds is used. */
|
|
ASSERT (dup (fd + 1) == fd);
|
|
ASSERT (is_open (fd));
|
|
ASSERT (is_inheritable (fd));
|
|
ASSERT (close (fd + 1) == 0);
|
|
}
|
|
|
|
/* Cleanup. */
|
|
ASSERT (close (fd) == 0);
|
|
ASSERT (unlink (witness) == 0);
|
|
|
|
return 0;
|
|
}
|