git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

wcurl: import v2026.01.05

Browse Source 
Closes #20194
This commit is contained in:
Samuel Henrique 2026-01-05 21:48:10 -08:00 committed by Daniel Stenberg
parent 5a4cd75863
commit dce81d3c4e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/wcurl.md
View File

@ -53,7 +53,7 @@ By default, **wcurl** does:
## * Automatically choose a filename as output; ## * Automatically choose a filename as output;
## * Avoid overwriting files ## * Avoid overwriting files
if the installed curl's version is \>= 7.83.0 (--no-clobber); if the installed curl's version is \>= 7.83.0 (--no-clobber);
## * Perform retries; ## * Perform retries;

36
scripts/wcurl
View File

@ -29,7 +29,7 @@
# Stop on errors and on usage of unset variables. # Stop on errors and on usage of unset variables.
set -eu set -eu
VERSION="2025.11.09" VERSION="2026.01.05"
PROGRAM_NAME="$(basename "$0")" PROGRAM_NAME="$(basename "$0")"
readonly PROGRAM_NAME readonly PROGRAM_NAME
@ -64,10 +64,10 @@ Options:
number appended to the end (curl >= 7.83.0). If this option is provided number appended to the end (curl >= 7.83.0). If this option is provided
multiple times, only the last value is considered. multiple times, only the last value is considered.
--no-decode-filename: Don't percent-decode the output filename, even if the percent-encoding in --no-decode-filename: Do not percent-decode the output filename, even if the percent-encoding in
the URL was done by wcurl, e.g.: The URL contained whitespace. the URL was done by wcurl, e.g.: The URL contained whitespace.
--dry-run: Don't actually execute curl, just print what would be invoked. --dry-run: Do not actually execute curl, just print what would be invoked.
-V, --version: Print version information. -V, --version: Print version information.
@ -118,7 +118,8 @@ readonly PER_URL_PARAMETERS="\
# characters. # characters.
# 2F = / # 2F = /
# 5C = \ # 5C = \
readonly UNSAFE_PERCENT_ENCODE="%2F %5C" # 3A = :
readonly UNSAFE_PERCENT_ENCODE="%2F %5C %3A"
# Whether to invoke curl or not. # Whether to invoke curl or not.
DRY_RUN="false" DRY_RUN="false"
@ -167,7 +168,7 @@ percent_decode()
# If character is a "%", read the next character as decode_hex1. # If character is a "%", read the next character as decode_hex1.
if [ "${decode_out}" = % ] && IFS= read -r decode_hex1; then if [ "${decode_out}" = % ] && IFS= read -r decode_hex1; then
decode_out="${decode_out}${decode_hex1}" decode_out="${decode_out}${decode_hex1}"
# If there's one more character, read it as decode_hex2. # If there is one more character, read it as decode_hex2.
if IFS= read -r decode_hex2; then if IFS= read -r decode_hex2; then
decode_out="${decode_out}${decode_hex2}" decode_out="${decode_out}${decode_hex2}"
# Skip decoding if this is a control character (00-1F). # Skip decoding if this is a control character (00-1F).
@ -190,10 +191,11 @@ get_url_filename()
{ {
# Remove protocol and query string if present. # Remove protocol and query string if present.
hostname_and_path="$(printf %s "${1}" | sed -e 's,^[^/]*//,,' -e 's,?.*$,,')" hostname_and_path="$(printf %s "${1}" | sed -e 's,^[^/]*//,,' -e 's,?.*$,,')"
# If what remains contains a slash, there's a path; return it percent-decoded. # If what remains contains a slash, there is a path; return it percent-decoded.
case "${hostname_and_path}" in case "${hostname_and_path}" in
# sed to remove everything preceding the last '/', e.g.: "example/something" becomes "something" # sed to remove everything preceding the last '/', e.g.: "example/something" becomes "something"
*/*) percent_decode "$(printf %s "${hostname_and_path}" | sed -e 's,^.*/,,')" ;; # sed to also replace ':' with the percent_encoded %3A
*/*) percent_decode "$(printf %s "${hostname_and_path}" | sed -e 's,^.*/,,' -e 's,:,%3A,g')" ;;
esac esac
# No slash means there was just a hostname and no path; return empty string. # No slash means there was just a hostname and no path; return empty string.
} }
@ -210,37 +212,39 @@ exec_curl()
CURL_NO_CLOBBER="" CURL_NO_CLOBBER=""
CURL_PARALLEL="" CURL_PARALLEL=""
# --no-clobber is only supported since 7.83.0.
# --parallel is only supported since 7.66.0.
# --parallel-max-host is only supported since 8.16.0.
if [ "${curl_version_major}" -ge 8 ]; then if [ "${curl_version_major}" -ge 8 ]; then
CURL_NO_CLOBBER="--no-clobber" CURL_NO_CLOBBER="--no-clobber"
CURL_PARALLEL="--parallel" CURL_PARALLEL="--parallel --parallel-max-host 5"
if [ "${curl_version_minor}" -ge 16 ]; then
CURL_PARALLEL="--parallel --parallel-max-host 5" # --parallel-max-host is only supported since 8.16.0.
if [ "${curl_version_major}" -eq 8 ] && [ "${curl_version_minor}" -lt 16 ]; then
CURL_PARALLEL="--parallel"
fi fi
elif [ "${curl_version_major}" -eq 7 ]; then elif [ "${curl_version_major}" -eq 7 ]; then
# --no-clobber is only supported since 7.83.0.
if [ "${curl_version_minor}" -ge 83 ]; then if [ "${curl_version_minor}" -ge 83 ]; then
CURL_NO_CLOBBER="--no-clobber" CURL_NO_CLOBBER="--no-clobber"
fi fi
# --parallel is only supported since 7.66.0.
if [ "${curl_version_minor}" -ge 66 ]; then if [ "${curl_version_minor}" -ge 66 ]; then
CURL_PARALLEL="--parallel" CURL_PARALLEL="--parallel"
fi fi
fi fi
# Detecting whether we need --parallel. It's easier to rely on # Detecting whether we need --parallel. It is easier to rely on
# the shell's argument parsing. # the shell's argument parsing.
# shellcheck disable=SC2086 # shellcheck disable=SC2086
set -- $URLS set -- $URLS
# If there are less than two URLs, don't set the parallel flag. # If there are less than two URLs, do not set the parallel flag.
if [ "$#" -lt 2 ]; then if [ "$#" -lt 2 ]; then
CURL_PARALLEL="" CURL_PARALLEL=""
fi fi
# Start assembling the command. # Start assembling the command.
# #
# We use 'set --' here (again) because (a) we don't have arrays on # We use 'set --' here (again) because (a) we do not have arrays on
# POSIX shell, and (b) we need better control over the way we # POSIX shell, and (b) we need better control over the way we
# split arguments. # split arguments.
# #