Hash :
6110d07d
Author :
Date :
2011-04-18T02:34:47
ioctl: Remove link dependency on native Windows. * lib/fd-hook.h: Renamed from lib/close-hook.h. (gl_close_fn, gl_ioctl_fn): New types. (struct fd_hook): Renamed from struct close_hook. Change type of private_close_fn field. Add private_ioctl_fn field. (close_hook_fn): Add parameter for primary close method. (execute_close_hooks, execute_all_close_hooks): Likewise. (ioctl_hook_fn): New type. (execute_ioctl_hooks, execute_all_ioctl_hooks): New declarations. (register_fd_hook): Renamed from register_close_hook. Add ioctl_hook argument. (unregister_fd_hook): Renamed from unregister_close_hook. * lib/fd-hook.c: Renamed from lib/close-hook.c. Don't include <unistd.h>. (close): Remove undef. (anchor): Update. (execute_close_hooks): Add argument for primary close method. (execute_all_close_hooks): Likewise. (execute_ioctl_hooks, execute_all_ioctl_hooks): New functions. (register_fd_hook): Renamed from register_close_hook. Add ioctl_hook argument. Allow each argument to be NULL. (unregister_fd_hook): Renamed from unregister_close_hook. * lib/close.c (rpl_close): Pass 'close' function pointer to execute_all_close_hooks. * lib/ioctl.c: Include <errno.h>, fd-hook.h. (primary_ioctl): New function. (ioctl): Don't call ioctlsocket here. Instead, call execute_all_ioctl_hooks. * lib/sockets.c (close_fd_maybe_socket): Add argument for primary close method. (ioctl_fd_maybe_socket): New function, with code from lib/ioctl.c. (fd_sockets_hook): Renamed from close_sockets_hook. (gl_sockets_startup, gl_sockets_cleanup): Update. * modules/fd-hook: Renamed from modules/close-hook. Update. * modules/close (Depends-on): Add fd-hook, remove close-hook. * modules/sockets (Depends-on): Likewise. * modules/ioctl (Depends-on): Add fd-hook. * tests/test-nonblocking.c (main): Use GNULIB_TEST_SOCKET, not GNULIB_SOCKET.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
/* Test manipulation of non-blocking flag.
Copyright (C) 2011 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>, 2011. */
#include <config.h>
#include "nonblocking.h"
#include <errno.h>
#include <fcntl.h>
#include <sys/socket.h>
#include <unistd.h>
#include "macros.h"
int
main (void)
{
const char *file = "test-nonblock.tmp";
int fd_file;
int fd_pipe[2];
fd_file = creat (file, 0600);
/* Assume std descriptors were provided by invoker. */
ASSERT (STDERR_FILENO < fd_file);
/* Test regular files; setting nonblocking on file is unspecified. */
ASSERT (get_nonblocking_flag (fd_file) == 0);
ASSERT (set_nonblocking_flag (fd_file, false) == 0);
ASSERT (get_nonblocking_flag (fd_file) == 0);
ASSERT (close (fd_file) == 0);
ASSERT (unlink (file) == 0);
/* Test directories; setting nonblocking is unspecified. */
fd_file = open (".", O_RDONLY);
if (STDERR_FILENO < fd_file)
{
/* mingw can't open directories unless fchdir module is active. */
ASSERT (get_nonblocking_flag (fd_file) == 0);
ASSERT (set_nonblocking_flag (fd_file, false) == 0);
ASSERT (get_nonblocking_flag (fd_file) == 0);
ASSERT (close (fd_file) == 0);
}
/* Test pipes. */
ASSERT (pipe (fd_pipe) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[0]) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[1]) == 0);
ASSERT (set_nonblocking_flag (fd_pipe[0], true) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[0]) == 1);
ASSERT (get_nonblocking_flag (fd_pipe[1]) == 0);
ASSERT (set_nonblocking_flag (fd_pipe[1], true) == 0);
ASSERT (set_nonblocking_flag (fd_pipe[0], false) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[0]) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[1]) == 1);
ASSERT (close (fd_pipe[0]) == 0);
ASSERT (close (fd_pipe[1]) == 0);
#if GNULIB_TEST_PIPE2
ASSERT (pipe2 (fd_pipe, O_NONBLOCK) == 0);
ASSERT (get_nonblocking_flag (fd_pipe[0]) == 1);
ASSERT (get_nonblocking_flag (fd_pipe[1]) == 1);
ASSERT (close (fd_pipe[0]) == 0);
ASSERT (close (fd_pipe[1]) == 0);
#endif /* GNULIB_TEST_PIPE2 */
#if GNULIB_TEST_SOCKET
{
/* Test sockets. */
bool sock_works = true;
int fd_sock;
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
/* For now, we can't get nonblocking status of windows sockets. */
sock_works = false;
# endif
fd_sock = socket (AF_INET, SOCK_STREAM, 0);
ASSERT (get_nonblocking_flag (fd_sock) == (sock_works ? 0 : -1));
ASSERT (set_nonblocking_flag (fd_sock, true) == 0);
ASSERT (get_nonblocking_flag (fd_sock) == (sock_works ? 1 : -1));
ASSERT (set_nonblocking_flag (fd_sock, false) == 0);
ASSERT (get_nonblocking_flag (fd_sock) == (sock_works ? 0 : -1));
ASSERT (close (fd_sock) == 0);
# if SOCK_NONBLOCK
fd_sock = socket (AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
ASSERT (get_nonblocking_flag (fd_sock) == (sock_works ? 1 : -1));
ASSERT (close (fd_sock) == 0);
# endif /* SOCK_NONBLOCK */
}
#endif /* GNULIB_TEST_SOCKET */
/* Test error handling. */
{
errno = 0;
ASSERT (get_nonblocking_flag (-1) == -1);
ASSERT (errno == EBADF);
}
{
errno = 0;
ASSERT (set_nonblocking_flag (-1, false) == -1);
ASSERT (errno == EBADF);
}
{
errno = 0;
ASSERT (set_nonblocking_flag (-1, true) == -1);
ASSERT (errno == EBADF);
}
{
errno = 0;
ASSERT (set_nonblocking_flag (10000000, false) == -1);
ASSERT (errno == EBADF);
}
return 0;
}