mirror of
https://github.com/open-goal/jak-project
synced 2026-09-05 02:55:51 -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)
161 lines
6.6 KiB
C
Vendored
Generated
161 lines
6.6 KiB
C
Vendored
Generated
#ifndef HEADER_CURL_FTP_INT_H
|
|
#define HEADER_CURL_FTP_INT_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "pingpong.h"
|
|
|
|
#ifndef CURL_DISABLE_FTP
|
|
|
|
/****************************************************************************
|
|
* FTP unique setup
|
|
***************************************************************************/
|
|
enum {
|
|
FTP_STOP, /* do nothing state, stops the state machine */
|
|
FTP_WAIT220, /* waiting for the initial 220 response immediately after
|
|
a connect */
|
|
FTP_AUTH,
|
|
FTP_USER,
|
|
FTP_PASS,
|
|
FTP_ACCT,
|
|
FTP_PBSZ,
|
|
FTP_PROT,
|
|
FTP_CCC,
|
|
FTP_PWD,
|
|
FTP_SYST,
|
|
FTP_NAMEFMT,
|
|
FTP_QUOTE, /* waiting for a response to a command sent in a quote list */
|
|
FTP_RETR_PREQUOTE,
|
|
FTP_STOR_PREQUOTE,
|
|
FTP_LIST_PREQUOTE,
|
|
FTP_POSTQUOTE,
|
|
FTP_CWD, /* change directory */
|
|
FTP_MKD, /* if the directory did not exist */
|
|
FTP_MDTM, /* to figure out the datestamp */
|
|
FTP_TYPE, /* to set type when doing a head-like request */
|
|
FTP_LIST_TYPE, /* set type when about to do a directory list */
|
|
FTP_RETR_LIST_TYPE,
|
|
FTP_RETR_TYPE, /* set type when about to RETR a file */
|
|
FTP_STOR_TYPE, /* set type when about to STOR a file */
|
|
FTP_SIZE, /* get the remote file's size for head-like request */
|
|
FTP_RETR_SIZE, /* get the remote file's size for RETR */
|
|
FTP_STOR_SIZE, /* get the size for STOR */
|
|
FTP_REST, /* when used to check if the server supports it in head-like */
|
|
FTP_RETR_REST, /* when asking for "resume" in for RETR */
|
|
FTP_PORT, /* generic state for PORT, LPRT and EPRT, check count1 */
|
|
FTP_PRET, /* generic state for PRET RETR, PRET STOR and PRET LIST/NLST */
|
|
FTP_PASV, /* generic state for PASV and EPSV, check count1 */
|
|
FTP_LIST, /* generic state for LIST, NLST or a custom list command */
|
|
FTP_RETR,
|
|
FTP_STOR, /* generic state for STOR and APPE */
|
|
FTP_QUIT,
|
|
FTP_LAST /* never used */
|
|
};
|
|
typedef unsigned char ftpstate; /* use the enum values */
|
|
|
|
struct ftp_parselist_data; /* defined later in ftplistparser.c */
|
|
|
|
struct ftp_wc {
|
|
struct ftp_parselist_data *parser;
|
|
|
|
struct {
|
|
curl_write_callback write_function;
|
|
FILE *file_descriptor;
|
|
} backup;
|
|
};
|
|
|
|
/* This FTP struct is used in the Curl_easy. All FTP data that is
|
|
connection-oriented must be in FTP_conn to properly deal with the fact that
|
|
perhaps the Curl_easy is changed between the times the connection is
|
|
used. */
|
|
struct FTP {
|
|
char *path; /* points to the urlpieces struct field */
|
|
char *pathalloc; /* if non-NULL a pointer to an allocated path */
|
|
|
|
/* transfer a file/body or not, done as a typedefed enum to make debuggers
|
|
display the full symbol and not the numerical value */
|
|
curl_pp_transfer transfer;
|
|
curl_off_t downloadsize;
|
|
};
|
|
|
|
/* one struct entry for each path component (of 'rawpath') */
|
|
struct pathcomp {
|
|
int start; /* start column */
|
|
int len; /* length in bytes */
|
|
};
|
|
|
|
/* ftp_conn is used for struct connection-oriented data in the connectdata
|
|
struct */
|
|
struct ftp_conn {
|
|
struct pingpong pp;
|
|
char *account;
|
|
char *alternative_to_user;
|
|
char *entrypath; /* the PWD reply when we logged on */
|
|
const char *file; /* URL-decoded filename (or path), points into rawpath */
|
|
char *rawpath; /* URL decoded, allocated, version of the path */
|
|
struct pathcomp *dirs; /* allocated array for path components */
|
|
char *prevpath; /* URL-decoded conn->path from the previous transfer */
|
|
char transfertype; /* set by ftp_transfertype for use by Curl_client_write()a
|
|
and others (A/I or zero) */
|
|
char *server_os; /* The target server operating system. */
|
|
curl_off_t known_filesize; /* file size is different from -1, if wildcard
|
|
LIST parsing was done and wc_statemach set
|
|
it */
|
|
int count1; /* general purpose counter for the state machine */
|
|
int count2; /* general purpose counter for the state machine */
|
|
int count3; /* general purpose counter for the state machine */
|
|
unsigned short dirdepth; /* number of entries used in the 'dirs' array,
|
|
< FTP_MAX_DIR_DEPTH */
|
|
unsigned short cwdcount; /* number of CWD commands issued,
|
|
< FTP_MAX_DIR_DEPTH */
|
|
unsigned char state; /* (ftpstate enum) always use ftp.c:state() to change
|
|
state! */
|
|
unsigned char use_ssl; /* if AUTH TLS is to be attempted etc, for FTP or
|
|
IMAP or POP3 or others! (type: curl_usessl)*/
|
|
unsigned char ccc; /* ccc level for this connection */
|
|
BIT(ftp_trying_alternative);
|
|
BIT(dont_check); /* Set to TRUE to prevent the final (post-transfer)
|
|
file size and 226/250 status check. It should still
|
|
read the line, ignore the result. */
|
|
BIT(ctl_valid); /* Tells Curl_ftp_quit() whether or not to do anything. If
|
|
the connection has timed out or been closed, this
|
|
should be FALSE when it gets to Curl_ftp_quit() */
|
|
BIT(cwddone); /* if it has been determined that the proper CWD combo
|
|
already has been done */
|
|
BIT(cwdfail); /* set TRUE if a CWD command fails, as then we must prevent
|
|
caching the current directory */
|
|
BIT(wait_data_conn); /* this is set TRUE if data connection is waited */
|
|
BIT(shutdown); /* connection is being shutdown, e.g. QUIT */
|
|
};
|
|
|
|
/* meta key for storing `struct FTP` as easy meta data */
|
|
#define CURL_META_FTP_EASY "meta:proto:ftp:easy"
|
|
/* meta key for storing `struct ftp_conn` as connection meta data */
|
|
#define CURL_META_FTP_CONN "meta:proto:ftp:conn"
|
|
|
|
#endif /* CURL_DISABLE_FTP */
|
|
|
|
#endif /* HEADER_CURL_FTP_INT_H */
|