mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 18:03:30 -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)
218 lines
6.6 KiB
C
Vendored
Generated
218 lines
6.6 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 "gopher.h"
|
|
|
|
#ifndef CURL_DISABLE_GOPHER
|
|
|
|
#include "transfer.h"
|
|
#include "sendf.h"
|
|
#include "curl_trc.h"
|
|
#include "cfilters.h"
|
|
#include "connect.h"
|
|
#include "select.h"
|
|
#include "url.h"
|
|
#include "escape.h"
|
|
|
|
#ifdef USE_SSL
|
|
static CURLcode gopher_connect(struct Curl_easy *data, bool *done)
|
|
{
|
|
(void)data;
|
|
(void)done;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static CURLcode gopher_connecting(struct Curl_easy *data, bool *done)
|
|
{
|
|
struct connectdata *conn = data->conn;
|
|
CURLcode result;
|
|
|
|
result = Curl_conn_connect(data, FIRSTSOCKET, TRUE, done);
|
|
if(result)
|
|
connclose(conn, "Failed TLS connection");
|
|
*done = TRUE;
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
static CURLcode gopher_do(struct Curl_easy *data, bool *done)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
struct connectdata *conn = data->conn;
|
|
curl_socket_t sockfd = conn->sock[FIRSTSOCKET];
|
|
char *gopherpath;
|
|
const char *path = data->state.up.path;
|
|
const char *query = data->state.up.query;
|
|
const char *buf = NULL;
|
|
char *buf_alloc = NULL;
|
|
size_t nwritten, buf_len;
|
|
timediff_t timeout_ms;
|
|
int what;
|
|
|
|
*done = TRUE; /* unconditionally */
|
|
|
|
/* path is guaranteed non-NULL */
|
|
DEBUGASSERT(path);
|
|
|
|
if(query)
|
|
gopherpath = curl_maprintf("%s?%s", path, query);
|
|
else
|
|
gopherpath = curlx_strdup(path);
|
|
|
|
if(!gopherpath)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* Create selector. Degenerate cases: / and /1 => convert to "" */
|
|
if(strlen(gopherpath) <= 2) {
|
|
buf = "";
|
|
buf_len = 0;
|
|
curlx_free(gopherpath);
|
|
}
|
|
else {
|
|
const char *newp;
|
|
|
|
/* Otherwise, drop / and the first character (i.e., item type) ... */
|
|
newp = gopherpath;
|
|
newp += 2;
|
|
|
|
/* ... and finally unescape */
|
|
result = Curl_urldecode(newp, 0, &buf_alloc, &buf_len, REJECT_ZERO);
|
|
curlx_free(gopherpath);
|
|
if(result)
|
|
return result;
|
|
buf = buf_alloc;
|
|
}
|
|
|
|
for(; buf_len;) {
|
|
|
|
result = Curl_xfer_send(data, buf, buf_len, FALSE, &nwritten);
|
|
if(!result) { /* Which may not have written it all! */
|
|
result = Curl_client_write(data, CLIENTWRITE_HEADER, buf, nwritten);
|
|
if(result)
|
|
break;
|
|
|
|
if(nwritten > buf_len) {
|
|
DEBUGASSERT(0);
|
|
break;
|
|
}
|
|
buf_len -= nwritten;
|
|
buf += nwritten;
|
|
if(!buf_len)
|
|
break; /* but it did write it all */
|
|
}
|
|
else
|
|
break;
|
|
|
|
timeout_ms = Curl_timeleft_ms(data);
|
|
if(timeout_ms < 0) {
|
|
result = CURLE_OPERATION_TIMEDOUT;
|
|
break;
|
|
}
|
|
if(!timeout_ms)
|
|
timeout_ms = TIMEDIFF_T_MAX;
|
|
|
|
/* Do not busyloop. The entire loop thing is a workaround as it causes a
|
|
BLOCKING behavior which is a NO-NO. This function should rather be
|
|
split up in a do and a doing piece where the pieces that are not
|
|
possible to send now will be sent in the doing function repeatedly
|
|
until the entire request is sent.
|
|
*/
|
|
what = SOCKET_WRITABLE(sockfd, timeout_ms);
|
|
if(what < 0) {
|
|
result = CURLE_SEND_ERROR;
|
|
break;
|
|
}
|
|
else if(!what) {
|
|
result = CURLE_OPERATION_TIMEDOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
curlx_free(buf_alloc);
|
|
|
|
if(!result)
|
|
result = Curl_xfer_send(data, "\r\n", 2, FALSE, &nwritten);
|
|
if(result) {
|
|
failf(data, "Failed sending Gopher request");
|
|
return result;
|
|
}
|
|
result = Curl_client_write(data, CLIENTWRITE_HEADER, "\r\n", 2);
|
|
if(result)
|
|
return result;
|
|
|
|
Curl_xfer_setup_recv(data, FIRSTSOCKET, -1);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/*
|
|
* Gopher protocol handler.
|
|
* This is also a nice simple template to build off for simple
|
|
* connect-command-download protocols.
|
|
*/
|
|
|
|
const struct Curl_protocol Curl_protocol_gopher = {
|
|
ZERO_NULL, /* setup_connection */
|
|
gopher_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 */
|
|
};
|
|
|
|
#ifdef USE_SSL
|
|
const struct Curl_protocol Curl_protocol_gophers = {
|
|
ZERO_NULL, /* setup_connection */
|
|
gopher_do, /* do_it */
|
|
ZERO_NULL, /* done */
|
|
ZERO_NULL, /* do_more */
|
|
gopher_connect, /* connect_it */
|
|
gopher_connecting, /* 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
|
|
|
|
#endif /* CURL_DISABLE_GOPHER */
|