Skip to content

Commit 11f840c

Browse files
authored
expand English contractions (#79)
curl follows this convention, I thought following it in wcurl may be a good idea.
1 parent 9da9020 commit 11f840c

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ SPDX-License-Identifier: curl
99
# Changelog
1010

1111
## [v2025.11.09]
12-
* Really fix CVE-2025-11563: The patch from v2025.11.04 didn't fix the CVE and
12+
* Really fix CVE-2025-11563: The patch from v2025.11.04 did not fix the CVE and
1313
the unit test verifying it was broken.
1414
* Replace `>/dev/stderr` with `>&2` for portability.
1515

1616
## [v2025.11.04]
17-
* Fix CVE-2025-11563: Don't percent-decode `/` and `\` in output file name to
17+
* Fix CVE-2025-11563: Do not percent-decode `/` and `\` in output file name to
1818
avoid path traversal.
1919
* Fix typos reported by pyspelling.
2020
* Multiple improvements to GitHub Actions.
@@ -84,11 +84,11 @@ SPDX-License-Identifier: curl
8484
* Drop `getopt` usage, non-GNU/Linux environments are supported now.
8585
* Replace `-o`/`--opts=` parameters with `--curl-options`/`--curl-options=`.
8686
This alternative is more descriptive and it does not coincide with any of curl's parameters.
87-
* Stop auto-resuming downloads and don't overwrite files instead by default.
87+
* Stop auto-resuming downloads and do not overwrite files instead by default.
8888
Safer alternative as otherwise curl can corrupt a file if the name clashes and the size of the existing one is smaller.
8989
One can easily change that behavior with `--curl-options="--continue-at -"`.
9090
* New `--dry-run` option: just print what would be invoked.
91-
* Choose HTTPS as a default protocol, in case there's none in the URL.
91+
* Choose HTTPS as a default protocol, in case there is none in the URL.
9292
* Disable curl's URL globbing parser so `{}` and `[]` characters in URLs are not treated specially.
9393
* Implement support for `--`.
9494
* Implement `-V`/`--version` options.
@@ -98,10 +98,10 @@ SPDX-License-Identifier: curl
9898
## [v2024-07-02]
9999
* First "public" release, announcing the project.
100100
* Use `exec` instead of `eval`.
101-
* Only set `--parallel` if there's more than one URL.
101+
* Only set `--parallel` if there is more than one URL.
102102
* Fix manpage typo.
103103
* Update COPYRIGHT and AUTHORS in manpage.
104-
* Rewrite wcurl to remove bash dependency, it's now a POSIX shell script.
104+
* Rewrite wcurl to remove bash dependency, it is now a POSIX shell script.
105105
* Add README.md.
106106
* Add LICENSE.
107107

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ should be using curl directly if your use case is not covered.
8888

8989
* `--no-decode-filename`
9090

91-
Don't percent-decode the output filename, even if the percent-encoding in the
91+
Do not percent-decode the output filename, even if the percent-encoding in the
9292
URL was done by wcurl, e.g.: The URL contained whitespace.
9393

9494
* `--dry-run`
9595

96-
Don't actually execute curl, just print what would be invoked.
96+
Do not actually execute curl, just print what would be invoked.
9797

9898
* `-V, --version`
9999

tests/tests.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ testUrlDefaultName()
153153
{
154154
url='example%20with%20spaces.com'
155155
ret=$(${WCURL_CMD} ${url} 2>&1)
156-
assertContains "Verify whether 'wcurl' chooses the correct default filename when there's no path in the URL" "${ret}" 'index.html'
156+
assertContains "Verify whether 'wcurl' chooses the correct default filename when there is no path in the URL" "${ret}" 'index.html'
157157
}
158158

159159
testUrlDefaultNameTrailingSlash()
160160
{
161161
url='example%20with%20spaces.com/'
162162
ret=$(${WCURL_CMD} ${url} 2>&1)
163-
assertContains "Verify whether 'wcurl' chooses the correct default filename when there's no path in the URL and the URl ends with a slash" "${ret}" 'index.html'
163+
assertContains "Verify whether 'wcurl' chooses the correct default filename when there is no path in the URL and the URl ends with a slash" "${ret}" 'index.html'
164164
}
165165

166166
testUrlDecodingWhitespace()
@@ -207,9 +207,9 @@ testUrlDecodingBackslashes()
207207
assertContains "Verify whether 'wcurl' successfully uses the default filename when the URL ends with a slash" "${ret}" '--output filename%5Cwith%2Fbackslashes%5c%2f'
208208
}
209209

210-
# Test decoding a bunch of different languages (that don't use the latin
210+
# Test decoding a bunch of different languages (that do not use the latin
211211
# alphabet), we could split each language on its own test, but for now it
212-
# doesn't make a difference.
212+
# does not make a difference.
213213
testUrlDecodingNonLatinLanguages()
214214
{
215215
# Arabic
@@ -236,7 +236,7 @@ testUrlDecodingNonLatinLanguages()
236236
## Ideas for tests:
237237
##
238238
## - URL with whitespace
239-
## - Different encodes don't get messed up
239+
## - Different encodes do not get messed up
240240
## - Test '--' (with and without)
241241
## - Test filename output (URL ending/not ending with slash)
242242
## - Filename with whitespace (decoding)

wcurl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ Options:
6464
number appended to the end (curl >= 7.83.0). If this option is provided
6565
multiple times, only the last value is considered.
6666
67-
--no-decode-filename: Don't percent-decode the output filename, even if the percent-encoding in
67+
--no-decode-filename: Do not percent-decode the output filename, even if the percent-encoding in
6868
the URL was done by wcurl, e.g.: The URL contained whitespace.
6969
70-
--dry-run: Don't actually execute curl, just print what would be invoked.
70+
--dry-run: Do not actually execute curl, just print what would be invoked.
7171
7272
-V, --version: Print version information.
7373
@@ -167,7 +167,7 @@ percent_decode()
167167
# If character is a "%", read the next character as decode_hex1.
168168
if [ "${decode_out}" = % ] && IFS= read -r decode_hex1; then
169169
decode_out="${decode_out}${decode_hex1}"
170-
# If there's one more character, read it as decode_hex2.
170+
# If there is one more character, read it as decode_hex2.
171171
if IFS= read -r decode_hex2; then
172172
decode_out="${decode_out}${decode_hex2}"
173173
# Skip decoding if this is a control character (00-1F).
@@ -190,7 +190,7 @@ get_url_filename()
190190
{
191191
# Remove protocol and query string if present.
192192
hostname_and_path="$(printf %s "${1}" | sed -e 's,^[^/]*//,,' -e 's,?.*$,,')"
193-
# If what remains contains a slash, there's a path; return it percent-decoded.
193+
# If what remains contains a slash, there is a path; return it percent-decoded.
194194
case "${hostname_and_path}" in
195195
# sed to remove everything preceding the last '/', e.g.: "example/something" becomes "something"
196196
*/*) percent_decode "$(printf %s "${hostname_and_path}" | sed -e 's,^.*/,,')" ;;
@@ -228,19 +228,19 @@ exec_curl()
228228
fi
229229
fi
230230

231-
# Detecting whether we need --parallel. It's easier to rely on
231+
# Detecting whether we need --parallel. It is easier to rely on
232232
# the shell's argument parsing.
233233
# shellcheck disable=SC2086
234234
set -- $URLS
235235

236-
# If there are less than two URLs, don't set the parallel flag.
236+
# If there are less than two URLs, do not set the parallel flag.
237237
if [ "$#" -lt 2 ]; then
238238
CURL_PARALLEL=""
239239
fi
240240

241241
# Start assembling the command.
242242
#
243-
# We use 'set --' here (again) because (a) we don't have arrays on
243+
# We use 'set --' here (again) because (a) we do not have arrays on
244244
# POSIX shell, and (b) we need better control over the way we
245245
# split arguments.
246246
#

wcurl.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ URLs are provided, resulting files share the same name with a number appended to
6767
the end (curl >= 7.83.0). If this option is provided multiple times, only the
6868
last value is considered.
6969
.IP --no-decode-filename
70-
Don\(aqt percent\-decode the output filename, even if the percent\-encoding in the
70+
Do not percent\-decode the output filename, even if the percent\-encoding in the
7171
URL was done by \fBwcurl\fP, e.g.: The URL contained whitespace.
7272
.IP --dry-run
7373
Do not actually execute curl, just print what would be invoked.

wcurl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ last value is considered.
8787

8888
## --no-decode-filename
8989

90-
Don't percent-decode the output filename, even if the percent-encoding in the
90+
Do not percent-decode the output filename, even if the percent-encoding in the
9191
URL was done by **wcurl**, e.g.: The URL contained whitespace.
9292

9393
## --dry-run

0 commit comments

Comments
 (0)