mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -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)
334 lines
9.0 KiB
C
Vendored
Generated
334 lines
9.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 AND ISC
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
#include "vssh/ssh.h"
|
|
|
|
#ifdef USE_SSH
|
|
|
|
#include "vssh/vssh.h"
|
|
#include "curlx/strparse.h"
|
|
#include "curl_trc.h"
|
|
#include "escape.h"
|
|
|
|
#ifdef CURLVERBOSE
|
|
const char *Curl_ssh_statename(sshstate state)
|
|
{
|
|
static const char * const names[] = {
|
|
"SSH_STOP",
|
|
"SSH_INIT",
|
|
"SSH_S_STARTUP",
|
|
"SSH_HOSTKEY",
|
|
"SSH_AUTHLIST",
|
|
"SSH_AUTH_PKEY_INIT",
|
|
"SSH_AUTH_PKEY",
|
|
"SSH_AUTH_PASS_INIT",
|
|
"SSH_AUTH_PASS",
|
|
"SSH_AUTH_AGENT_INIT",
|
|
"SSH_AUTH_AGENT_LIST",
|
|
"SSH_AUTH_AGENT",
|
|
"SSH_AUTH_HOST_INIT",
|
|
"SSH_AUTH_HOST",
|
|
"SSH_AUTH_KEY_INIT",
|
|
"SSH_AUTH_KEY",
|
|
"SSH_AUTH_GSSAPI",
|
|
"SSH_AUTH_DONE",
|
|
"SSH_SFTP_INIT",
|
|
"SSH_SFTP_REALPATH",
|
|
"SSH_SFTP_QUOTE_INIT",
|
|
"SSH_SFTP_POSTQUOTE_INIT",
|
|
"SSH_SFTP_QUOTE",
|
|
"SSH_SFTP_NEXT_QUOTE",
|
|
"SSH_SFTP_QUOTE_STAT",
|
|
"SSH_SFTP_QUOTE_SETSTAT",
|
|
"SSH_SFTP_QUOTE_SYMLINK",
|
|
"SSH_SFTP_QUOTE_MKDIR",
|
|
"SSH_SFTP_QUOTE_RENAME",
|
|
"SSH_SFTP_QUOTE_RMDIR",
|
|
"SSH_SFTP_QUOTE_UNLINK",
|
|
"SSH_SFTP_QUOTE_STATVFS",
|
|
"SSH_SFTP_GETINFO",
|
|
"SSH_SFTP_FILETIME",
|
|
"SSH_SFTP_TRANS_INIT",
|
|
"SSH_SFTP_UPLOAD_INIT",
|
|
"SSH_SFTP_CREATE_DIRS_INIT",
|
|
"SSH_SFTP_CREATE_DIRS",
|
|
"SSH_SFTP_CREATE_DIRS_MKDIR",
|
|
"SSH_SFTP_READDIR_INIT",
|
|
"SSH_SFTP_READDIR",
|
|
"SSH_SFTP_READDIR_LINK",
|
|
"SSH_SFTP_READDIR_BOTTOM",
|
|
"SSH_SFTP_READDIR_DONE",
|
|
"SSH_SFTP_DOWNLOAD_INIT",
|
|
"SSH_SFTP_DOWNLOAD_STAT",
|
|
"SSH_SFTP_CLOSE",
|
|
"SSH_SFTP_SHUTDOWN",
|
|
"SSH_SCP_TRANS_INIT",
|
|
"SSH_SCP_UPLOAD_INIT",
|
|
"SSH_SCP_DOWNLOAD_INIT",
|
|
"SSH_SCP_DOWNLOAD",
|
|
"SSH_SCP_DONE",
|
|
"SSH_SCP_SEND_EOF",
|
|
"SSH_SCP_WAIT_EOF",
|
|
"SSH_SCP_WAIT_CLOSE",
|
|
"SSH_SCP_CHANNEL_FREE",
|
|
"SSH_SESSION_DISCONNECT",
|
|
"SSH_SESSION_FREE",
|
|
"QUIT"
|
|
};
|
|
/* a precaution to make sure the lists are in sync */
|
|
DEBUGASSERT(CURL_ARRAYSIZE(names) == SSH_LAST);
|
|
return ((size_t)state < CURL_ARRAYSIZE(names)) ? names[state] : "";
|
|
}
|
|
#endif /* CURLVERBOSE */
|
|
|
|
/*
|
|
* SSH State machine related code
|
|
*/
|
|
/* This is the ONLY way to change SSH state! */
|
|
void Curl_ssh_set_state(struct Curl_easy *data,
|
|
struct ssh_conn *sshc,
|
|
sshstate nowstate)
|
|
{
|
|
#ifdef CURLVERBOSE
|
|
if(sshc->state != nowstate) {
|
|
CURL_TRC_SSH(data, "[%s] -> [%s]",
|
|
Curl_ssh_statename(sshc->state),
|
|
Curl_ssh_statename(nowstate));
|
|
}
|
|
#else
|
|
(void)data;
|
|
#endif
|
|
sshc->state = nowstate;
|
|
}
|
|
|
|
#define MAX_SSHPATH_LEN 100000 /* arbitrary */
|
|
|
|
/* figure out the path to work with in this particular request */
|
|
CURLcode Curl_getworkingpath(struct Curl_easy *data,
|
|
const char *homedir, /* when SFTP is used */
|
|
char **path) /* returns the allocated
|
|
real path to work with */
|
|
{
|
|
char *working_path;
|
|
size_t working_path_len;
|
|
struct dynbuf npath;
|
|
CURLcode result =
|
|
Curl_urldecode(data->state.up.path, 0, &working_path,
|
|
&working_path_len, REJECT_ZERO);
|
|
if(result)
|
|
return result;
|
|
|
|
/* new path to switch to in case we need to */
|
|
curlx_dyn_init(&npath, MAX_SSHPATH_LEN);
|
|
|
|
/* Check for /~/, indicating relative to the user's home directory */
|
|
if((data->conn->scheme->protocol & CURLPROTO_SCP) &&
|
|
(working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) {
|
|
/* It is referenced to the home directory, so strip the leading '/~/' */
|
|
if(curlx_dyn_addn(&npath, &working_path[3], working_path_len - 3)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
else if((data->conn->scheme->protocol & CURLPROTO_SFTP) &&
|
|
(!strcmp("/~", working_path) ||
|
|
((working_path_len > 2) && !memcmp(working_path, "/~/", 3)))) {
|
|
if(curlx_dyn_add(&npath, homedir)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
if(working_path_len > 2) {
|
|
size_t len;
|
|
const char *p;
|
|
int copyfrom = 3;
|
|
/* Copy a separating '/' if homedir does not end with one */
|
|
len = curlx_dyn_len(&npath);
|
|
p = curlx_dyn_ptr(&npath);
|
|
if(len && (p[len - 1] != '/'))
|
|
copyfrom = 2;
|
|
|
|
if(curlx_dyn_addn(&npath, &working_path[copyfrom],
|
|
working_path_len - copyfrom)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
else {
|
|
if(curlx_dyn_add(&npath, "/")) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(curlx_dyn_len(&npath)) {
|
|
curlx_free(working_path);
|
|
|
|
/* store the pointer for the caller to receive */
|
|
*path = curlx_dyn_ptr(&npath);
|
|
}
|
|
else
|
|
*path = working_path;
|
|
DEBUGASSERT(*path && (*path)[0]);
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#define MAX_PATHLENGTH 65535 /* arbitrary long */
|
|
|
|
CURLcode Curl_get_pathname(const char **cpp, char **path, const char *homedir)
|
|
{
|
|
const char *cp = *cpp;
|
|
struct dynbuf out;
|
|
CURLcode result;
|
|
|
|
DEBUGASSERT(homedir);
|
|
*path = NULL;
|
|
*cpp = NULL;
|
|
if(!*cp || !homedir)
|
|
return CURLE_QUOTE_ERROR;
|
|
|
|
curlx_dyn_init(&out, MAX_PATHLENGTH);
|
|
|
|
/* Ignore leading whitespace */
|
|
curlx_str_passblanks(&cp);
|
|
|
|
/* Check for quoted filenames */
|
|
if(*cp == '\"' || *cp == '\'') {
|
|
char quot = *cp++;
|
|
|
|
/* Search for terminating quote, unescape some chars */
|
|
while(*cp != quot) {
|
|
if(!*cp) /* End of string */
|
|
goto fail;
|
|
|
|
if(*cp == '\\') { /* Escaped characters */
|
|
cp++;
|
|
if(*cp != '\'' && *cp != '\"' && *cp != '\\')
|
|
goto fail;
|
|
}
|
|
result = curlx_dyn_addn(&out, cp, 1);
|
|
if(result)
|
|
return result;
|
|
cp++;
|
|
}
|
|
cp++; /* pass the end quote */
|
|
|
|
if(!curlx_dyn_len(&out))
|
|
goto fail;
|
|
}
|
|
else {
|
|
struct Curl_str word;
|
|
bool content = FALSE;
|
|
int rc;
|
|
/* Handling for relative path - prepend home directory */
|
|
if(cp[0] == '/' && cp[1] == '~' && cp[2] == '/') {
|
|
result = curlx_dyn_add(&out, homedir);
|
|
if(!result)
|
|
result = curlx_dyn_addn(&out, "/", 1);
|
|
if(result)
|
|
return result;
|
|
cp += 3;
|
|
content = TRUE;
|
|
}
|
|
/* Read to end of filename - either to whitespace or terminator */
|
|
rc = curlx_str_word(&cp, &word, MAX_PATHLENGTH);
|
|
if(rc) {
|
|
if(rc == STRE_BIG) {
|
|
curlx_dyn_free(&out);
|
|
return CURLE_TOO_LARGE;
|
|
}
|
|
else if(!content)
|
|
/* no path, no word, this is incorrect */
|
|
goto fail;
|
|
}
|
|
else {
|
|
/* append the word */
|
|
result = curlx_dyn_addn(&out, curlx_str(&word), curlx_strlen(&word));
|
|
if(result)
|
|
return result;
|
|
}
|
|
}
|
|
/* skip whitespace */
|
|
curlx_str_passblanks(&cp);
|
|
|
|
/* return pointer to second parameter if it exists */
|
|
*cpp = cp;
|
|
|
|
*path = curlx_dyn_ptr(&out);
|
|
return CURLE_OK;
|
|
|
|
fail:
|
|
curlx_dyn_free(&out);
|
|
return CURLE_QUOTE_ERROR;
|
|
}
|
|
|
|
CURLcode Curl_ssh_range(struct Curl_easy *data,
|
|
const char *range, curl_off_t filesize,
|
|
curl_off_t *startp, curl_off_t *sizep)
|
|
{
|
|
curl_off_t from, to;
|
|
int to_t;
|
|
int from_t = curlx_str_number(&range, &from, CURL_OFF_T_MAX);
|
|
if(from_t == STRE_OVERFLOW)
|
|
return CURLE_RANGE_ERROR;
|
|
curlx_str_passblanks(&range);
|
|
(void)curlx_str_single(&range, '-');
|
|
|
|
to_t = curlx_str_numblanks(&range, &to);
|
|
if((to_t == STRE_OVERFLOW) || (to_t && from_t) || *range)
|
|
return CURLE_RANGE_ERROR;
|
|
|
|
if(from_t) {
|
|
/* no start point given, set from relative to end of file */
|
|
if(!to)
|
|
/* "-0" is not a fine range */
|
|
return CURLE_RANGE_ERROR;
|
|
else if(to > filesize)
|
|
to = filesize;
|
|
from = filesize - to;
|
|
to = filesize - 1;
|
|
}
|
|
else if(from > filesize) {
|
|
failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
|
|
FMT_OFF_T ")", from, filesize);
|
|
return CURLE_RANGE_ERROR;
|
|
}
|
|
else if((to_t == STRE_NO_NUM) || (to >= filesize))
|
|
to = filesize - 1;
|
|
|
|
if(from > to) {
|
|
failf(data, "Bad range: start offset larger than end offset");
|
|
return CURLE_RANGE_ERROR;
|
|
}
|
|
if((to - from) == CURL_OFF_T_MAX)
|
|
return CURLE_RANGE_ERROR;
|
|
|
|
*startp = from;
|
|
*sizep = to - from + 1;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif /* USE_SSH */
|