mirror of
https://github.com/curl/curl.git
synced 2026-08-26 04:53:32 +03:00
wakeup_create: use FD_CLOEXEC/SOCK_CLOEXEC
for `pipe()`/`socketpair()` Fixes #13618 Closes #13625
This commit is contained in:
parent
6eee810db4
commit
fd0d2ed74a
3 changed files with 41 additions and 5 deletions
|
|
@ -31,7 +31,14 @@
|
|||
#define wakeup_write write
|
||||
#define wakeup_read read
|
||||
#define wakeup_close close
|
||||
#define wakeup_create pipe
|
||||
#define wakeup_create(p) Curl_pipe(p)
|
||||
|
||||
#ifdef HAVE_FCNTL
|
||||
#include <curl/curl.h>
|
||||
int Curl_pipe(curl_socket_t socks[2]);
|
||||
#else
|
||||
#define Curl_pipe(p) pipe(p)
|
||||
#endif
|
||||
|
||||
#else /* HAVE_PIPE */
|
||||
|
||||
|
|
@ -40,17 +47,25 @@
|
|||
#define wakeup_close sclose
|
||||
|
||||
#if defined(USE_UNIX_SOCKETS) && defined(HAVE_SOCKETPAIR)
|
||||
#define SOCKET_FAMILY AF_UNIX
|
||||
#define SOCKETPAIR_FAMILY AF_UNIX
|
||||
#elif !defined(HAVE_SOCKETPAIR)
|
||||
#define SOCKET_FAMILY 0 /* not used */
|
||||
#define SOCKETPAIR_FAMILY 0 /* not used */
|
||||
#else
|
||||
#error "unsupported unix domain and socketpair build combo"
|
||||
#endif
|
||||
|
||||
#define wakeup_create(p) Curl_socketpair(SOCKET_FAMILY, SOCK_STREAM, 0, p)
|
||||
#ifdef SOCK_CLOEXEC
|
||||
#define SOCKETPAIR_TYPE (SOCK_STREAM | SOCK_CLOEXEC)
|
||||
#else
|
||||
#define SOCKETPAIR_TYPE SOCK_STREAM
|
||||
#endif
|
||||
|
||||
#define wakeup_create(p)\
|
||||
Curl_socketpair(SOCKETPAIR_FAMILY, SOCKETPAIR_TYPE, 0, p)
|
||||
|
||||
#endif /* HAVE_PIPE */
|
||||
|
||||
|
||||
#ifndef HAVE_SOCKETPAIR
|
||||
#include <curl/curl.h>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue