From 5482bf19246965d6839fe9df1aec0785f0b1a329 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 1 Jun 2013 13:03:29 +0300 Subject: Support |& on MS-Windows, both for sockets and for pipes. io.c (SHUT_RD) [SD_RECEIVE]: Define to SD_RECEIVE. (SHUT_WR) [SD_SEND]: Define to SD_SEND. (SHUT_RDWR) [SD_BOTH]: Define to SD_BOTH. (FD_TO_SOCKET, closemaybesocket) [!FD_TO_SOCKET]: New macros. (SOCKET_TO_FD, SOCKET) [!SOCKET_TO_FD]: New macros. (PIPES_SIMULATED): Define only for DJGPP. (pipe) [__MINGW32__]: Define to call _pipe, unless PIPES_SIMULATED is defined. (init_io) [HAVE_SOCKETS]: Call init_sockets. (iop_close, socketopen): Call closemaybesocket instead of close. (redirect) [__MINGW32__]: Call wait_any with a non-zero argument. (devopen) [__EMX__ || __MINGW32__]: Don't call stat on network pseudo-filenames. (two_way_open) [HAVE_SOCKETS]: Switch input and output to binary mode if appropriate. (two_way_open) [!PIPES_SIMULATED]: Use the __EMX__ code for MinGW as well. [__MINGW32__] Call spawnl to invoke $ComSpec and pass it a suitably quoted command line. (two_way_open) [__MINGW32__]: Wait only for a specified process ID. If successful, update the exit status of the exited process. Don't use signals that are undefined on MinGW. (two_way_open) [!PIPES_SIMULATED]: Use the __EMX__ code for MinGW as well. (min): Define only if not already defined. (read_with_timeout) [__MINGW32__]: Allow reading from sockets with timeout. (gawk_fclose) [__MINGW32__]: Close the underlying socket as well. getopt.c: Include stdlib.h for MinGW as well. pc/popen.h (SIGKILL) [__MINGW32__]: Define. (kill, quote_cmd): New prototypes. pc/popen.c: Include popen.h and errno.h. (popen, pclose, system): Undefine macros. (WIN32_LEAN_AND_MEAN) [__MINGW32__]: Define and include windows.h. (kill, quote_cmd) [!PIPES_SIMULATED]: New functions. (os_popen): Make the function definition match its prototype exactly. pc/gawkmisc.pc [HAVE_SOCKETS]: Include socket.h and windows.h. (socket, setsockopt, bind, connect, listen, accept, recvfrom) (shutdown): Undefine macros. (os_close_on_exec) [__MINGW32__]: Non-trivial implementation. (init_sockets, socket_to_fd, w32_socket, w32_setsockopt) (w32_bind, w32_connect, w32_listen, w32_accept, valid_socket) (w32_closesocket, w32_recvfrom, w32_shutdown) [HAVE_SOCKETS]: New functions for MinGW, emulate Posix sockets specified by file descriptors. pc/config.h (HAVE_GETADDRINFO, HAVE_SOCKADDR_STORAGE) (HAVE_SOCKETS) [__MINGW32__]: Define. pc/config.sed (HAVE_GETADDRINFO, HAVE_SOCKADDR_STORAGE) (HAVE_SOCKETS) [__MINGW32__]: Define. pc/Makefile.tst (fmtspcl): Announce expected failure only if not built with MPFR. (inetecht, inetdayt): For MinGW, warn about time-outs. (beginfile1, clos1way, getlndir): Announce expected failure only with DJGPP. (exit): Describe the failure on MinGW. (readdir): Explain why test might fail with bad ls.exe. pc/Makefile (mingw32, mingw32-readline, mingw32-mpfr) (mingw32-readline-mpfr): Add -lws2_32 to the link flags. (gawkmisc$O): Depend on socket.h. (io$O): Depend on socket.h and in.h. (popen$O): New dependency. posix/gawkmisc.c (init_sockets): New dummy function. extension/filefuncs.c [_WIN32]: Define WIN32_LEAN_AND_MEAN before including windows.h. extension/readdir.c [__MINGW32__]: Define WIN32_LEAN_AND_MEAN before including windows.h. extension/filefuncs.c [HAVE_GETSYSTEMTIMEASFILETIME]: Define WIN32_LEAN_AND_MEAN before including windows.h. test/clos1way.awk: Don't use features of Posix shells, to allow this test to work on Windows. test/beginfile2.sh: Leave one blank between the left quote and the following slash. Use non-absolute name for a non-existent file. This is to avoid breakage on Windows due to MSYS transformation of Posix style /foo/bar absolute file names. test/beginfile2.ok: Adapt to changes in beginfile2.sh. --- pc/socket.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pc/socket.h (limited to 'pc/socket.h') diff --git a/pc/socket.h b/pc/socket.h new file mode 100644 index 00000000..41dd23cf --- /dev/null +++ b/pc/socket.h @@ -0,0 +1,42 @@ +/* An emulation for socket.h header for pc/ systems. */ + +#ifndef GAWK_SOCKET_H +#define GAWK_SOCKET_H + +#ifdef __MINGW32__ + +#include + +#define _WIN32_WINNT 0x501 +#include +#include + +#define socket(f,t,p) w32_socket(f,t,p) +#define setsockopt(f,l,o,v,s) w32_setsockopt(f,l,o,v,s) +#define bind(f,a,l) w32_bind(f,a,l) +#define connect(f,a,l) w32_connect(f,a,l) +#define listen(f,b) w32_listen(f,b) +#define accept(f,a,l) w32_accept(f,a,l) +#define closemaybesocket(f) w32_closesocket(f) +#define recvfrom(f,b,l,fl,fr,ln) w32_recvfrom(f,b,l,fl,fr,ln) +#define shutdown(f,h) w32_shutdown(f,h) + +#define SOCKET_TO_FD(s) socket_to_fd(s) +#define FD_TO_SOCKET(fd) \ + ((fd) == INVALID_HANDLE ? INVALID_SOCKET : _get_osfhandle(fd)) + +int w32_socket (int, int, int); +int w32_setsockopt (int, int, int, const char *, int); +int w32_bind (int, const struct sockaddr *, int); +int w32_connect (int, const struct sockaddr *, int); +int w32_listen (int, int); +int w32_accept (int, struct sockaddr *, int *); +int w32_closesocket (int); +int w32_recvfrom (int, char *, int, int, struct sockaddr *, int *); +int w32_shutdown (int, int); +int socket_to_fd (SOCKET); +SOCKET valid_socket (int); + +#endif /* __MINGW32__ */ + +#endif /* GAWK_SOCKET_H */ -- cgit v1.2.3