mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 22:35:07 -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)
229 lines
6.0 KiB
C
Vendored
Generated
229 lines
6.0 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
|
|
*
|
|
***************************************************************************/
|
|
/* Escape and unescape URL encoding in strings. The functions return a new
|
|
* allocated string or NULL if an error occurred. */
|
|
#include "curl_setup.h"
|
|
|
|
struct Curl_easy;
|
|
|
|
#include "urldata.h"
|
|
#include "escape.h"
|
|
#include "curlx/strparse.h"
|
|
#include "curl_printf.h"
|
|
|
|
/* for ABI-compatibility with previous versions */
|
|
char *curl_escape(const char *string, int length)
|
|
{
|
|
return curl_easy_escape(NULL, string, length);
|
|
}
|
|
|
|
/* for ABI-compatibility with previous versions */
|
|
char *curl_unescape(const char *string, int length)
|
|
{
|
|
return curl_easy_unescape(NULL, string, length, NULL);
|
|
}
|
|
|
|
/* Escapes for URL the given unescaped string of given length.
|
|
* 'data' is ignored since 7.82.0.
|
|
*/
|
|
char *curl_easy_escape(CURL *curl, const char *string, int length)
|
|
{
|
|
size_t len;
|
|
struct dynbuf d;
|
|
(void)curl;
|
|
|
|
if(!string || (length < 0))
|
|
return NULL;
|
|
|
|
len = (length ? (size_t)length : strlen(string));
|
|
if(!len)
|
|
return curlx_strdup("");
|
|
|
|
if(len > SIZE_MAX / 16)
|
|
return NULL;
|
|
|
|
curlx_dyn_init(&d, (len * 3) + 1);
|
|
|
|
while(len--) {
|
|
/* treat the characters unsigned */
|
|
unsigned char in = (unsigned char)*string++;
|
|
|
|
if(ISUNRESERVED(in)) {
|
|
/* append this */
|
|
if(curlx_dyn_addn(&d, &in, 1))
|
|
return NULL;
|
|
}
|
|
else {
|
|
/* encode it */
|
|
unsigned char out[3] = { '%' };
|
|
Curl_hexbyte(&out[1], in);
|
|
if(curlx_dyn_addn(&d, out, 3))
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
return curlx_dyn_ptr(&d);
|
|
}
|
|
|
|
/*
|
|
* Curl_urldecode() URL decodes the given string.
|
|
*
|
|
* Returns a pointer to a malloced string in *ostring with length given in
|
|
* *olen. If length == 0, the length is assumed to be strlen(string).
|
|
*
|
|
* ctrl options:
|
|
* - REJECT_NADA: accept everything
|
|
* - REJECT_CTRL: rejects control characters (byte codes lower than 32) in
|
|
* the data
|
|
* - REJECT_ZERO: rejects decoded zero bytes
|
|
*
|
|
* The values for the enum starts at 2, to make the assert detect legacy
|
|
* invokes that used TRUE/FALSE (0 and 1).
|
|
*/
|
|
|
|
CURLcode Curl_urldecode(const char *string, size_t length,
|
|
char **ostring, size_t *olen,
|
|
enum urlreject ctrl)
|
|
{
|
|
size_t alloc;
|
|
char *ns;
|
|
|
|
DEBUGASSERT(string);
|
|
DEBUGASSERT(ctrl >= REJECT_NADA); /* crash on TRUE/FALSE */
|
|
|
|
alloc = (length ? length : strlen(string));
|
|
ns = curlx_malloc(alloc + 1);
|
|
|
|
if(!ns)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* store output string */
|
|
*ostring = ns;
|
|
|
|
while(alloc) {
|
|
unsigned char in = (unsigned char)*string;
|
|
if(('%' == in) && (alloc > 2) &&
|
|
ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
|
|
/* this is two hexadecimal digits following a '%' */
|
|
in = (unsigned char)((curlx_hexval(string[1]) << 4) |
|
|
curlx_hexval(string[2]));
|
|
string += 3;
|
|
alloc -= 3;
|
|
}
|
|
else {
|
|
string++;
|
|
alloc--;
|
|
}
|
|
|
|
if(((ctrl == REJECT_CTRL) && (in < 0x20)) ||
|
|
((ctrl == REJECT_ZERO) && (in == 0))) {
|
|
curlx_safefree(*ostring);
|
|
return CURLE_URL_MALFORMAT;
|
|
}
|
|
|
|
*ns++ = (char)in;
|
|
}
|
|
*ns = 0; /* terminate it */
|
|
|
|
if(olen)
|
|
/* store output size */
|
|
*olen = ns - *ostring;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/*
|
|
* Unescapes the given URL escaped string of given length. Returns a
|
|
* pointer to a malloced string with length given in *olen.
|
|
* If length == 0, the length is assumed to be strlen(string).
|
|
* If olen == NULL, no output length is stored.
|
|
* 'data' is ignored since 7.82.0.
|
|
*/
|
|
char *curl_easy_unescape(CURL *curl, const char *string, int inlength,
|
|
int *outlength)
|
|
{
|
|
char *str = NULL;
|
|
(void)curl;
|
|
if(string && (inlength >= 0)) {
|
|
size_t inputlen = (size_t)inlength;
|
|
size_t outputlen;
|
|
CURLcode res = Curl_urldecode(string, inputlen, &str, &outputlen,
|
|
REJECT_NADA);
|
|
if(res)
|
|
return NULL;
|
|
|
|
if(outlength) {
|
|
if(outputlen <= (size_t)INT_MAX)
|
|
*outlength = curlx_uztosi(outputlen);
|
|
else
|
|
/* too large to return in an int, fail! */
|
|
curlx_safefree(str);
|
|
}
|
|
}
|
|
return str;
|
|
}
|
|
|
|
/* For operating systems/environments that use different malloc/free
|
|
systems for the app and for this library, we provide a free that uses
|
|
the library's memory system */
|
|
void curl_free(void *p)
|
|
{
|
|
curlx_free(p);
|
|
}
|
|
|
|
/*
|
|
* Curl_hexencode()
|
|
*
|
|
* Converts binary input to lowercase hex-encoded ASCII output.
|
|
* Null-terminated.
|
|
*/
|
|
void Curl_hexencode(const unsigned char *src, size_t len, /* input length */
|
|
unsigned char *out, size_t olen) /* output buffer size */
|
|
{
|
|
DEBUGASSERT(src && len && (olen >= 3));
|
|
if(src && len && (olen >= 3)) {
|
|
while(len-- && (olen >= 3)) {
|
|
out[0] = Curl_ldigits[*src >> 4];
|
|
out[1] = Curl_ldigits[*src & 0x0F];
|
|
++src;
|
|
out += 2;
|
|
olen -= 2;
|
|
}
|
|
*out = 0;
|
|
}
|
|
else if(olen)
|
|
*out = 0;
|
|
}
|
|
|
|
/* Curl_hexbyte
|
|
*
|
|
* Output a single unsigned char as a two-digit UPPERCASE hex number.
|
|
*/
|
|
void Curl_hexbyte(unsigned char *dest, /* must fit two bytes */
|
|
unsigned char val)
|
|
{
|
|
dest[0] = Curl_udigits[val >> 4];
|
|
dest[1] = Curl_udigits[val & 0x0F];
|
|
}
|