5431b3dd6b
Viktor Szakats
2025-12-16
Subject
build: unix socket tidy-ups
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/windows.yml +1 -1lib/cf-ip-happy.c +0 -3lib/cf-socket.c +0 -3lib/connect.c +2 -2lib/curl_setup.h +11 -11
.github/workflows/windows.yml+1 -1
| @@ -429,7 +429,7 @@ jobs: | |
| env: 'x86_64' | |
| ver: '15.1.0' | |
| url: 'https://github.com/skeeto/w64devkit/releases/download/v2.2.0/w64devkit-x64-2.2.0.7z.exe' | |
| - | config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=OFF' |
| + | config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=OFF -DENABLE_UNIX_SOCKETS=OFF' |
| type: 'Release' | |
| - name: 'schannel' # mingw-w64 10.0 | |
| sys: 'mingw64' | |
lib/cf-ip-happy.c+0 -3
| @@ -27,9 +27,6 @@ | |
| #ifdef HAVE_NETINET_IN_H | |
| #include <netinet/in.h> /* <netinet/tcp.h> may need it */ | |
| #endif | |
| - | #ifdef HAVE_SYS_UN_H |
| - | #include <sys/un.h> /* for sockaddr_un */ |
| - | #endif |
| #ifdef HAVE_LINUX_TCP_H | |
| #include <linux/tcp.h> | |
| #elif defined(HAVE_NETINET_TCP_H) | |
lib/cf-socket.c+0 -3
| @@ -27,9 +27,6 @@ | |
| #ifdef HAVE_NETINET_IN_H | |
| #include <netinet/in.h> /* <netinet/tcp.h> may need it */ | |
| #endif | |
| - | #ifdef HAVE_SYS_UN_H |
| - | #include <sys/un.h> /* for sockaddr_un */ |
| - | #endif |
| #ifdef HAVE_LINUX_TCP_H | |
| #include <linux/tcp.h> | |
| #elif defined(HAVE_NETINET_TCP_H) | |
lib/connect.c+2 -2
| @@ -218,7 +218,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen, | |
| #ifdef USE_IPV6 | |
| struct sockaddr_in6 *si6 = NULL; | |
| #endif | |
| - | #if (defined(HAVE_SYS_UN_H) || defined(WIN32_SOCKADDR_UN)) && defined(AF_UNIX) |
| + | #ifdef USE_UNIX_SOCKETS |
| struct sockaddr_un *su = NULL; | |
| #else | |
| (void)salen; | |
| @@ -241,7 +241,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen, | |
| } | |
| break; | |
| #endif | |
| - | #if (defined(HAVE_SYS_UN_H) || defined(WIN32_SOCKADDR_UN)) && defined(AF_UNIX) |
| + | #ifdef USE_UNIX_SOCKETS |
| case AF_UNIX: | |
| if(salen > (curl_socklen_t)sizeof(CURL_SA_FAMILY_T)) { | |
| su = (struct sockaddr_un *)sa; | |
lib/curl_setup.h+11 -11
| @@ -1148,17 +1148,17 @@ int getpwuid_r(uid_t uid, struct passwd *pwd, char *buf, | |
| #endif | |
| #if defined(USE_UNIX_SOCKETS) && defined(_WIN32) | |
| - | # ifndef UNIX_PATH_MAX |
| - | /* Replicating logic present in afunix.h |
| - | (distributed with newer Windows 10 SDK versions only) */ |
| - | # define UNIX_PATH_MAX 108 |
| - | /* !checksrc! disable TYPEDEFSTRUCT 1 */ |
| - | typedef struct sockaddr_un { |
| - | CURL_SA_FAMILY_T sun_family; |
| - | char sun_path[UNIX_PATH_MAX]; |
| - | } SOCKADDR_UN, *PSOCKADDR_UN; |
| - | # define WIN32_SOCKADDR_UN |
| - | # endif |
| + | /* Offered by mingw-w64 v10+. MS SDK 10.17763/~VS2017+. */ |
| + | #if defined(__MINGW32__) && (__MINGW64_VERSION_MAJOR >= 10) |
| + | # include <afunix.h> |
| + | #elif !defined(UNIX_PATH_MAX) /* Replicate logic present in afunix.h */ |
| + | # define UNIX_PATH_MAX 108 |
| + | /* !checksrc! disable TYPEDEFSTRUCT 1 */ |
| + | typedef struct sockaddr_un { |
| + | CURL_SA_FAMILY_T sun_family; |
| + | char sun_path[UNIX_PATH_MAX]; |
| + | } SOCKADDR_UN, *PSOCKADDR_UN; |
| + | #endif |
| #endif | |
| #ifdef USE_OPENSSL | |