mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 06:16:35 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
298 lines
8.1 KiB
C
Vendored
Generated
298 lines
8.1 KiB
C
Vendored
Generated
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
#include "urldata.h"
|
|
#include "dict.h"
|
|
|
|
#ifndef CURL_DISABLE_DICT
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETDB_H
|
|
#include <netdb.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
#ifdef HAVE_NET_IF_H
|
|
#include <net/if.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
#include <sys/ioctl.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#elif defined(HAVE_UNISTD_H)
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "transfer.h"
|
|
#include "curl_trc.h"
|
|
#include "escape.h"
|
|
|
|
#define DICT_MATCH "/MATCH:"
|
|
#define DICT_MATCH2 "/M:"
|
|
#define DICT_MATCH3 "/FIND:"
|
|
#define DICT_DEFINE "/DEFINE:"
|
|
#define DICT_DEFINE2 "/D:"
|
|
#define DICT_DEFINE3 "/LOOKUP:"
|
|
|
|
#define DYN_DICT_WORD 10000
|
|
static char *unescape_word(const char *input)
|
|
{
|
|
struct dynbuf out;
|
|
const char *ptr;
|
|
CURLcode result = CURLE_OK;
|
|
curlx_dyn_init(&out, DYN_DICT_WORD);
|
|
|
|
/* According to RFC2229 section 2.2, these letters need to be escaped with
|
|
\[letter] */
|
|
for(ptr = input; *ptr; ptr++) {
|
|
char ch = *ptr;
|
|
if((ch <= 32) || (ch == 127) ||
|
|
(ch == '\'') || (ch == '\"') || (ch == '\\'))
|
|
result = curlx_dyn_addn(&out, "\\", 1);
|
|
if(!result)
|
|
result = curlx_dyn_addn(&out, ptr, 1);
|
|
if(result)
|
|
return NULL;
|
|
}
|
|
return curlx_dyn_ptr(&out);
|
|
}
|
|
|
|
/* sendf() sends formatted data to the server */
|
|
static CURLcode sendf(struct Curl_easy *data,
|
|
const char *fmt, ...) CURL_PRINTF(2, 3);
|
|
|
|
static CURLcode sendf(struct Curl_easy *data, const char *fmt, ...)
|
|
{
|
|
size_t bytes_written;
|
|
size_t write_len;
|
|
CURLcode result = CURLE_OK;
|
|
char *s;
|
|
char *sptr;
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
s = curl_mvaprintf(fmt, ap); /* returns an allocated string */
|
|
va_end(ap);
|
|
if(!s)
|
|
return CURLE_OUT_OF_MEMORY; /* failure */
|
|
|
|
bytes_written = 0;
|
|
write_len = strlen(s);
|
|
sptr = s;
|
|
|
|
for(;;) {
|
|
/* Write the buffer to the socket */
|
|
result = Curl_xfer_send(data, sptr, write_len, FALSE, &bytes_written);
|
|
|
|
if(result)
|
|
break;
|
|
|
|
Curl_debug(data, CURLINFO_DATA_OUT, sptr, bytes_written);
|
|
|
|
if(bytes_written != write_len) {
|
|
/* if not all was written at once, we must advance the pointer, decrease
|
|
the size left and try again! */
|
|
write_len -= bytes_written;
|
|
sptr += bytes_written;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
|
|
curlx_free(s); /* free the output string */
|
|
|
|
return result;
|
|
}
|
|
|
|
static CURLcode dict_do(struct Curl_easy *data, bool *done)
|
|
{
|
|
char *word;
|
|
char *eword = NULL;
|
|
char *ppath;
|
|
char *database = NULL;
|
|
char *strategy = NULL;
|
|
char *nthdef = NULL; /* This is not part of the protocol, but required
|
|
by RFC 2229 */
|
|
CURLcode result;
|
|
|
|
char *path;
|
|
|
|
*done = TRUE; /* unconditionally */
|
|
|
|
/* URL-decode path before further evaluation */
|
|
result = Curl_urldecode(data->state.up.path, 0, &path, NULL, REJECT_CTRL);
|
|
if(result)
|
|
return result;
|
|
|
|
if(curl_strnequal(path, DICT_MATCH, sizeof(DICT_MATCH) - 1) ||
|
|
curl_strnequal(path, DICT_MATCH2, sizeof(DICT_MATCH2) - 1) ||
|
|
curl_strnequal(path, DICT_MATCH3, sizeof(DICT_MATCH3) - 1)) {
|
|
|
|
word = strchr(path, ':');
|
|
if(word) {
|
|
word++;
|
|
database = strchr(word, ':');
|
|
if(database) {
|
|
*database++ = (char)0;
|
|
strategy = strchr(database, ':');
|
|
if(strategy) {
|
|
*strategy++ = (char)0;
|
|
nthdef = strchr(strategy, ':');
|
|
if(nthdef) {
|
|
*nthdef = (char)0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if(!word || (*word == (char)0)) {
|
|
infof(data, "lookup word is missing");
|
|
}
|
|
eword = unescape_word((!word || (*word == (char)0)) ? "default" : word);
|
|
if(!eword) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto error;
|
|
}
|
|
|
|
result = sendf(data,
|
|
"CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
|
|
"MATCH "
|
|
"%s " /* database */
|
|
"%s " /* strategy */
|
|
"%s\r\n" /* word */
|
|
"QUIT\r\n",
|
|
(!database || (*database == (char)0)) ? "!" : database,
|
|
(!strategy || (*strategy == (char)0)) ? "." : strategy,
|
|
eword);
|
|
|
|
if(result) {
|
|
failf(data, "Failed sending DICT request");
|
|
goto error;
|
|
}
|
|
Curl_xfer_setup_recv(data, FIRSTSOCKET, -1);
|
|
}
|
|
else if(curl_strnequal(path, DICT_DEFINE, sizeof(DICT_DEFINE) - 1) ||
|
|
curl_strnequal(path, DICT_DEFINE2, sizeof(DICT_DEFINE2) - 1) ||
|
|
curl_strnequal(path, DICT_DEFINE3, sizeof(DICT_DEFINE3) - 1)) {
|
|
|
|
word = strchr(path, ':');
|
|
if(word) {
|
|
word++;
|
|
database = strchr(word, ':');
|
|
if(database) {
|
|
*database++ = (char)0;
|
|
nthdef = strchr(database, ':');
|
|
if(nthdef) {
|
|
*nthdef = (char)0;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(!word || (*word == (char)0)) {
|
|
infof(data, "lookup word is missing");
|
|
}
|
|
eword = unescape_word((!word || (*word == (char)0)) ? "default" : word);
|
|
if(!eword) {
|
|
result = CURLE_OUT_OF_MEMORY;
|
|
goto error;
|
|
}
|
|
|
|
result = sendf(data,
|
|
"CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
|
|
"DEFINE "
|
|
"%s " /* database */
|
|
"%s\r\n" /* word */
|
|
"QUIT\r\n",
|
|
(!database || (*database == (char)0)) ? "!" : database,
|
|
eword);
|
|
|
|
if(result) {
|
|
failf(data, "Failed sending DICT request");
|
|
goto error;
|
|
}
|
|
Curl_xfer_setup_recv(data, FIRSTSOCKET, -1);
|
|
}
|
|
else {
|
|
|
|
ppath = strchr(path, '/');
|
|
if(ppath) {
|
|
int i;
|
|
|
|
ppath++;
|
|
for(i = 0; ppath[i]; i++) {
|
|
if(ppath[i] == ':')
|
|
ppath[i] = ' ';
|
|
}
|
|
result = sendf(data,
|
|
"CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
|
|
"%s\r\n"
|
|
"QUIT\r\n", ppath);
|
|
if(result) {
|
|
failf(data, "Failed sending DICT request");
|
|
goto error;
|
|
}
|
|
|
|
Curl_xfer_setup_recv(data, FIRSTSOCKET, -1);
|
|
}
|
|
}
|
|
|
|
error:
|
|
curlx_free(eword);
|
|
curlx_free(path);
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* DICT protocol
|
|
*/
|
|
const struct Curl_protocol Curl_protocol_dict = {
|
|
ZERO_NULL, /* setup_connection */
|
|
dict_do, /* do_it */
|
|
ZERO_NULL, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
ZERO_NULL, /* connect_it */
|
|
ZERO_NULL, /* connecting */
|
|
ZERO_NULL, /* doing */
|
|
ZERO_NULL, /* proto_pollset */
|
|
ZERO_NULL, /* doing_pollset */
|
|
ZERO_NULL, /* domore_pollset */
|
|
ZERO_NULL, /* perform_pollset */
|
|
ZERO_NULL, /* disconnect */
|
|
ZERO_NULL, /* write_resp */
|
|
ZERO_NULL, /* write_resp_hd */
|
|
ZERO_NULL, /* connection_is_dead */
|
|
ZERO_NULL, /* attach connection */
|
|
ZERO_NULL, /* follow */
|
|
};
|
|
|
|
#endif /* CURL_DISABLE_DICT */
|