Mirrors/curl
0
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-18 17:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

badwords: fix issues found in scripts and other files

Browse Source 
Single pass, not enforced.

Also:
- pyspelling.words: drop `web page`

Closes #19572
This commit is contained in:
Viktor Szakats
2025-11-17 16:06:00 +01:00
parent 42c43f695c
commit ad35ecba97
45 changed files with 104 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/labeler.yml vendored
View File

@@ -11,7 +11,7 @@
# the files fit into the category, and the any-glob-to-any-file ones are added
# as long as any file matches. The first ones are for "major" categories (the
# PR is all about that one topic, like HTTP/3), while the second ones are
# "addendums" that give useful information about a PR that's really mostly
# "addendums" that give useful information about a PR that is really mostly
# something else (e.g. CI if the PR also touches CI jobs).
#
# N.B. any-glob-to-all-files is misnamed; it acts like one-glob-to-all-files.

8
.github/scripts/cleancmd.pl vendored
View File

@@ -16,7 +16,7 @@ use warnings;
my @asyms;
open(S, "<./docs/libcurl/symbols-in-versions")
|| die "can't find symbols-in-versions";
|| die "cannot find symbols-in-versions";
while(<S>) {
if(/^([^ ]*) /) {
push @asyms, $1;
@@ -30,7 +30,7 @@ my @aopts = (
);
open(O, "<./docs/options-in-versions")
|| die "can't find options-in-versions";
|| die "cannot find options-in-versions";
while(<O>) {
chomp;
if(/^([^ ]+)/) {
@@ -50,7 +50,7 @@ while(<O>) {
close(O);
open(C, "<./.github/scripts/spellcheck.curl")
|| die "can't find spellcheck.curl";
|| die "cannot find spellcheck.curl";
while(<C>) {
if(/^\#/) {
next;
@@ -99,7 +99,7 @@ sub process {
# *italics*
$l =~ s/\*(\S.*?)\*//g;
# strip out https URLs, we don't want them spellchecked
# strip out https URLs, we do not want them spellchecked
$l =~ s!https://[a-z0-9\#_/.-]+!!gi;
$out .= $l;

1
.github/scripts/pyspelling.words vendored
View File

@@ -957,7 +957,6 @@ watchOS
WAV
WB
wcurl
web page
WebDAV
WebOS
webpage

2
.github/stale.yml vendored
View File

@@ -6,7 +6,7 @@
daysUntilStale: 180
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
# Issues with these labels are never considered stale
exemptLabels:
- pinned
- security

6
.github/workflows/linux-old.yml vendored
View File

@@ -11,10 +11,10 @@
# is still supported (as of this writing).
# stretch has ELTS support from Freexian until 2027-06-30
# For ELTS info see https://www.freexian.com/lts/extended/docs/how-to-use-extended-lts/
# The Debian key will expire 2025-05-20, after which package signature
# The Debian key expires 2025-05-20, after which package signature
# verification may need to be disabled.
# httrack is one of the smallest downloaders, needed to bootstrap ELTS,
# and won't conflict with the curl we're building.
# and doesn not conflict with the curl we are building.
name: 'Linux Old'
@@ -74,7 +74,7 @@ jobs:
apt-get -o Dpkg::Use-Pty=0 update
apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends cmake make automake autoconf libtool gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libgnutls28-dev libc-ares-dev libkrb5-dev libldap2-dev librtmp-dev stunnel4 groff
# GitHub's actions/checkout needs newer glibc and libstdc++. The latter also depends on
# gcc-8-base, but it doesn't actually seem used in our situation and isn't available in
# gcc-8-base, but it does not actually seem used in our situation and is not available in
# the main repo, so force the install.
httrack --get https://deb.freexian.com/extended-lts/pool/main/g/glibc/libc6_2.28-10+deb10u5_amd64.deb
httrack --get https://deb.freexian.com/extended-lts/pool/main/g/gcc-8/libstdc++6_8.3.0-6_amd64.deb

2
.github/workflows/linux.yml vendored
View File

@@ -647,7 +647,7 @@ jobs:
rm ~/rustls/librustls.zip
- name: 'build rustls'
# Note: we don't check cache-hit here. If the cache is hit, we still need to dpkg install the deb.
# Note: we do not check cache-hit here. If the cache is hit, we need to dpkg install the deb.
if: ${{ contains(matrix.build.install_steps, 'rustls') }}
run: sudo dpkg -i ~/rustls/"librustls_${RUSTLS_VERSION}_amd64.deb"

4
CMake/Macros.cmake
View File

@@ -56,10 +56,10 @@ macro(curl_internal_test _curl_test)
"${_curl_test_add_libraries}"
OUTPUT_VARIABLE CURL_TEST_OUTPUT)
if(${_curl_test})
set(${_curl_test} 1 CACHE INTERNAL "Curl test")
set(${_curl_test} 1 CACHE INTERNAL "curl test")
message(STATUS "Performing Test ${_curl_test} - Success")
else()
set(${_curl_test} "" CACHE INTERNAL "Curl test")
set(${_curl_test} "" CACHE INTERNAL "curl test")
message(STATUS "Performing Test ${_curl_test} - Failed")
endif()
endif()

2
CMakeLists.txt
View File

@@ -1856,7 +1856,7 @@ check_type_size("off_t" SIZEOF_OFF_T)
if(NOT WIN32)
# fseeko may not exist with _FILE_OFFSET_BITS=64 but can exist with
# _FILE_OFFSET_BITS unset or 32 (e.g. Android ARMv7 with NDK 26b and API level < 24)
# _FILE_OFFSET_BITS unset or 32 (as in Android ARMv7 with NDK 26b and API level < 24)
# so we need to test fseeko after testing for _FILE_OFFSET_BITS
check_symbol_exists("fseeko" "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)

2
packages/OS400/curl.cmd
View File

@@ -29,4 +29,4 @@
PARM KWD(CMDARGS) TYPE(*CHAR) LEN(5000) VARY(*YES *INT2) +
CASE(*MIXED) EXPR(*YES) MIN(1) +
PROMPT('Curl command arguments')
PROMPT('curl command arguments')

4
packages/OS400/make-lib.sh
View File

@@ -79,7 +79,7 @@ fi
if [ -n "${LINK}" ]
then rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
CMD="${CMD} TEXT('LibCurl API static binding directory')"
CMD="${CMD} TEXT('libcurl API static binding directory')"
CLcommand "${CMD}"
for MODULE in ${MODULES}
@@ -173,7 +173,7 @@ fi
if [ -n "${LINK}" ]
then rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
CMD="${CMD} TEXT('LibCurl API dynamic binding directory')"
CMD="${CMD} TEXT('libcurl API dynamic binding directory')"
CLcommand "${CMD}"
CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"

2
packages/OS400/rpg-examples/HEADERAPI
View File

@@ -1,4 +1,4 @@
* Curl header API: extract headers post transfer
* curl header API: extract headers post transfer
*
h DFTACTGRP(*NO) ACTGRP(*NEW)
h OPTION(*NOSHOWCPY)

2
packages/OS400/rpg-examples/HTTPPOST
View File

@@ -1,4 +1,4 @@
* Curl MIME post data and display response
* curl MIME post data and display response
*
h DFTACTGRP(*NO) ACTGRP(*NEW)
h OPTION(*NOSHOWCPY)

2
packages/OS400/rpg-examples/INMEMORY
View File

@@ -1,4 +1,4 @@
* Curl get in memory and count HTML tags
* curl get in memory and count HTML tags
*
h DFTACTGRP(*NO) ACTGRP(*NEW)
h OPTION(*NOSHOWCPY)

2
packages/OS400/rpg-examples/SIMPLE1
View File

@@ -1,4 +1,4 @@
* Curl simple URL request
* curl simple URL request
*
h DFTACTGRP(*NO) ACTGRP(*NEW)
h OPTION(*NOSHOWCPY)

2
packages/OS400/rpg-examples/SIMPLE2
View File

@@ -1,4 +1,4 @@
* Curl simple URL request (free-format RPG)
* curl simple URL request (free-format RPG)
*
ctl-opt dftactgrp(*NO) actgrp(*NEW)
option(*NOSHOWCPY)

2
packages/OS400/rpg-examples/SMTPSRCMBR
View File

@@ -1,4 +1,4 @@
* Curl SMTP send source member as attachment
* curl SMTP send source member as attachment
*
h DFTACTGRP(*NO) ACTGRP(*NEW)
h OPTION(*NOSHOWCPY)

2
packages/vms/build_gnv_curl_pcsi_desc.com
View File

@@ -22,7 +22,7 @@ $!
$! The PCSI system can really only handle ODS-2 format filenames and
$! assumes that there is only one source directory. It also assumes that
$! all destination files with the same name come from the same source file.
$! Fortunately CURL does not trip most of these issues, so those steps
$! Fortunately curl does not trip most of these issues, so those steps
$! above are marked N/A.
$!
$! A rename action section is needed to make sure that the files are

4
packages/vms/build_gnv_curl_pcsi_text.com
View File

@@ -2,9 +2,9 @@ $! File: Build_GNV_curl_pcsi_text.com
$!
$! Build the *.pcsi$text file from the four components:
$! 1. Generated =product header section
$! 2. [--]readme. file from the Curl distribution, modified to fit
$! 2. [--]readme. file from the curl distribution, modified to fit
$! a pcsi$text file format.
$! 3. [--]copying file from the Curl distribution, modified to fit
$! 3. [--]copying file from the curl distribution, modified to fit
$! a pcsi$text file format.
$! 4. Generated Producer section.
$!

10
packages/vms/build_gnv_curl_release_notes.com
View File

@@ -3,7 +3,7 @@ $!
$! Build the release note file from the four components:
$! 1. The curl_release_note_start.txt
$! 2. The hp_ssl_release_info.txt
$! 3. [--]readme. file from the Curl distribution.
$! 3. [--]readme. file from the curl distribution.
$! 4. The Curl_gnv-build_steps.txt.
$!
$! Set the name of the release notes from the GNV_PCSI_FILENAME_BASE
@@ -42,7 +42,7 @@ $ curl_readme = f$search("sys$disk:[--]$README.")
$ endif
$ if curl_readme .eqs. ""
$ then
$ write sys$output "Can not find Curl readme file."
$ write sys$output "Can not find curl readme file."
$ goto all_exit
$ endif
$!
@@ -53,7 +53,7 @@ $ curl_copying = f$search("sys$disk:[--]$COPYING.")
$ endif
$ if curl_copying .eqs. ""
$ then
$ write sys$output "Can not find Curl copying file."
$ write sys$output "Can not find curl copying file."
$ goto all_exit
$ endif
$!
@@ -64,7 +64,7 @@ $ vms_readme = f$search("sys$disk:[]$README.")
$ endif
$ if vms_readme .eqs. ""
$ then
$ write sys$output "Can not find VMS specific Curl readme file."
$ write sys$output "Can not find VMS specific curl readme file."
$ goto all_exit
$ endif
$!
@@ -75,7 +75,7 @@ $ curl_release_notes = f$search("sys$disk:[--]$RELEASE-NOTES.")
$ endif
$ if curl_release_notes .eqs. ""
$ then
$ write sys$output "Can not find Curl release-notes file."
$ write sys$output "Can not find curl release-notes file."
$ goto all_exit
$ endif
$!

8
packages/vms/build_vms.com
View File

@@ -516,7 +516,7 @@ $ endif
$!
$!
$! CC /LIST, LINK /MAP, and MESSAGE /LIST are defaults in batch mode,
$! so be explicit when they're not desired.
$! so be explicit when they are not desired.
$!
$
$ if list .eq. 0
@@ -744,7 +744,7 @@ $ endif
$ if ((f$search(ossl_lib1) .eqs. "") .or. -
(f$search(ossl_lib2) .eqs. ""))
$ then
$ write sys$output "Can't find OpenSSL ''msg':"
$ write sys$output "Cannot find OpenSSL ''msg':"
$ write sys$output " ''ossl_lib1'"
$ write sys$output " ''ossl_lib2'"
$ goto Common_Exit
@@ -943,7 +943,7 @@ $ reset = f$search( "reset", 1)
$Loop:
$ file = f$search( search, 1)
$ if file .eqs. "" then goto EndLoop
$! Skip a name if it's in the P4 exclusion list.
$! Skip a name if it is in the P4 exclusion list.
$ if (p4 .nes. "")
$ then
$ name__ = "," + -
@@ -1016,7 +1016,7 @@ $ endif
$ ENDSUBROUTINE ! Compile
$!
$! Do a diff of the file specified in P1 with that in P2. If different
$! copy P1 to P2. This also covers if P2 doesn't exist, but not if P2
$! copy P1 to P2. This also covers if P2 does not exist, but not if P2
$! is an invalid filespec.
$!
$MoveIfDiff: subroutine

2
packages/vms/compare_curl_source.com
View File

@@ -255,7 +255,7 @@ $ then
$ ref_fname = f$edit(ref_fname, "LOWERCASE")
$ endif
$!
$! These files are in the wrong format for VMS diff, and we don't change them.
$! These files are in the wrong format for VMS diff, and we do not change them.
$ ref_skip = 0
$ if ref_type .eqs. ".PDF" then ref_skip = 1
$ if ref_type .eqs. ".HTML" then ref_skip = 1

2
packages/vms/curl_crtl_init.c
View File

@@ -33,7 +33,7 @@
* will turn on some CRTL features that are not enabled by default.
*
* The CRTL features can also be turned on via logical names, but that
* impacts all programs and some aren't ready, willing, or able to handle
* impacts all programs and some are not ready, willing, or able to handle
* those settings.
*
* On VMS versions that are too old to use the feature setting API, this

6
packages/vms/curl_gnv_build_steps.txt
View File

@@ -16,11 +16,11 @@ From File: curl_gnv_build_steps.txt
SPDX-License-Identifier: ISC
Currently building Curl using GNV takes longer than building Curl via DCL.
Currently building curl using GNV takes longer than building curl via DCL.
The GNV procedure actually uses the same configure and makefiles that
Unix builds use.
Building CURL on OpenVMS using GNV requires GNV V2.1-2 or the updated
Building curl on OpenVMS using GNV requires GNV V2.1-2 or the updated
images that are available via anonymous FTP at encompasserve.org in the gnv
directory. It also requires the GNV Bash 4.2.45 kit as an update from the
same location or from the sourceforge.net GNV project.
@@ -100,7 +100,7 @@ Note to builders:
GNV currently has a bug where configure scripts take a long time to run.
Some of the configure steps take a while to complete, and on a 600 Mhz
DS10 with IDE disks, taking an hour to run the CURL configure is normal.
DS10 with IDE disks, taking an hour to run the curl configure is normal.
The following messages can be ignored and may get fixed in a future version
of GNV. The GNV$*.OPT files are used to find the libraries as many have

8
packages/vms/curl_release_note_start.txt
View File

@@ -16,16 +16,16 @@ OpenVMS specific building and kitting instructions are after the standard
curl readme file.
This product may be available for your platform in a PCSI kit. The source kit
contains files for building CURL using GNV or with a DCL procedure.
contains files for building curl using GNV or with a DCL procedure.
The GNV based build creates a libcurl share imaged which is supplied in the
PCSI kit.
This version of CURL will return VMS compatible status codes when run from
This version of curl will return VMS compatible status codes when run from
DCL and Unix compatible exit codes and messages when run with the SHELL
environment variable set.
This port of Curl uses the OpenSSL, Ldap, and Kerberos V5 that are bundled
This port of curl uses the OpenSSL, Ldap, and Kerberos V5 that are bundled
with OpenVMS or supplied as updates by HP. Ldap and Kerberos are not available
on the VAX platform. See section below for a special note about HP OpenSSL
on Alpha and IA64.
@@ -61,7 +61,7 @@ For the HP SSL work around to work for GNV do the following:
Similar workarounds will be needed for any program linked with GNV$LIBCURL
until the HP OpenSSL is upgraded to the current 1.4 version or later.
If you are installing a "daily" build instead of a release build of Curl, some
If you are installing a "daily" build instead of a release build of curl, some
things have been changed so that it can be installed at the same time as
a production build without conflicts.

4
packages/vms/curl_startup.com
View File

@@ -1,6 +1,6 @@
$! File: curl_Startup.com
$!
$! Procedure to setup the CURL libraries for use by programs from the
$! Procedure to setup the curl libraries for use by programs from the
$! VMS SYSTARTUP*.COM procedure.
$!
$! Copyright (C) John Malmberg
@@ -75,7 +75,7 @@ $ define/system/exec gnv$curl_ssl_libcryptoshr32 'curl_ssl_libcrypto32'
$ define/system/exec gnv$curl_ssl_libsslshr32 'curl_ssl_libssl32'
$!
$!
$! CURL setup
$! curl setup
$ define/system/exec gnv$libcurl gnv$gnu:[usr.lib]GNV$LIBCURL.EXE
$ define/system/exec gnv$curl_include gnv$gnu:[usr.include.curl]
$ if .not. f$file_attributes("gnv$libcurl", "known")

6
packages/vms/generate_config_vms_h_curl.com
View File

@@ -1,6 +1,6 @@
$! File: GENERATE_CONFIG_H_CURL.COM
$!
$! Curl like most open source products uses a variant of a config.h file.
$! curl like most open source products uses a variant of a config.h file.
$! Depending on the curl version, this could be config.h or curl_config.h.
$!
$! For GNV based builds, the configure script is run and that produces
@@ -197,7 +197,7 @@ $write cvh "#define __CONFIG_VMS_H__"
$write cvh ""
$write cvh "/* Define cpu-machine-OS */"
$!
$! Curl uses an OS macro to set the build environment.
$! curl uses an OS macro to set the build environment.
$!----------------------------------------------------
$! Now the DCL builds usually say xxx-HP-VMS and configure scripts
$! may put DEC or COMPAQ or HP for the middle part.
@@ -345,7 +345,7 @@ $!
$!
$! I can not figure out where the C compiler is finding the ALLOCA.H file
$! in the text libraries, so CONFIG_H.COM can not find it either.
$! Usually the header file name is the module name in the text library.
$! Usually the header filename is the module name in the text library.
$! It does not appear to hurt anything to not find header file, so we
$! are not overriding it here.
$!

2
packages/vms/gnv_curl_configure.sh
View File

@@ -1,6 +1,6 @@
# File: gnv_curl_configure.sh
#
# Set up and run the configure script for Curl so that it can find the
# Set up and run the configure script for curl so that it can find the
# proper options for VMS.
#
# Copyright (C) John Malmberg

8
packages/vms/gnv_link_curl.com
View File

@@ -259,7 +259,7 @@ This package is built on with the OpenSSL version listed below and requires
the shared images from the HP OpenSSL product that is kitted with that
version or a compatible later version.
For Alpha and IA64 platforms, see the url below to register to get the
For Alpha and IA64 platforms, see the URL below to register to get the
download URL. The kit will be HP 1.4-467 or later.
https://h41379.www4.hpe.com/openvms/products/ssl/ssl.html
@@ -269,10 +269,10 @@ download URLs provided and put in CPQ-VAXVMS-SSL-V0101-B-1.PCSI-DCX_VAXEXE
If your system can not be upgraded to a compatible version of OpenSSL, then
you can extract the two shared images from the kit and place them in the
[vms$common.gnv.lib]directory of the volume that you are installing GNV and
or GNV compatible components like Curl.
or GNV compatible components like curl.
If GNV is installed, you must run the GNV startup procedure before these steps
and before installing Curl.
and before installing curl.
1. make sure that [vms$common.gnv.lib] exists by using the following
@@ -387,7 +387,7 @@ $!
$ if f$search("[.src]curl-tool_main.o") .nes. ""
$ then
$! From src/makefile.inc:
$! # libcurl has sources that provide functions named curlx_* that aren't
$! # libcurl has sources that provide functions named curlx_* that are not
$! # part of the official API, but we reuse the code here to avoid
$! # duplication.
$!

2
packages/vms/make_gnv_curl_install.sh
View File

@@ -1,6 +1,6 @@
# File: make_gnv_curl_install.sh
#
# Set up and run the make script for Curl.
# Set up and run the make script for curl.
#
# This makes the library, the curl binary and attempts an install.
# A search list should be set up for GNU (GNV$GNU).

2
packages/vms/pcsi_gnv_curl_file_list.txt
View File

@@ -1,7 +1,7 @@
! File: PCSI_GNV_CURL_FILE_LIST.TXT
!
! File list for building a PCSI kit.
! Very simple format so that the parsing logic can be simple.
! Simple format so that the parsing logic can be simple.
! links first, directory second, and files third.
!
! link -> file tells procedure to create/remove a link on install/uninstall

6
packages/vms/pcsi_product_gnv_curl.com
View File

@@ -1,6 +1,6 @@
$! File: PCSI_PRODUCT_GNV_CURL.COM
$!
$! This command file packages up the product CURL into a sequential
$! This command file packages up the product curl into a sequential
$! format kit
$!
$! Copyright (C) John Malmberg
@@ -85,8 +85,8 @@ $ endif
$ @gnv_link_curl.com
$ endif
$!
$! Make sure that the release note file name is up to date
$!---------------------------------------------------------
$! Make sure that the release note filename is up to date
$!--------------------------------------------------------
$ @BUILD_GNV_CURL_RELEASE_NOTES.COM
$!
$!

10
packages/vms/readme
View File

@@ -202,17 +202,17 @@ Other Notes:
This release fixes known bugs #22, and #57 in the [curl.docs]known_bugs.
file.
The libcurl formdata.c module and Curl tools post form now have some
The libcurl formdata.c module and curl tools post form now have some
understanding of VMS file types. Files will be posted in STREAM_LF format.
The Curl tool now has some understanding of VMS file types and will upload the
The curl tool now has some understanding of VMS file types and will upload the
files in STREAM_LF format.
When CURL is uploading a VARIABLE format VMS file, it is less efficient as in
When curl is uploading a VARIABLE format VMS file, it is less efficient as in
order to get the file size, it will first read the entire file once, and then
read the file again for the actual upload.
The Curl tool will now always download files into STREAM_LF format. Even if a
The curl tool will now always download files into STREAM_LF format. Even if a
file by that name with a different format already exists. This is needed to
allow interrupted downloads to be continued.
@@ -225,4 +225,4 @@ The test suites are not supported as of 7.11.0.
The curlmsg.sdl and curlmsg.h files are generated from curlmsg.msg.
This is not done automatically, since the .MSG file is a hand edit
of the relevant stuff from the curl.h file. If you want to do this
yourself you'll need the SDL package from the freeware collection.
yourself you need the SDL package from the freeware collection.

2
packages/vms/setup_gnv_curl_build.com
View File

@@ -1,6 +1,6 @@
$! File: setup_gnv_curl_build.com
$!
$! Set up build environment for building Curl under GNV on VMS.
$! Set up build environment for building curl under GNV on VMS.
$!
$! GNV needs some files moved into the other directories to help with
$! the configure script and the build.

8
scripts/cd2nroff
View File

@@ -55,10 +55,10 @@ while(@ARGV) {
print <<HELP
Usage: cd2nroff [options] [file.md]
-d <dir> Write the output to the file name from the meta-data in the
-d <dir> Write the output to the filename from the meta-data in the
specified directory, instead of writing to stdout
-e <ext> If -d is used, this option can provide an added "extension", arbitrary
text really, to append to the file name.
text really, to append to the filename.
-h This help text,
-v Show version then exit
HELP
@@ -373,7 +373,7 @@ sub single {
my $blankline = 0;
my $header = 0;
# cut off the leading path from the file name, if any
# cut off the leading path from the filename, if any
$f =~ s/^(.*[\\\/])//;
push @desc, ".\\\" generated by cd2nroff $cd2nroff from $f\n";
@@ -515,7 +515,7 @@ sub single {
$blankline++;
}
else {
# don't output newlines if this is the first content after a
# do not output newlines if this is the first content after a
# header
push @desc, "\n" if($blankline && !$header);
$blankline = 0;

2
scripts/cdall
View File

@@ -23,7 +23,7 @@
#
###########################################################################
# provide all dir names to scan on the cmdline
# provide all directory names to scan on the command-line
use strict;
use warnings;

10
scripts/checksrc.pl
View File

@@ -181,7 +181,7 @@ sub readskiplist {
# Reads the .checksrc in $dir for any extended warnings to enable locally.
# Currently there is no support for disabling warnings from the standard set,
# and since that's already handled via !checksrc! commands there is probably
# and since that is already handled via !checksrc! commands there is probably
# little use to add it.
sub readlocalfile {
my ($file) = @_;
@@ -246,7 +246,7 @@ sub checkwarn {
my $nowarn=0;
#if(!$warnings{$name}) {
# print STDERR "Dev! there's no description for $name!\n";
# print STDERR "Dev! there is no description for $name!\n";
#}
# checksrc.skip
@@ -351,7 +351,7 @@ if(!$file) {
print " -A[rule] Accept this violation, can be used multiple times\n";
print " -a[func] Allow use of this function\n";
print " -b[func] Ban use of this function\n";
print " -D[DIR] Directory to prepend file names\n";
print " -D[DIR] Directory to prepend filenames\n";
print " -h Show help output\n";
print " -W[file] Skip the given file - ignore all its flaws\n";
print " -i<n> Indent spaces. Default: 2\n";
@@ -971,7 +971,7 @@ sub scanfile {
}
# check for open brace first on line but not first column only alert
# if previous line ended with a close paren and it wasn't a cpp line
# if previous line ended with a close paren and it was not a cpp line
if(($prevl =~ /\)\z/) && ($l =~ /^( +)\{/) && !$prevp) {
checkwarn("BRACEPOS",
$line, length($1), $file, $ol, "badly placed open brace");
@@ -995,7 +995,7 @@ sub scanfile {
}
# if the previous line starts with if/while/for AND ends with a closed
# parenthesis and there's an equal number of open and closed
# parenthesis and there is an equal number of open and closed
# parentheses, check that this line is indented $indent more steps, if
# not a cpp line
elsif(!$prevp && ($prevl =~ /^( *)(if|while|for)(\(.*\))\z/)) {

4
scripts/ciconfig.pl
View File

@@ -182,7 +182,7 @@ for my $w (sort keys %avail) {
}
}
print "Never ENABLED configure options that aren't on by default\n";
print "Never ENABLED configure options that are not on by default\n";
for my $w (sort keys %avail) {
if(!$with{$w} && !$defaulton{$w}) {
printf " %s\n", $w;
@@ -190,7 +190,7 @@ for my $w (sort keys %avail) {
}
print "ENABLED configure options that aren't available\n";
print "ENABLED configure options that are not available\n";
for my $w (sort keys %with) {
if(!$avail{$w}) {
printf " %s\n", $w;

2
scripts/cmakelint.sh
View File

@@ -34,7 +34,7 @@
# cmake-lint can be installed from PyPi with the command "python3 -m pip
# install cmakelang".
#
# The xargs invocation is portable, but does not preserve spaces in file names.
# The xargs invocation is portable, but does not preserve spaces in filenames.
# If such a file is ever added, then this can be portably fixed by switching to
# "xargs -I{}" and appending {} to the end of the xargs arguments (which will
# call cmakelint once per file) or by using the GNU extension "xargs -d'\n'".

8
scripts/completion.pl
View File

@@ -84,8 +84,8 @@ sub parse_main_opts {
@files = readdir($dir_handle);
closedir($dir_handle) || die "Unable to close handle on dir: $opts_dir due to error: $!";
# We want regular files that end with .md and don't start with an underscore
# Edge case: MANPAGE.md doesn't start with an underscore but also isn't documentation for an option
# We want regular files that end with .md and do not start with an underscore
# Edge case: MANPAGE.md does not start with an underscore but also is not documentation for an option
@files = grep { $_ =~ /\.md$/i && !/^_/ && -f "$opts_dir/$_" && $_ ne "MANPAGE.md" } @files;
for my $file (@files) {
@@ -145,8 +145,8 @@ sub parse_main_opts {
push(@list, $option);
}
# Sort longest first, because zsh won't complete an option listed
# after one that's a prefix of it. When length is equal, fall back
# Sort longest first, because zsh does not complete an option listed
# after one that is a prefix of it. When length is equal, fall back
# to stringwise cmp.
@list = sort {
$a =~ /([^=]*)/; my $ma = $1;

4
scripts/managen
View File

@@ -538,7 +538,7 @@ sub render {
exit 3;
}
if($quote) {
# don't leave the quote "hanging"
# do not leave the quote "hanging"
push @desc, ".fi\n" if($manpage);
}
if($tablemode) {
@@ -1052,7 +1052,7 @@ sub sourcecategories {
my ($dir) = @_;
my %cats;
open(H, "<$dir/../../src/tool_help.h") ||
die "can't find the header file";
die "cannot find the header file";
while(<H>) {
if(/^\#define CURLHELP_([A-Z0-9]*)/) {
$cats{lc($1)}++;

32
scripts/mk-ca-bundle.pl
View File

@@ -92,7 +92,7 @@ my @valid_mozilla_trust_purposes = (
my @valid_mozilla_trust_levels = (
"TRUSTED_DELEGATOR", # CAs
"NOT_TRUSTED", # Don't trust these certs.
"MUST_VERIFY_TRUST", # This explicitly tells us that it ISN'T a CA but is
"MUST_VERIFY_TRUST", # This explicitly tells us that it IS NOT a CA but is
# otherwise ok. In other words, this should tell the
# app to ignore any other sources that claim this is
# a CA.
@@ -154,7 +154,7 @@ sub warning_message() {
print " 2) Default to 'release', but more recent updates may be found in other trees\n";
print " 3) certdata.txt file format may change, lag time to update this script\n";
print " 4) Generally unwise to blindly trust CAs without manual review & verification\n";
print " 5) Mozilla apps use additional security checks aren't represented in certdata\n";
print " 5) Mozilla apps use additional security checks are not represented in certdata\n";
print " 6) Use of this script will make a security engineer grind his teeth and\n";
print " swear at you. ;)\n";
exit;
@@ -241,7 +241,7 @@ sub parse_csv_param($$@) {
sub sha256 {
my $result;
if($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) {
open(FILE, $_[0]) or die "Can't open '$_[0]': $!";
open(FILE, $_[0]) or die "Could not open '$_[0]': $!";
binmode(FILE);
$result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest;
close(FILE);
@@ -401,9 +401,9 @@ my $currentdate = scalar gmtime($filedate);
my $format = $opt_t ? "plain text and " : "";
if($stdout) {
open(CRT, '> -') or die "Couldn't open STDOUT: $!\n";
open(CRT, '> -') or die "Could not open STDOUT: $!\n";
} else {
open(CRT,">$crt.~") or die "Couldn't open $crt.~: $!\n";
open(CRT,">$crt.~") or die "Could not open $crt.~: $!\n";
}
print CRT <<EOT;
##
@@ -442,7 +442,7 @@ my @precert;
my $cka_value;
my $valid = 0;
open(TXT,"$txt") or die "Couldn't open $txt: $!\n";
open(TXT,"$txt") or die "Could not open $txt: $!\n";
while(<TXT>) {
if(/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
print CRT;
@@ -629,25 +629,25 @@ while(<TXT>) {
$pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM";
if(!$stdout) {
$pipe .= " >> $crt.~";
close(CRT) or die "Couldn't close $crt.~: $!";
close(CRT) or die "Could not close $crt.~: $!";
}
open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
open(TMP, $pipe) or die "Could not open openssl pipe: $!";
print TMP $pem;
close(TMP) or die "Couldn't close openssl pipe: $!";
close(TMP) or die "Could not close openssl pipe: $!";
if(!$stdout) {
open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
open(CRT, ">>$crt.~") or die "Could not open $crt.~: $!";
}
}
$pipe = "|$openssl x509 -text -inform PEM";
if(!$stdout) {
$pipe .= " >> $crt.~";
close(CRT) or die "Couldn't close $crt.~: $!";
close(CRT) or die "Could not close $crt.~: $!";
}
open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
open(TMP, $pipe) or die "Could not open openssl pipe: $!";
print TMP $pem;
close(TMP) or die "Couldn't close openssl pipe: $!";
close(TMP) or die "Could not close openssl pipe: $!";
if(!$stdout) {
open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
open(CRT, ">>$crt.~") or die "Could not open $crt.~: $!";
}
}
report "Processed: $caname" if($opt_v);
@@ -655,8 +655,8 @@ while(<TXT>) {
}
}
}
close(TXT) or die "Couldn't close $txt: $!\n";
close(CRT) or die "Couldn't close $crt.~: $!\n";
close(TXT) or die "Could not close $txt: $!\n";
close(CRT) or die "Could not close $crt.~: $!\n";
unless($stdout) {
if($opt_b && -e $crt) {
my $bk = 1;

2
scripts/perlcheck.sh
View File

@@ -23,7 +23,7 @@
#
###########################################################################
# The xargs invocation is portable, but does not preserve spaces in file names.
# The xargs invocation is portable, but does not preserve spaces in filenames.
# If such a file is ever added, then this can be portably fixed by switching to
# "xargs -I{}" and appending {} to the end of the xargs arguments (which will
# call cmakelint once per file) or by using the GNU extension "xargs -d'\n'".

4
scripts/release-notes.pl
View File

@@ -31,10 +31,10 @@
#
# $ ./scripts/release-notes.pl
#
# 2. Edit RELEASE-NOTES and remove all entries that don't belong. Unused
# 2. Edit RELEASE-NOTES and remove all entries that do not belong. Unused
# references below will be cleaned up in the next step. Make sure to move
# "changes" up to the changes section. All entries will by default be listed
# under bug-fixes as this script can't know where to put them.
# under bug-fixes as this script cannot know where to put them.
#
# 3. Run the cleanup script and let it sort the entries and remove unused
# references from lines you removed in step (2):

2
scripts/release-tools.sh
View File

@@ -31,7 +31,7 @@ version=${2:-unknown}
tag=$(echo "curl-$version" | tr '.' '_')
commit=${3}
if [ -n "$commit" ] && [ -r "docs/tarball-commit.txt.dist" ]; then
# If commit is given, then the tag likely doesn't actually exist
# If commit is given, then the tag likely does not actually exist
tag="$(cat docs/tarball-commit.txt.dist)"
fi

2
scripts/top-complexity
View File

@@ -64,7 +64,7 @@ open(F, "git ls-files '*.c'|");
while(<F>) {
chomp $_;
my $file = $_;
# we can't filter these with git so do it here
# we cannot filter these with git so do it here
if($file =~ /^(lib|src)/) {
push @files, $file;
}