From f81f351b9aa63b76066bde1ef5224efd0925664e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 3 Aug 2024 01:09:57 +0200 Subject: [PATCH] tidy-up: OS names Use these words and casing more consistently across text, comments and one curl tool output: AIX, ALPN, ANSI, BSD, Cygwin, Darwin, FreeBSD, GitHub, HP-UX, Linux, macOS, MS-DOS, MSYS, MinGW, NTLM, POSIX, Solaris, UNIX, Unix, Unicode, WINE, WebDAV, Win32, winbind, WinIDN, Windows, Windows CE, Winsock. Mostly OS names and a few more. Also a couple of other minor text fixups. Closes #14360 --- .github/scripts/spellcheck.words | 4 - CMake/PickyWarnings.cmake | 2 +- Makefile.am | 2 +- acinclude.m4 | 12 +- configure.ac | 10 +- docs/CODE_STYLE.md | 2 +- docs/DEPRECATE.md | 2 +- docs/FAQ | 16 +- docs/FEATURES.md | 2 +- docs/INSTALL.md | 6 +- docs/INTERNALS.md | 2 +- docs/KNOWN_BUGS | 20 +-- docs/SSLCERTS.md | 6 +- docs/TODO | 12 +- docs/URL-SYNTAX.md | 2 +- docs/cmdline-opts/_ENVIRONMENT.md | 2 +- docs/cmdline-opts/cacert.md | 2 +- docs/cmdline-opts/create-dirs.md | 2 +- docs/cmdline-opts/false-start.md | 2 +- docs/cmdline-opts/socks4.md | 2 +- docs/cmdline-opts/socks4a.md | 2 +- docs/cmdline-opts/socks5-hostname.md | 2 +- docs/cmdline-opts/socks5.md | 2 +- docs/cmdline-opts/use-ascii.md | 2 +- docs/examples/anyauthput.c | 2 +- docs/examples/ephiperfifo.c | 2 +- docs/examples/ftpgetresp.c | 6 +- docs/examples/ftpupload.c | 2 +- docs/examples/ftpuploadfrommem.c | 2 +- docs/examples/http-post.c | 2 +- docs/examples/http2-upload.c | 2 +- docs/examples/httpput-postfields.c | 2 +- docs/examples/httpput.c | 2 +- docs/examples/multi-legacy.c | 2 +- docs/examples/post-callback.c | 2 +- docs/examples/unixsocket.c | 2 +- docs/libcurl/curl_getenv.md | 6 +- docs/libcurl/curl_global_init.md | 2 +- docs/libcurl/libcurl-env-dbg.md | 2 +- docs/libcurl/libcurl-tutorial.md | 4 +- docs/libcurl/libcurl.md | 2 +- docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md | 2 +- .../libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md | 2 +- docs/libcurl/opts/CURLOPT_HEADERDATA.md | 2 +- docs/libcurl/opts/CURLOPT_NOSIGNAL.md | 2 +- .../libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md | 2 +- docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md | 2 +- docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md | 2 +- docs/libcurl/opts/CURLOPT_SSLKEY.md | 2 +- docs/libcurl/opts/CURLOPT_TIMEOUT.md | 2 +- docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md | 2 +- docs/libcurl/opts/CURLOPT_URL.md | 2 +- include/curl/curl.h | 2 +- lib/cf-socket.c | 8 +- lib/config-mac.h | 2 +- lib/config-win32ce.h | 4 +- lib/curl_addrinfo.c | 2 +- lib/curl_config.h.cmake | 2 +- lib/curl_fnmatch.h | 2 +- lib/curl_multibyte.h | 6 +- lib/curl_ntlm_core.c | 12 +- lib/curl_setup.h | 10 +- lib/doh.h | 2 +- lib/file.c | 2 +- lib/hostip.c | 2 +- lib/hostip.h | 2 +- lib/hostip4.c | 4 +- lib/hostip6.c | 2 +- lib/http_ntlm.c | 2 +- lib/http_ntlm.h | 4 +- lib/inet_ntop.c | 4 +- lib/inet_pton.c | 4 +- lib/ldap.c | 2 +- lib/multi.c | 4 +- lib/multihandle.h | 4 +- lib/nonblock.c | 4 +- lib/select.c | 14 +- lib/setopt.c | 4 +- lib/setup-win32.h | 6 +- lib/smb.c | 2 +- lib/socketpair.h | 2 +- lib/system_win32.c | 4 +- lib/telnet.c | 4 +- lib/timeval.c | 2 +- lib/url.c | 6 +- lib/urlapi.c | 6 +- lib/urldata.h | 8 +- lib/version_win32.c | 2 +- lib/version_win32.h | 2 +- lib/vquic/vquic.c | 4 +- lib/vssh/libssh2.c | 2 +- lib/vtls/schannel.c | 6 +- lib/vtls/schannel_verify.c | 2 +- lib/vtls/sectransp.c | 6 +- m4/curl-compilers.m4 | 8 +- m4/curl-functions.m4 | 24 +-- m4/curl-openssl.m4 | 2 +- projects/wolfssl_options.h | 2 +- projects/wolfssl_override.props | 2 +- scripts/delta | 2 +- src/tool_cb_see.c | 8 +- src/tool_cb_wrt.c | 2 +- src/tool_doswin.c | 10 +- src/tool_filetime.c | 6 +- src/tool_findfile.c | 2 +- src/tool_getparam.c | 6 +- src/tool_operate.c | 6 +- src/tool_vms.c | 2 +- tests/CI.md | 2 +- tests/FILEFORMAT.md | 2 +- tests/README.md | 4 +- tests/data/DISABLED | 4 +- tests/data/test128 | 4 +- tests/data/test1467 | 2 +- tests/data/test1468 | 2 +- tests/data/test1470 | 2 +- tests/data/test1604 | 2 +- tests/data/test2057 | 2 +- tests/data/test2072 | 4 +- tests/data/test268 | 2 +- tests/data/test3017 | 2 +- tests/data/test3018 | 2 +- tests/data/test469 | 4 +- tests/data/test470 | 4 +- tests/data/test941 | 4 +- tests/ftpserver.pl | 2 +- tests/getpart.pm | 4 +- tests/http/clients/h2-download.c | 2 +- tests/http/clients/h2-serverpush.c | 2 +- tests/http/clients/ws-data.c | 2 +- tests/http/clients/ws-pingpong.c | 2 +- tests/http/test_11_unix.py | 6 +- tests/pathhelp.pm | 147 +++++++++--------- tests/processhelp.pm | 2 +- tests/runtests.pl | 14 +- tests/secureserver.pl | 2 +- tests/server/resolve.c | 2 +- tests/server/rtspd.c | 2 +- tests/server/sockfilt.c | 8 +- tests/server/socksd.c | 2 +- tests/server/sws.c | 2 +- tests/server/util.c | 12 +- tests/sshserver.pl | 2 +- tests/testcurl.pl | 4 +- tests/unit/unit1604.c | 4 +- winbuild/README.md | 2 +- 146 files changed, 355 insertions(+), 358 deletions(-) diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words index ab2805dc54..3dbd8d22e9 100644 --- a/.github/scripts/spellcheck.words +++ b/.github/scripts/spellcheck.words @@ -872,7 +872,6 @@ unescape Unglobbed Unicode UNICOS -unix UnixSockets UnixWare unlink @@ -934,14 +933,11 @@ WHATWG whitespace Whitespaces winbind -WinBind winbuild winidn WinIDN WinLDAP -WinSock winsock -WinSSL winssl Wireshark wolfSSH diff --git a/CMake/PickyWarnings.cmake b/CMake/PickyWarnings.cmake index c9f1139e9e..48bd820ea3 100644 --- a/CMake/PickyWarnings.cmake +++ b/CMake/PickyWarnings.cmake @@ -180,7 +180,7 @@ if(PICKY_COMPILER) endif() if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5 AND MINGW) list(APPEND WPICKY_ENABLE - -Wno-pedantic-ms-format # gcc 4.5 (mingw-only) + -Wno-pedantic-ms-format # gcc 4.5 (MinGW-only) ) endif() if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8) diff --git a/Makefile.am b/Makefile.am index c0c0778a5d..1729cb3633 100644 --- a/Makefile.am +++ b/Makefile.am @@ -190,7 +190,7 @@ pkgadd: cd $(srcdir)/packages/Solaris && $(MAKE) package # -# Build a cygwin binary tarball installation file +# Build a Cygwin binary tarball installation file # resulting .tar.bz2 file will end up at packages/Win32/cygwin cygwinbin: $(MAKE) -C packages/Win32/cygwin cygwinbin diff --git a/acinclude.m4 b/acinclude.m4 index 4ec37c6c21..0bab9f9f17 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1390,11 +1390,11 @@ AS_HELP_STRING([--without-ca-embed], [Don't embed a default CA bundle]), dnl CURL_CHECK_WIN32_LARGEFILE dnl ------------------------------------------------- -dnl Check if curl's WIN32 large file will be used +dnl Check if curl's Win32 large file will be used AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl - AC_MSG_CHECKING([whether build target supports WIN32 file API]) + AC_MSG_CHECKING([whether build target supports Win32 file API]) curl_win32_file_api="no" if test "$curl_cv_native_windows" = "yes"; then if test x"$enable_largefile" != "xno"; then @@ -1404,7 +1404,7 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ #if !defined(_WIN32_WCE) && (defined(__MINGW32__) || defined(_MSC_VER)) int dummy=1; #else - WIN32 large file API not supported. + Win32 large file API not supported. #endif ]]) ],[ @@ -1418,7 +1418,7 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ #if defined(_WIN32_WCE) || defined(__MINGW32__) || defined(_MSC_VER) int dummy=1; #else - WIN32 small file API not supported. + Win32 small file API not supported. #endif ]]) ],[ @@ -1447,11 +1447,11 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [ dnl CURL_CHECK_WIN32_CRYPTO dnl ------------------------------------------------- -dnl Check if curl's WIN32 crypto lib can be used +dnl Check if curl's Win32 crypto lib can be used AC_DEFUN([CURL_CHECK_WIN32_CRYPTO], [ AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl - AC_MSG_CHECKING([whether build target supports WIN32 crypto API]) + AC_MSG_CHECKING([whether build target supports Win32 crypto API]) curl_win32_crypto_api="no" if test "$curl_cv_native_windows" = "yes"; then AC_COMPILE_IFELSE([ diff --git a/configure.ac b/configure.ac index f6c4e1602f..5b0ab4e4a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1152,7 +1152,7 @@ fi if test "$HAVE_GETHOSTBYNAME" != "1" then - dnl This is for winsock systems + dnl This is for Winsock systems if test "$curl_cv_native_windows" = "yes"; then winsock_LIB="-lws2_32" if test ! -z "$winsock_LIB"; then @@ -2554,7 +2554,7 @@ case "$OPT_WINIDN" in esac if test "$want_winidn" = "yes"; then - dnl winidn library support has been requested + dnl WinIDN library support has been requested clean_CFLAGS="$CFLAGS" clean_CPPFLAGS="$CPPFLAGS" clean_LDFLAGS="$LDFLAGS" @@ -2632,7 +2632,7 @@ AS_HELP_STRING([--without-libidn2],[Disable libidn2 usage]), [OPT_IDN=$withval]) if test "x$tst_links_winidn" = "xyes"; then want_idn="no" - AC_MSG_RESULT([no (using winidn instead)]) + AC_MSG_RESULT([no (using WinIDN instead)]) else case "$OPT_IDN" in no) @@ -3696,7 +3696,7 @@ AC_CHECK_TYPE([bool],[ AC_CHECK_TYPE(sa_family_t, AC_DEFINE(CURL_SA_FAMILY_T, sa_family_t, [IP address type in sockaddr]), [ - # The windows name? + # The Windows name? AC_CHECK_TYPE(ADDRESS_FAMILY, AC_DEFINE(CURL_SA_FAMILY_T, ADDRESS_FAMILY, [IP address type in sockaddr]), AC_DEFINE(CURL_SA_FAMILY_T, unsigned short, [IP address type in sockaddr]), @@ -3947,7 +3947,7 @@ if test "$want_pthreads" != "no"; then AC_CHECK_FUNC(pthread_create, [USE_THREADS_POSIX=1] ) LIBS="$save_LIBS" - dnl on HPUX, life is more complicated... + dnl on HP-UX, life is more complicated... case $host in *-hp-hpux*) dnl it doesn't actually work without -lpthread diff --git a/docs/CODE_STYLE.md b/docs/CODE_STYLE.md index 7b2b60251f..f64c5eb7d4 100644 --- a/docs/CODE_STYLE.md +++ b/docs/CODE_STYLE.md @@ -271,7 +271,7 @@ DEBUGF(infof(data, "Curl_pp_readresp_ %d bytes of trailing " Use **#ifdef HAVE_FEATURE** to do conditional code. We avoid checking for particular operating systems or hardware in the #ifdef lines. The HAVE_FEATURE -shall be generated by the configure script for unix-like systems and they are +shall be generated by the configure script for Unix-like systems and they are hard-coded in the `config-[system].h` files for the others. We also encourage use of macros/functions that possibly are empty or defined diff --git a/docs/DEPRECATE.md b/docs/DEPRECATE.md index 6ad9317238..e8713be876 100644 --- a/docs/DEPRECATE.md +++ b/docs/DEPRECATE.md @@ -32,6 +32,6 @@ May 2025 are: BearSSL and Secure Transport. - Support for systems without 64-bit data types - NSS - gskit - - mingw v1 + - MinGW v1 - NTLM_WB - space-separated `NOPROXY` patterns diff --git a/docs/FAQ b/docs/FAQ index 12c743bb5f..943a741995 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -84,8 +84,8 @@ FAQ 5.1 Is libcurl thread-safe? 5.2 How can I receive all data into a large memory chunk? 5.3 How do I fetch multiple files with libcurl? - 5.4 Does libcurl do Winsock initialization on win32 systems? - 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ? + 5.4 Does libcurl do Winsock initialization on Win32 systems? + 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on Win32 ? 5.6 What about Keep-Alive or persistent connections? 5.7 Link errors when building libcurl on Windows 5.8 libcurl.so.X: open failed: No such file or directory @@ -424,7 +424,7 @@ FAQ curl can be built to use one of the following SSL alternatives: OpenSSL, LibreSSL, BoringSSL, AWS-LC, GnuTLS, wolfSSL, mbedTLS, Secure Transport - (native iOS/OS X), Schannel (native Windows), BearSSL or Rustls. They all + (native iOS/macOS), Schannel (native Windows), BearSSL or Rustls. They all have their pros and cons, and we try to maintain a comparison of them here: https://curl.se/docs/ssl-compared.html @@ -566,7 +566,7 @@ FAQ 3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP? curl adheres to the HTTP spec, which basically means you can play with *any* - protocol that is built on top of HTTP. Protocols such as SOAP, WEBDAV and + protocol that is built on top of HTTP. Protocols such as SOAP, WebDAV and XML-RPC are all such ones. You can use -X to set custom requests and -H to set custom headers (or replace internally generated ones). @@ -604,7 +604,7 @@ FAQ curl -d ' with spaces ' example.com Exactly what kind of quotes and how to do this is entirely up to the shell - or command line interpreter that you are using. For most unix shells, you + or command line interpreter that you are using. For most Unix shells, you can more or less pick either single (') or double (") quotes. For Windows/DOS command prompts you must use double (") quotes, and if the option string contains inner double quotes you can escape them with a @@ -1174,11 +1174,11 @@ FAQ only reusable, but you are even encouraged to reuse it if you can, as that will enable libcurl to use persistent connections. - 5.4 Does libcurl do Winsock initialization on win32 systems? + 5.4 Does libcurl do Winsock initialization on Win32 systems? Yes, if told to in the curl_global_init() call. - 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ? + 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on Win32 ? Yes, but you cannot open a FILE * and pass the pointer to a DLL and have that DLL use the FILE * (as the DLL and the client application cannot access @@ -1352,7 +1352,7 @@ FAQ then you have to work with what you are given. The LIST output format is entirely at the server's own liking and the NLST output does not reveal any types and in many cases does not even include all the directory entries. - Also, both LIST and NLST tend to hide unix-style hidden files (those that + Also, both LIST and NLST tend to hide Unix-style hidden files (those that start with a dot) by default so you need to do "LIST -a" or similar to see them. diff --git a/docs/FEATURES.md b/docs/FEATURES.md index ef5fd0fc18..81c4af758a 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -44,7 +44,7 @@ SPDX-License-Identifier: curl - TCP Fast Open - DNS cache (that can be shared between transfers) - non-blocking single-threaded parallel transfers - - unix domain sockets to server or proxy + - Unix domain sockets to server or proxy - DNS-over-HTTPS - uses non-blocking name resolves - selectable name resolver backend diff --git a/docs/INSTALL.md b/docs/INSTALL.md index c989c37e78..85de7a1ed1 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -253,7 +253,7 @@ Note: The pre-processor settings can be found using the Visual Studio IDE under "Project -> Properties -> Configuration Properties -> C/C++ -> Preprocessor". -## Using BSD-style lwIP instead of Winsock TCP/IP stack in Win32 builds +## Using BSD-style lwIP instead of Winsock TCP/IP stack in Windows builds In order to compile libcurl and curl using BSD-style lwIP TCP/IP stack it is necessary to make the definition of the preprocessor symbol `USE_LWIPSOCK` @@ -521,14 +521,14 @@ disabling support for some feature (run `./configure --help` to see them all): - `--disable-mime` (MIME API) - `--disable-netrc` (.netrc file) - `--disable-ntlm` (NTLM authentication) - - `--disable-ntlm-wb` (NTLM WinBind) + - `--disable-ntlm-wb` (NTLM winbind) - `--disable-progress-meter` (graphical progress meter in library) - `--disable-proxy` (HTTP and SOCKS proxies) - `--disable-pthreads` (multi-threading) - `--disable-socketpair` (socketpair for asynchronous name resolving) - `--disable-threaded-resolver` (threaded name resolver) - `--disable-tls-srp` (Secure Remote Password authentication for TLS) - - `--disable-unix-sockets` (UNIX sockets) + - `--disable-unix-sockets` (Unix sockets) - `--disable-verbose` (eliminates debugging strings and error code strings) - `--disable-versioned-symbols` (versioned symbols) - `--enable-symbol-hiding` (eliminates unneeded symbols in the shared library) diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index ff77bac779..ae77f0e54b 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -35,7 +35,7 @@ versions of libs and build tools. - MIT Kerberos 1.2.4 - Heimdal ? - nghttp2 1.15.0 - - WinSock 2.2 (on Windows 95+ and Windows CE .NET 4.1+) + - Winsock 2.2 (on Windows 95+ and Windows CE .NET 4.1+) ## Build tools diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index be44d16c6f..db21be787c 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -41,7 +41,7 @@ problems may have been fixed or changed somewhat since this was written. 5.2 curl-config --libs contains private details 5.3 building for old macOS fails with gcc 5.5 cannot handle Unicode arguments in non-Unicode builds on Windows - 5.6 cygwin: make install installs curl-config.1 twice + 5.6 Cygwin: make install installs curl-config.1 twice 5.11 configure --with-gssapi with Heimdal is ignored on macOS 5.12 flaky CI builds 5.13 long paths are not fully supported on Windows @@ -49,7 +49,7 @@ problems may have been fixed or changed somewhat since this was written. 5.15 Unicode on Windows 6. Authentication - 6.1 NTLM authentication and unicode + 6.1 NTLM authentication and Unicode 6.2 MIT Kerberos for Windows build 6.3 NTLM in system context uses wrong name 6.5 NTLM does not support password with § character @@ -73,7 +73,7 @@ problems may have been fixed or changed somewhat since this was written. 9.2 wolfssh: publickey auth does not work 9.3 Remote recursive folder creation with SFTP 9.4 libssh blocking and infinite loop problem - 9.5 cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!" + 9.5 Cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!" 10. SOCKS 10.3 FTPS over SOCKS @@ -274,7 +274,7 @@ problems may have been fixed or changed somewhat since this was written. https://curl.se/bug/?i=731 https://curl.se/bug/?i=3747 -5.6 cygwin: make install installs curl-config.1 twice +5.6 Cygwin: make install installs curl-config.1 twice https://github.com/curl/curl/issues/8839 @@ -315,19 +315,19 @@ problems may have been fixed or changed somewhat since this was written. 5.15 Unicode on Windows - Passing in a unicode filename with -o: + Passing in a Unicode filename with -o: https://github.com/curl/curl/issues/11461 - Passing in unicode character with -d: + Passing in Unicode character with -d: https://github.com/curl/curl/issues/12231 6. Authentication -6.1 NTLM authentication and unicode +6.1 NTLM authentication and Unicode - NTLM authentication involving unicode username or password only works + NTLM authentication involving Unicode username or password only works properly if built with UNICODE defined together with the Schannel backend. The original problem was mentioned in: https://curl.se/mail/lib-2009-10/0024.html @@ -471,9 +471,9 @@ problems may have been fixed or changed somewhat since this was written. https://github.com/curl/curl/issues/8632 -9.5 cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!" +9.5 Cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!" - Running SCP and SFTP tests on cygwin makes this warning message appear. + Running SCP and SFTP tests on Cygwin makes this warning message appear. https://github.com/curl/curl/issues/11244 diff --git a/docs/SSLCERTS.md b/docs/SSLCERTS.md index ba349ed639..3d7057152f 100644 --- a/docs/SSLCERTS.md +++ b/docs/SSLCERTS.md @@ -16,7 +16,7 @@ Native SSL ---------- If libcurl was built with Schannel or Secure Transport support (the native SSL -libraries included in Windows and Mac OS X), then this does not apply to +libraries included in Windows and macOS), then this does not apply to you. Scroll down for details on how the OS-native engines handle SSL certificates. If you are not sure, then run "curl -V" and read the results. If the version string says `Schannel` in it, then it was built with Schannel @@ -140,12 +140,12 @@ Transport (Apple's native TLS engine) support, then libcurl still performs peer certificate verification, but instead of using a CA cert bundle, it uses the certificates that are built into the OS. These are the same certificates that appear in the Internet Options control panel (under Windows) or Keychain -Access application (under OS X). Any custom security rules for certificates +Access application (under macOS). Any custom security rules for certificates are honored. Schannel runs CRL checks on certificates unless peer verification is disabled. Secure Transport on iOS runs OCSP checks on certificates unless peer -verification is disabled. Secure Transport on OS X runs either OCSP or CRL +verification is disabled. Secure Transport on macOS runs either OCSP or CRL checks on certificates if those features are enabled, and this behavior can be adjusted in the preferences of Keychain Access. diff --git a/docs/TODO b/docs/TODO index f10becd714..369807ed0e 100644 --- a/docs/TODO +++ b/docs/TODO @@ -153,7 +153,7 @@ 18.6 Option to make -Z merge lined based outputs on stdout 18.7 specify which response codes that make -f/--fail return error 18.9 Choose the name of file in braces for complex URLs - 18.10 improve how curl works in a windows console window + 18.10 improve how curl works in a Windows console window 18.11 Windows: set attribute 'archive' for completed downloads 18.12 keep running, read instructions from pipe/socket 18.13 Acknowledge Ratelimit headers @@ -202,7 +202,7 @@ 1.1 TFO support on Windows libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and - Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607 + macOS. Windows supports TCP Fast Open starting with Windows 10, version 1607 and we should add support for it. TCP Fast Open is supported on several platforms but not on Windows. Work on @@ -465,7 +465,7 @@ Make sure we do not ever loop because of non-blocking sockets returning EWOULDBLOCK or similar. Blocking cases include: - - Name resolves on non-windows unless c-ares or the threaded resolver is used. + - Name resolves on non-Windows unless c-ares or the threaded resolver is used. - The threaded resolver may block on cleanup: https://github.com/curl/curl/issues/4852 @@ -758,7 +758,7 @@ 10.4 Certificate-Based Authentication - LDAPS not possible with MAC and Windows with Certificate-Based Authentication + LDAPS not possible with macOS and Windows with Certificate-Based Authentication https://github.com/curl/curl/issues/9641 @@ -1078,7 +1078,7 @@ See https://github.com/curl/curl/issues/221 -18.10 improve how curl works in a windows console window +18.10 improve how curl works in a Windows console window If you pull the scrollbar when transferring with curl in a Windows console window, the transfer is interrupted and can get disconnected. This can @@ -1334,7 +1334,7 @@ 20.4 more platforms supported - Make the test suite work on more platforms. OpenBSD and Mac OS. Remove + Make the test suite work on more platforms. OpenBSD and macOS. Remove fork()s and it should become even more portable. 20.6 Use the RFC 6265 test suite diff --git a/docs/URL-SYNTAX.md b/docs/URL-SYNTAX.md index 30aaea9cf2..e7b484f81a 100644 --- a/docs/URL-SYNTAX.md +++ b/docs/URL-SYNTAX.md @@ -197,7 +197,7 @@ Transitional Processing. The two standards have a huge overlap but differ slightly, perhaps most famously in how they deal with the German "double s" (`ß`). -When winidn is used, curl uses IDNA 2003 Transitional Processing, like the rest +When WinIDN is used, curl uses IDNA 2003 Transitional Processing, like the rest of Windows. ## Port number diff --git a/docs/cmdline-opts/_ENVIRONMENT.md b/docs/cmdline-opts/_ENVIRONMENT.md index 1d40b87b85..02561193b7 100644 --- a/docs/cmdline-opts/_ENVIRONMENT.md +++ b/docs/cmdline-opts/_ENVIRONMENT.md @@ -87,7 +87,7 @@ names named after the destination connection id (in hex). Do note that these files can become rather large. Works with the ngtcp2 and quiche QUIC backends. ## `SHELL` -Used on VMS when trying to detect if using a **DCL** or a **unix** shell. +Used on VMS when trying to detect if using a **DCL** or a **Unix** shell. ## `SSL_CERT_DIR` If set, it is used as the --capath value. This environment variable is ignored diff --git a/docs/cmdline-opts/cacert.md b/docs/cmdline-opts/cacert.md index 43a17aed7b..1b34ce5b4d 100644 --- a/docs/cmdline-opts/cacert.md +++ b/docs/cmdline-opts/cacert.md @@ -27,7 +27,7 @@ curl recognizes the environment variable named 'CURL_CA_BUNDLE' if it is set and the TLS backend is not Schannel, and uses the given path as a path to a CA cert bundle. This option overrides that variable. -The windows version of curl automatically looks for a CA certs file named +The Windows version of curl automatically looks for a CA certs file named 'curl-ca-bundle.crt', either in the same directory as curl.exe, or in the Current Working Directory, or in any folder along your PATH. diff --git a/docs/cmdline-opts/create-dirs.md b/docs/cmdline-opts/create-dirs.md index c509efb0f8..89d24f76b5 100644 --- a/docs/cmdline-opts/create-dirs.md +++ b/docs/cmdline-opts/create-dirs.md @@ -21,6 +21,6 @@ mentioned with the --output option combined with the path possibly set with --output-dir. If the combined output filename uses no directory, or if the directories it mentions already exist, no directories are created. -Created directories are made with mode 0750 on unix style file systems. +Created directories are made with mode 0750 on Unix-style file systems. To create remote directories when using FTP or SFTP, try --ftp-create-dirs. diff --git a/docs/cmdline-opts/false-start.md b/docs/cmdline-opts/false-start.md index f25af2374d..c6c44ad547 100644 --- a/docs/cmdline-opts/false-start.md +++ b/docs/cmdline-opts/false-start.md @@ -20,4 +20,4 @@ client starts sending application data before verifying the server's Finished message, thus saving a round trip when performing a full handshake. This functionality is currently only implemented in the Secure Transport (on -iOS 7.0 or later, or OS X 10.9 or later) backend. +iOS 7.0 or later, or macOS 10.9 or later) backend. diff --git a/docs/cmdline-opts/socks4.md b/docs/cmdline-opts/socks4.md index e74fa787ce..99a7fc9225 100644 --- a/docs/cmdline-opts/socks4.md +++ b/docs/cmdline-opts/socks4.md @@ -21,7 +21,7 @@ Use the specified SOCKS4 proxy. If the port number is not specified, it is assumed at port 1080. Using this socket type make curl resolve the hostname and passing the address on to the proxy. -To specify proxy on a unix domain socket, use localhost for host, e.g. +To specify proxy on a Unix domain socket, use localhost for host, e.g. `socks4://localhost/path/to/socket.sock` This option overrides any previous use of --proxy, as they are mutually diff --git a/docs/cmdline-opts/socks4a.md b/docs/cmdline-opts/socks4a.md index 49fb9a275a..04d60b81b6 100644 --- a/docs/cmdline-opts/socks4a.md +++ b/docs/cmdline-opts/socks4a.md @@ -20,7 +20,7 @@ Example: Use the specified SOCKS4a proxy. If the port number is not specified, it is assumed at port 1080. This asks the proxy to resolve the hostname. -To specify proxy on a unix domain socket, use localhost for host, e.g. +To specify proxy on a Unix domain socket, use localhost for host, e.g. `socks4a://localhost/path/to/socket.sock` This option overrides any previous use of --proxy, as they are mutually diff --git a/docs/cmdline-opts/socks5-hostname.md b/docs/cmdline-opts/socks5-hostname.md index 1a5e4c1b5e..0ea2ed739f 100644 --- a/docs/cmdline-opts/socks5-hostname.md +++ b/docs/cmdline-opts/socks5-hostname.md @@ -19,7 +19,7 @@ Example: Use the specified SOCKS5 proxy (and let the proxy resolve the hostname). If the port number is not specified, it is assumed at port 1080. -To specify proxy on a unix domain socket, use localhost for host, e.g. +To specify proxy on a Unix domain socket, use localhost for host, e.g. `socks5h://localhost/path/to/socket.sock` This option overrides any previous use of --proxy, as they are mutually diff --git a/docs/cmdline-opts/socks5.md b/docs/cmdline-opts/socks5.md index 192adef4a7..4ea660d62d 100644 --- a/docs/cmdline-opts/socks5.md +++ b/docs/cmdline-opts/socks5.md @@ -19,7 +19,7 @@ Example: Use the specified SOCKS5 proxy - but resolve the hostname locally. If the port number is not specified, it is assumed at port 1080. -To specify proxy on a unix domain socket, use localhost for host, e.g. +To specify proxy on a Unix domain socket, use localhost for host, e.g. `socks5://localhost/path/to/socket.sock` This option overrides any previous use of --proxy, as they are mutually diff --git a/docs/cmdline-opts/use-ascii.md b/docs/cmdline-opts/use-ascii.md index c452ffbb1c..30cc860b0a 100644 --- a/docs/cmdline-opts/use-ascii.md +++ b/docs/cmdline-opts/use-ascii.md @@ -19,4 +19,4 @@ Example: Enable ASCII transfer mode. For FTP, this can also be enforced by using a URL that ends with `;type=A`. This option causes data sent to stdout to be in text -mode for win32 systems. +mode for Win32 systems. diff --git a/docs/examples/anyauthput.c b/docs/examples/anyauthput.c index 269e29cf56..3bbc056c0b 100644 --- a/docs/examples/anyauthput.c +++ b/docs/examples/anyauthput.c @@ -100,7 +100,7 @@ int main(int argc, char **argv) fp = fopen(file, "rb"); fstat(FILENO(fp), &file_info); - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); /* get a curl handle */ diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index 0c8a269248..8edcd2015d 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -33,7 +33,7 @@ * * Written by Jeff Pohlmeyer, converted to use epoll by Josh Bialkowski -Requires a linux system with epoll +Requires a Linux system with epoll When running, the program creates the named pipe "hiper.fifo" diff --git a/docs/examples/ftpgetresp.c b/docs/examples/ftpgetresp.c index 33c26b380e..256998d8c5 100644 --- a/docs/examples/ftpgetresp.c +++ b/docs/examples/ftpgetresp.c @@ -48,17 +48,17 @@ int main(void) FILE *respfile; /* local filename to store the file as */ - ftpfile = fopen(FTPBODY, "wb"); /* b is binary, needed on win32 */ + ftpfile = fopen(FTPBODY, "wb"); /* b is binary, needed on Windows */ /* local filename to store the FTP server's response lines in */ - respfile = fopen(FTPHEADERS, "wb"); /* b is binary, needed on win32 */ + respfile = fopen(FTPHEADERS, "wb"); /* b is binary, needed on Windows */ curl = curl_easy_init(); if(curl) { /* Get a file listing from sunet */ curl_easy_setopt(curl, CURLOPT_URL, "ftp://ftp.example.com/"); curl_easy_setopt(curl, CURLOPT_WRITEDATA, ftpfile); - /* If you intend to use this on windows with a libcurl DLL, you must use + /* If you intend to use this on Windows with a libcurl DLL, you must use CURLOPT_WRITEFUNCTION as well */ curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_response); curl_easy_setopt(curl, CURLOPT_HEADERDATA, respfile); diff --git a/docs/examples/ftpupload.c b/docs/examples/ftpupload.c index d43f090269..462202e6cf 100644 --- a/docs/examples/ftpupload.c +++ b/docs/examples/ftpupload.c @@ -90,7 +90,7 @@ int main(void) /* get a FILE * of the same file */ hd_src = fopen(LOCAL_FILE, "rb"); - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); /* get a curl handle */ diff --git a/docs/examples/ftpuploadfrommem.c b/docs/examples/ftpuploadfrommem.c index 699468d1cc..2537486867 100644 --- a/docs/examples/ftpuploadfrommem.c +++ b/docs/examples/ftpuploadfrommem.c @@ -76,7 +76,7 @@ int main(void) upload.readptr = data; upload.sizeleft = strlen(data); - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ res = curl_global_init(CURL_GLOBAL_DEFAULT); /* Check for errors */ if(res != CURLE_OK) { diff --git a/docs/examples/http-post.c b/docs/examples/http-post.c index 1ee9f69c0f..901ee1e3f0 100644 --- a/docs/examples/http-post.c +++ b/docs/examples/http-post.c @@ -33,7 +33,7 @@ int main(void) CURL *curl; CURLcode res; - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); /* get a curl handle */ diff --git a/docs/examples/http2-upload.c b/docs/examples/http2-upload.c index 4758a2fac3..7fa8134d45 100644 --- a/docs/examples/http2-upload.c +++ b/docs/examples/http2-upload.c @@ -32,7 +32,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #ifndef _MSC_VER #include #include diff --git a/docs/examples/httpput-postfields.c b/docs/examples/httpput-postfields.c index e8a8de7a25..c0436749fd 100644 --- a/docs/examples/httpput-postfields.c +++ b/docs/examples/httpput-postfields.c @@ -58,7 +58,7 @@ int main(int argc, char **argv) url = argv[1]; - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); /* get a curl handle */ diff --git a/docs/examples/httpput.c b/docs/examples/httpput.c index d26aa9e250..ebd2b7696c 100644 --- a/docs/examples/httpput.c +++ b/docs/examples/httpput.c @@ -82,7 +82,7 @@ int main(int argc, char **argv) an example! */ hd_src = fopen(file, "rb"); - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ curl_global_init(CURL_GLOBAL_ALL); /* get a curl handle */ diff --git a/docs/examples/multi-legacy.c b/docs/examples/multi-legacy.c index 4c1c760efc..32e263abf1 100644 --- a/docs/examples/multi-legacy.c +++ b/docs/examples/multi-legacy.c @@ -30,7 +30,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #ifndef _WIN32 #include #include diff --git a/docs/examples/post-callback.c b/docs/examples/post-callback.c index 311bc3cae0..1a213cb2d5 100644 --- a/docs/examples/post-callback.c +++ b/docs/examples/post-callback.c @@ -73,7 +73,7 @@ int main(void) wt.readptr = data; wt.sizeleft = strlen(data); - /* In windows, this inits the winsock stuff */ + /* In Windows, this inits the Winsock stuff */ res = curl_global_init(CURL_GLOBAL_DEFAULT); /* Check for errors */ if(res != CURLE_OK) { diff --git a/docs/examples/unixsocket.c b/docs/examples/unixsocket.c index 90c655917d..299a121d9d 100644 --- a/docs/examples/unixsocket.c +++ b/docs/examples/unixsocket.c @@ -22,7 +22,7 @@ * ***************************************************************************/ /* - * Access HTTP server over unix domain socket + * Access HTTP server over Unix domain socket * */ #include diff --git a/docs/libcurl/curl_getenv.md b/docs/libcurl/curl_getenv.md index c6f0c268f5..4f62161f44 100644 --- a/docs/libcurl/curl_getenv.md +++ b/docs/libcurl/curl_getenv.md @@ -27,7 +27,7 @@ char *curl_getenv(const char *name); curl_getenv() is a portable wrapper for the getenv() function, meant to emulate its behavior and provide an identical interface for all operating -systems libcurl builds on (including win32). +systems libcurl builds on (including Windows). You must curl_free(3) the returned string when you are done with it. @@ -55,6 +55,6 @@ specified name. # NOTE -Under unix operating systems, there is no point in returning an allocated +Under Unix operating systems, there is no point in returning an allocated memory, although other systems does not work properly if this is not done. The -unix implementation thus suffers slightly from the drawbacks of other systems. +Unix implementation thus suffers slightly from the drawbacks of other systems. diff --git a/docs/libcurl/curl_global_init.md b/docs/libcurl/curl_global_init.md index 4ce880f9e2..198b6e9f30 100644 --- a/docs/libcurl/curl_global_init.md +++ b/docs/libcurl/curl_global_init.md @@ -89,7 +89,7 @@ unexpected behaviors. Initialize the Win32 socket libraries. The implication here is that if this bit is not set, the initialization of -winsock has to be done by the application or you risk getting undefined +Winsock has to be done by the application or you risk getting undefined behaviors. This option exists for when the initialization is handled outside of libcurl so there is no need for libcurl to do it again. diff --git a/docs/libcurl/libcurl-env-dbg.md b/docs/libcurl/libcurl-env-dbg.md index 3762b006bf..2f4186939c 100644 --- a/docs/libcurl/libcurl-env-dbg.md +++ b/docs/libcurl/libcurl-env-dbg.md @@ -98,7 +98,7 @@ the current. ## CURL_TIME -Fake unix timestamp to use for AltSvc, HSTS and CURLINFO variables that are +Fake Unix timestamp to use for AltSvc, HSTS and CURLINFO variables that are time related. This variable can also be used to fake the data returned by some CURLINFO diff --git a/docs/libcurl/libcurl-tutorial.md b/docs/libcurl/libcurl-tutorial.md index 4e16e38aa3..d9fb10aa1d 100644 --- a/docs/libcurl/libcurl-tutorial.md +++ b/docs/libcurl/libcurl-tutorial.md @@ -112,7 +112,7 @@ specified are: ## CURL_GLOBAL_WIN32 which only does anything on Windows machines. When used on a Windows machine, -it makes libcurl initialize the win32 socket stuff. Without having that +it makes libcurl initialize the Win32 socket stuff. Without having that initialized properly, your program cannot use sockets properly. You should only do this once for each application, so if your program already does this or of another library in use does it, you should not tell libcurl to do this @@ -235,7 +235,7 @@ to make your program run fine virtually everywhere. (CURLOPT_WRITEDATA(3) was formerly known as *CURLOPT_FILE*. Both names still work and do the same thing). -If you are using libcurl as a win32 DLL, you MUST use the +If you are using libcurl as a Windows DLL, you MUST use the CURLOPT_WRITEFUNCTION(3) if you set CURLOPT_WRITEDATA(3) - or experience crashes. diff --git a/docs/libcurl/libcurl.md b/docs/libcurl/libcurl.md index 2f3a451974..5625aa07d2 100644 --- a/docs/libcurl/libcurl.md +++ b/docs/libcurl/libcurl.md @@ -95,7 +95,7 @@ See libcurl-ws(3) # LINKING WITH LIBCURL -On unix-like machines, there is a tool named curl-config that gets installed +On Unix-like machines, there is a tool named curl-config that gets installed with the rest of the curl stuff when 'make install' is performed. curl-config is added to make it easier for applications to link with libcurl diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md index 0106be8bdc..83ccfcd270 100644 --- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md +++ b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md @@ -53,7 +53,7 @@ to 2, the operation can never last longer than 2 seconds. Including the connection phase. This option may cause libcurl to use the SIGALRM signal to timeout system -calls on builds not using asynch DNS. In unix-like systems, this might cause +calls on builds not using asynch DNS. In Unix-like systems, this might cause signals to be used unless CURLOPT_NOSIGNAL(3) is set. # DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md index 0baad3e61f..cbfc6d3add 100644 --- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md +++ b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md @@ -54,7 +54,7 @@ With CURLOPT_CONNECTTIMEOUT_MS(3) set to 4000 and CURLOPT_TIMEOUT_MS(3) set to the connection phase. This option may cause libcurl to use the SIGALRM signal to timeout system -calls on builds not using asynch DNS. In unix-like systems, this might cause +calls on builds not using asynch DNS. In Unix-like systems, this might cause signals to be used unless CURLOPT_NOSIGNAL(3) is set. # DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_HEADERDATA.md b/docs/libcurl/opts/CURLOPT_HEADERDATA.md index 865cbb74d9..0542e158fe 100644 --- a/docs/libcurl/opts/CURLOPT_HEADERDATA.md +++ b/docs/libcurl/opts/CURLOPT_HEADERDATA.md @@ -36,7 +36,7 @@ If CURLOPT_WRITEFUNCTION(3) or CURLOPT_HEADERFUNCTION(3) is used, If neither of those options are set, *pointer* must be a valid FILE * and it is used by a plain fwrite() to write headers to. -If you are using libcurl as a win32 DLL, you **MUST** use a +If you are using libcurl as a Windows DLL, you **MUST** use a CURLOPT_WRITEFUNCTION(3) or CURLOPT_HEADERFUNCTION(3) if you set this option or you might experience crashes. diff --git a/docs/libcurl/opts/CURLOPT_NOSIGNAL.md b/docs/libcurl/opts/CURLOPT_NOSIGNAL.md index 3aaac34c90..4c9c5774ac 100644 --- a/docs/libcurl/opts/CURLOPT_NOSIGNAL.md +++ b/docs/libcurl/opts/CURLOPT_NOSIGNAL.md @@ -27,7 +27,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOSIGNAL, long onoff); If *onoff* is 1, libcurl uses no functions that install signal handlers or any functions that cause signals to be sent to the process. This option is -here to allow multi-threaded unix applications to still set/use all timeout +here to allow multi-threaded Unix applications to still set/use all timeout options etc, without risking getting signals. If this option is set and libcurl has been built with the standard name diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md b/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md index 5002b3a114..570ef0e79e 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md @@ -39,7 +39,7 @@ the format of your client certificate used when connecting to an HTTPS proxy. Supported formats are "PEM" and "DER", except with Secure Transport or Schannel. OpenSSL (versions 0.9.3 and later), Secure Transport (on iOS 5 or -later, or OS X 10.7 or later) and Schannel support "P12" for PKCS#12-encoded +later, or macOS 10.7 or later) and Schannel support "P12" for PKCS#12-encoded files. The application does not have to keep the string around after setting this diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md b/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md index c355c947c0..cc0f031308 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md @@ -39,7 +39,7 @@ the filename of your private key used for connecting to the HTTPS proxy. The default format is "PEM" and can be changed with CURLOPT_PROXY_SSLKEYTYPE(3). -(Windows, iOS and Mac OS X) This option is ignored by Secure Transport and +(Windows, iOS and macOS) This option is ignored by Secure Transport and Schannel SSL backends because they expect the private key to be already present in the key chain or PKCS#12 file containing the certificate. diff --git a/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md b/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md index d08273550a..963e65cbd8 100644 --- a/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md +++ b/docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md @@ -38,7 +38,7 @@ the format of your certificate. Supported formats are "PEM" and "DER", except with Secure Transport or Schannel. OpenSSL (versions 0.9.3 and later), Secure Transport (on iOS 5 or -later, or OS X 10.7 or later) and Schannel support "P12" for PKCS#12-encoded +later, or macOS 10.7 or later) and Schannel support "P12" for PKCS#12-encoded files. The application does not have to keep the string around after setting this diff --git a/docs/libcurl/opts/CURLOPT_SSLKEY.md b/docs/libcurl/opts/CURLOPT_SSLKEY.md index 27f0f347cb..affa528272 100644 --- a/docs/libcurl/opts/CURLOPT_SSLKEY.md +++ b/docs/libcurl/opts/CURLOPT_SSLKEY.md @@ -36,7 +36,7 @@ Pass a pointer to a null-terminated string as parameter. The string should be the filename of your private key. The default format is "PEM" and can be changed with CURLOPT_SSLKEYTYPE(3). -(Windows, iOS and Mac OS X) This option is ignored by Secure Transport and +(Windows, iOS and macOS) This option is ignored by Secure Transport and Schannel SSL backends because they expect the private key to be already present in the key-chain or PKCS#12 file containing the certificate. diff --git a/docs/libcurl/opts/CURLOPT_TIMEOUT.md b/docs/libcurl/opts/CURLOPT_TIMEOUT.md index 0dc17f0367..d5b396cecd 100644 --- a/docs/libcurl/opts/CURLOPT_TIMEOUT.md +++ b/docs/libcurl/opts/CURLOPT_TIMEOUT.md @@ -55,7 +55,7 @@ With CURLOPT_CONNECTTIMEOUT(3) set to 4 and CURLOPT_TIMEOUT(3) set to 2, the operation can never last longer than 2 seconds. This option may cause libcurl to use the SIGALRM signal to timeout system -calls on builds not using asynch DNS. In unix-like systems, this might cause +calls on builds not using asynch DNS. In Unix-like systems, this might cause signals to be used unless CURLOPT_NOSIGNAL(3) is set. # DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md index bde3b3164a..d77274f7d3 100644 --- a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md +++ b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md @@ -26,7 +26,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TRANSFERTEXT, long text); # DESCRIPTION A parameter set to 1 tells the library to use ASCII mode for FTP transfers, -instead of the default binary transfer. For win32 systems it does not set the +instead of the default binary transfer. For Win32 systems it does not set the stdout to binary mode. This option can be usable when transferring text data between systems with different views on certain characters, such as newlines or similar. diff --git a/docs/libcurl/opts/CURLOPT_URL.md b/docs/libcurl/opts/CURLOPT_URL.md index 45d8239872..6046c9759e 100644 --- a/docs/libcurl/opts/CURLOPT_URL.md +++ b/docs/libcurl/opts/CURLOPT_URL.md @@ -81,7 +81,7 @@ expected to be a sequence of characters using an ASCII compatible encoding. If libcurl is built with IDN support, the server name part of the URL can use an "international name" by using the current encoding (according to locale) or -UTF-8 (when winidn is used; or a Windows Unicode build using libidn2). +UTF-8 (when WinIDN is used; or a Windows Unicode build using libidn2). If libcurl is built without IDN support, the server name is used exactly as specified when passed to the name resolver functions. diff --git a/include/curl/curl.h b/include/curl/curl.h index 6da44ce9bf..67c816cfb5 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -76,7 +76,7 @@ #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \ defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)) -/* The check above prevents the winsock2 inclusion if winsock.h already was +/* The check above prevents the winsock2.h inclusion if winsock.h already was included, since they cannot co-exist without problems */ #include #include diff --git a/lib/cf-socket.c b/lib/cf-socket.c index 751568c090..9e7cc6e981 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -124,7 +124,7 @@ static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd) } #ifdef SO_NOSIGPIPE -/* The preferred method on Mac OS X (10.2 and later) to prevent SIGPIPEs when +/* The preferred method on macOS (10.2 and later) to prevent SIGPIPEs when sending data to a dead peer (instead of relying on the 4th argument to send being MSG_NOSIGNAL). Possibly also existing and in use on other BSD systems? */ @@ -235,7 +235,7 @@ tcpkeepalive(struct Curl_easy *data, sockfd, SOCKERRNO); } #elif defined(TCP_KEEPALIVE) - /* Mac OS X style */ + /* macOS style */ optval = curlx_sltosi(data->set.tcp_keepidle); KEEPALIVE_FACTOR(optval); if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE, @@ -695,7 +695,7 @@ static CURLcode bindlocal(struct Curl_easy *data, struct connectdata *conn, else { /* * provided dev was no interface (or interfaces are not supported - * e.g. solaris) no ip address and no domain we fail here + * e.g. Solaris) no ip address and no domain we fail here */ done = -1; } @@ -844,7 +844,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error) if(0 != getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (void *)&err, &errSize)) err = SOCKERRNO; #ifdef _WIN32_WCE - /* Old WinCE versions do not support SO_ERROR */ + /* Old Windows CE versions do not support SO_ERROR */ if(WSAENOPROTOOPT == err) { SET_SOCKERRNO(0); err = 0; diff --git a/lib/config-mac.h b/lib/config-mac.h index c29888f8f7..53df87cbbc 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -27,7 +27,7 @@ /* =================================================================== */ /* Hand crafted config file for Mac OS 9 */ /* =================================================================== */ -/* On Mac OS X you must run configure to generate curl_config.h file */ +/* On macOS you must run configure to generate curl_config.h file */ /* =================================================================== */ #ifndef OS diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index ae3ca290c3..800fc61cf1 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -25,7 +25,7 @@ ***************************************************************************/ /* ================================================================ */ -/* lib/config-win32ce.h - Hand crafted config file for windows ce */ +/* lib/config-win32ce.h - Hand crafted config file for Windows CE */ /* ================================================================ */ /* ---------------------------------------------------------------- */ @@ -279,7 +279,7 @@ #define PACKAGE "curl" /* ---------------------------------------------------------------- */ -/* WinCE */ +/* Windows CE */ /* ---------------------------------------------------------------- */ #ifndef UNICODE diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index d290d7da10..44e10e9c9a 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -571,7 +571,7 @@ curl_dbg_getaddrinfo(const char *hostname, #if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS) /* - * Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and Mac OS X + * Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and macOS * 10.11.5. */ void Curl_addrinfo_set_port(struct Curl_addrinfo *addrinfo, int port) diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 631ee27b33..666a7bae46 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -677,7 +677,7 @@ ${SIZEOF_TIME_T_CODE} /* Define if you want to enable POSIX threaded DNS lookup */ #cmakedefine USE_THREADS_POSIX 1 -/* Define if you want to enable WIN32 threaded DNS lookup */ +/* Define if you want to enable Win32 threaded DNS lookup */ #cmakedefine USE_THREADS_WIN32 1 /* if GnuTLS is enabled */ diff --git a/lib/curl_fnmatch.h b/lib/curl_fnmatch.h index 595646ff0d..b8c2a4353c 100644 --- a/lib/curl_fnmatch.h +++ b/lib/curl_fnmatch.h @@ -31,7 +31,7 @@ /* default pattern matching function * ================================= * Implemented with recursive backtracking, if you want to use Curl_fnmatch, - * please note that there is not implemented UTF/UNICODE support. + * please note that there is not implemented UTF/Unicode support. * * Implemented features: * '?' notation, does not match UTF characters diff --git a/lib/curl_multibyte.h b/lib/curl_multibyte.h index 2d31c28f44..dec384e2fe 100644 --- a/lib/curl_multibyte.h +++ b/lib/curl_multibyte.h @@ -39,12 +39,12 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w); * Macros curlx_convert_UTF8_to_tchar(), curlx_convert_tchar_to_UTF8() * and curlx_unicodefree() main purpose is to minimize the number of * preprocessor conditional directives needed by code using these - * to differentiate UNICODE from non-UNICODE builds. + * to differentiate Unicode from non-Unicode builds. * - * In the case of a non-UNICODE build the tchar strings are char strings that + * In the case of a non-Unicode build the tchar strings are char strings that * are duplicated via strdup and remain in whatever the passed in encoding is, * which is assumed to be UTF-8 but may be other encoding. Therefore the - * significance of the conversion functions is primarily for UNICODE builds. + * significance of the conversion functions is primarily for Unicode builds. * * Allocated memory should be free'd with curlx_unicodefree(). * diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 62628c04ea..51d9d39c41 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -534,13 +534,13 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_hash(const char *user, size_t userlen, /* * Curl_ntlm_core_mk_ntlmv2_resp() * - * This creates the NTLMv2 response as set in the ntlm type-3 message. + * This creates the NTLMv2 response as set in the NTLM type-3 message. * * Parameters: * - * ntlmv2hash [in] - The ntlmv2 hash (16 bytes) + * ntlmv2hash [in] - The NTLMv2 hash (16 bytes) * challenge_client [in] - The client nonce (8 bytes) - * ntlm [in] - The ntlm data struct being used to read TargetInfo + * ntlm [in] - The NTLM data struct being used to read TargetInfo and Server challenge received in the type-2 message * ntresp [out] - The address where a pointer to newly allocated * memory holding the NTLMv2 response. @@ -629,11 +629,11 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, /* * Curl_ntlm_core_mk_lmv2_resp() * - * This creates the LMv2 response as used in the ntlm type-3 message. + * This creates the LMv2 response as used in the NTLM type-3 message. * * Parameters: * - * ntlmv2hash [in] - The ntlmv2 hash (16 bytes) + * ntlmv2hash [in] - The NTLMv2 hash (16 bytes) * challenge_client [in] - The client nonce (8 bytes) * challenge_client [in] - The server challenge (8 bytes) * lmresp [out] - The LMv2 response (24 bytes) @@ -657,7 +657,7 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash, if(result) return result; - /* Concatenate the HMAC MD5 output with the client nonce */ + /* Concatenate the HMAC MD5 output with the client nonce */ memcpy(lmresp, hmac_output, 16); memcpy(lmresp + 16, challenge_client, 8); diff --git a/lib/curl_setup.h b/lib/curl_setup.h index c8dba5e2b4..86aa631304 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -319,7 +319,7 @@ /* curl uses its own printf() function internally. It understands the GNU * format. Use this format, so that is matches the GNU format attribute we - * use with the mingw compiler, allowing it to verify them at compile-time. + * use with the MinGW compiler, allowing it to verify them at compile-time. */ #ifdef __MINGW32__ # undef CURL_FORMAT_CURL_OFF_T @@ -444,7 +444,7 @@ #endif /* - * Large file (>2Gb) support using WIN32 functions. + * Large file (>2Gb) support using Win32 functions. */ #ifdef USE_WIN32_LARGE_FILES @@ -467,7 +467,7 @@ #endif /* - * Small file (<2Gb) support using WIN32 functions. + * Small file (<2Gb) support using Win32 functions. */ #ifdef USE_WIN32_SMALL_FILES @@ -816,7 +816,7 @@ #if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H) # if defined(SOCKET) || defined(USE_WINSOCK) -# error "WinSock and lwIP TCP/IP stack definitions shall not coexist!" +# error "Winsock and lwIP TCP/IP stack definitions shall not coexist!" # endif #endif @@ -854,7 +854,7 @@ Therefore we specify it explicitly. https://github.com/curl/curl/pull/258 #define FOPEN_WRITETEXT "wt" #define FOPEN_APPENDTEXT "at" #elif defined(__CYGWIN__) -/* Cygwin has specific behavior we need to address when WIN32 is not defined. +/* Cygwin has specific behavior we need to address when _WIN32 is not defined. https://cygwin.com/cygwin-ug-net/using-textbinary.html For write we want our output to have line endings of LF and be compatible with other Cygwin utilities. For read we want to handle input that may have line diff --git a/lib/doh.h b/lib/doh.h index 5e86bf44a5..318c19520b 100644 --- a/lib/doh.h +++ b/lib/doh.h @@ -116,7 +116,7 @@ struct dohaddr { #define HTTPS_RR_CODE_IPV6 0x06 /* - * These may need escaping when found within an alpn string + * These may need escaping when found within an ALPN string * value. */ #define COMMA_CHAR ',' diff --git a/lib/file.c b/lib/file.c index 82ff151b6f..c57810b1cd 100644 --- a/lib/file.c +++ b/lib/file.c @@ -223,7 +223,7 @@ static CURLcode file_connect(struct Curl_easy *data, bool *done) * A leading slash in an AmigaDOS path denotes the parent * directory, and hence we block this as it is relative. * Absolute paths start with 'volumename:', so we check for - * this first. Failing that, we treat the path as a real unix + * this first. Failing that, we treat the path as a real Unix * path, but only if the application was compiled with -lunix. */ fd = -1; diff --git a/lib/hostip.c b/lib/hostip.c index cdda8308ba..a4de378bcc 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -960,7 +960,7 @@ enum resolve_t Curl_resolv_timeout(struct Curl_easy *data, keep_copysig = TRUE; /* yes, we have a copy */ sigact.sa_handler = alarmfunc; #ifdef SA_RESTART - /* HPUX does not have SA_RESTART but defaults to that behavior! */ + /* HP-UX does not have SA_RESTART but defaults to that behavior! */ sigact.sa_flags &= ~SA_RESTART; #endif /* now set the new struct */ diff --git a/lib/hostip.h b/lib/hostip.h index fff1c066b4..b1c5ecb2e1 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -103,7 +103,7 @@ struct Curl_dns_entry { size_t refcount; /* hostname port number that resolved to addr. */ int hostport; - /* hostname that resolved to addr. may be NULL (unix domain sockets). */ + /* hostname that resolved to addr. may be NULL (Unix domain sockets). */ char hostname[1]; }; diff --git a/lib/hostip4.c b/lib/hostip4.c index 8da809db6f..3bfea48d4f 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -82,7 +82,7 @@ bool Curl_ipvalid(struct Curl_easy *data, struct connectdata *conn) * detect which one this platform supports in the configure script and set up * the HAVE_GETHOSTBYNAME_R_3, HAVE_GETHOSTBYNAME_R_5 or * HAVE_GETHOSTBYNAME_R_6 defines accordingly. Note that HAVE_GETADDRBYNAME - * has the corresponding rules. This is primarily on *nix. Note that some unix + * has the corresponding rules. This is primarily on *nix. Note that some Unix * flavours have thread-safe versions of the plain gethostbyname() etc. * */ @@ -221,7 +221,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, if(!h) /* failure */ #elif defined(HAVE_GETHOSTBYNAME_R_3) - /* AIX, Digital Unix/Tru64, HPUX 10, more? */ + /* AIX, Digital UNIX/Tru64, HP-UX 10, more? */ /* For AIX 4.3 or later, we do not use gethostbyname_r() at all, because of * the plain fact that it does not return unique full buffers on each diff --git a/lib/hostip6.c b/lib/hostip6.c index 18969a7a7d..c16ddfe58d 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -124,7 +124,7 @@ struct Curl_addrinfo *Curl_getaddrinfo(struct Curl_easy *data, #ifndef USE_RESOLVE_ON_IPS /* * The AI_NUMERICHOST must not be set to get synthesized IPv6 address from - * an IPv4 address on iOS and Mac OS X. + * an IPv4 address on iOS and macOS. */ if((1 == Curl_inet_pton(AF_INET, hostname, addrbuf)) || (1 == Curl_inet_pton(AF_INET6, hostname, addrbuf))) { diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index 95c138d4f4..91a45953d5 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -123,7 +123,7 @@ CURLcode Curl_input_ntlm(struct Curl_easy *data, } /* - * This is for creating ntlm header output + * This is for creating NTLM header output */ CURLcode Curl_output_ntlm(struct Curl_easy *data, bool proxy) { diff --git a/lib/http_ntlm.h b/lib/http_ntlm.h index f37572baec..c1cf05701f 100644 --- a/lib/http_ntlm.h +++ b/lib/http_ntlm.h @@ -28,11 +28,11 @@ #if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) -/* this is for ntlm header input */ +/* this is for NTLM header input */ CURLcode Curl_input_ntlm(struct Curl_easy *data, bool proxy, const char *header); -/* this is for creating ntlm header output */ +/* this is for creating NTLM header output */ CURLcode Curl_output_ntlm(struct Curl_easy *data, bool proxy); void Curl_http_auth_cleanup_ntlm(struct connectdata *conn); diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index 3a81eef6ef..a2812cf8e2 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -185,8 +185,8 @@ static char *inet_ntop6(const unsigned char *src, char *dst, size_t size) * Returns NULL on error and errno set with the specific * error, EAFNOSUPPORT or ENOSPC. * - * On Windows we store the error in the thread errno, not in the winsock error - * code. This is to avoid losing the actual last winsock error. When this + * On Windows we store the error in the thread errno, not in the Winsock error + * code. This is to avoid losing the actual last Winsock error. When this * function returns NULL, check errno not SOCKERRNO. */ char *Curl_inet_ntop(int af, const void *src, char *buf, size_t size) diff --git a/lib/inet_pton.c b/lib/inet_pton.c index 49b923f182..97e6f80d79 100644 --- a/lib/inet_pton.c +++ b/lib/inet_pton.c @@ -65,8 +65,8 @@ static int inet_pton6(const char *src, unsigned char *dst); * -1 if some other error occurred (`dst' is untouched in this case, too) * notice: * On Windows we store the error in the thread errno, not - * in the winsock error code. This is to avoid losing the - * actual last winsock error. When this function returns + * in the Winsock error code. This is to avoid losing the + * actual last Winsock error. When this function returns * -1, check errno not SOCKERRNO. * author: * Paul Vixie, 1996. diff --git a/lib/ldap.c b/lib/ldap.c index addb9b353a..01429ba79e 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -143,7 +143,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp); #endif #if defined(USE_WIN32_LDAP) && defined(ldap_err2string) -/* Use ansi error strings in UNICODE builds */ +/* Use ANSI error strings in Unicode builds */ #undef ldap_err2string #define ldap_err2string ldap_err2stringA #endif diff --git a/lib/multi.c b/lib/multi.c index 1461bc4418..82fd46f1d4 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1416,7 +1416,7 @@ static CURLMcode multi_wait(struct Curl_multi *multi, #endif int pollrc; #ifdef USE_WINSOCK - if(cpfds.n) /* just pre-check with WinSock */ + if(cpfds.n) /* just pre-check with Winsock */ pollrc = Curl_poll(cpfds.pfds, cpfds.n, 0); else pollrc = 0; @@ -1436,7 +1436,7 @@ static CURLMcode multi_wait(struct Curl_multi *multi, WSAWaitForMultipleEvents(1, &multi->wsa_event, FALSE, (DWORD)timeout_ms, FALSE); } - /* With WinSock, we have to run the following section unconditionally + /* With Winsock, we have to run the following section unconditionally to call WSAEventSelect(fd, event, 0) on all the sockets */ { #endif diff --git a/lib/multihandle.h b/lib/multihandle.h index 9b80beab9d..c3bb52b828 100644 --- a/lib/multihandle.h +++ b/lib/multihandle.h @@ -155,9 +155,9 @@ struct Curl_multi { curl_multi_timer_callback timer_cb; void *timer_userp; struct curltime timer_lastcall; /* the fixed time for the timeout for the - previous callback */ + previous callback */ #ifdef USE_WINSOCK - WSAEVENT wsa_event; /* winsock event used for waits */ + WSAEVENT wsa_event; /* Winsock event used for waits */ #else #ifdef ENABLE_WAKEUP curl_socket_t wakeup_pair[2]; /* eventfd()/pipe()/socketpair() used for diff --git a/lib/nonblock.c b/lib/nonblock.c index 9ee93db2ee..6dcf42a7ea 100644 --- a/lib/nonblock.c +++ b/lib/nonblock.c @@ -47,7 +47,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ int nonblock /* TRUE or FALSE */) { #if defined(HAVE_FCNTL_O_NONBLOCK) - /* most recent unix versions */ + /* most recent Unix versions */ int flags; flags = sfcntl(sockfd, F_GETFL, 0); if(flags < 0) @@ -65,7 +65,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ #elif defined(HAVE_IOCTL_FIONBIO) - /* older unix versions */ + /* older Unix versions */ int flags = nonblock ? 1 : 0; return ioctl(sockfd, FIONBIO, &flags); diff --git a/lib/select.c b/lib/select.c index 96b0632ff2..dae736b019 100644 --- a/lib/select.c +++ b/lib/select.c @@ -56,7 +56,7 @@ * Internal function used for waiting a specific amount of ms * in Curl_socket_check() and Curl_poll() when no file descriptor * is provided to wait on, just being used to delay execution. - * WinSock select() and poll() timeout mechanisms need a valid + * Winsock select() and poll() timeout mechanisms need a valid * socket descriptor in a not null file descriptor set to work. * Waiting indefinitely with this function is not allowed, a * zero or negative timeout value will return immediately. @@ -135,7 +135,7 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */ struct timeval *ptimeout; #ifdef USE_WINSOCK - /* WinSock select() cannot handle zero events. See the comment below. */ + /* Winsock select() cannot handle zero events. See the comment below. */ if((!fds_read || fds_read->fd_count == 0) && (!fds_write || fds_write->fd_count == 0) && (!fds_err || fds_err->fd_count == 0)) { @@ -147,7 +147,7 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */ ptimeout = curlx_mstotv(&pending_tv, timeout_ms); #ifdef USE_WINSOCK - /* WinSock select() must not be called with an fd_set that contains zero + /* Winsock select() must not be called with an fd_set that contains zero fd flags, or it will return WSAEINVAL. But, it also cannot be called with no fd_sets at all! From the documentation: @@ -155,8 +155,8 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */ given as null. At least one must be non-null, and any non-null descriptor set must contain at least one handle to a socket. - It is unclear why WinSock does not just handle this for us instead of - calling this an error. Luckily, with WinSock, we can _also_ ask how + It is unclear why Winsock does not just handle this for us instead of + calling this an error. Luckily, with Winsock, we can _also_ ask how many bits are set on an fd_set. So, let's just check it beforehand. */ return select((int)maxfd + 1, @@ -361,8 +361,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms) } /* - Note also that WinSock ignores the first argument, so we do not worry - about the fact that maxfd is computed incorrectly with WinSock (since + Note also that Winsock ignores the first argument, so we do not worry + about the fact that maxfd is computed incorrectly with Winsock (since curl_socket_t is unsigned in such cases and thus -1 is the largest value). */ diff --git a/lib/setopt.c b/lib/setopt.c index 7d35651d10..c2bf89c3f0 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2165,7 +2165,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) */ #ifdef USE_SSL if(Curl_ssl_supports(data, SSLSUPP_CA_PATH)) - /* This does not work on windows. */ + /* This does not work on Windows. */ result = Curl_setstropt(&data->set.str[STRING_SSL_CAPATH], va_arg(param, char *)); else @@ -2180,7 +2180,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) */ #ifdef USE_SSL if(Curl_ssl_supports(data, SSLSUPP_CA_PATH)) - /* This does not work on windows. */ + /* This does not work on Windows. */ result = Curl_setstropt(&data->set.str[STRING_SSL_CAPATH_PROXY], va_arg(param, char *)); else diff --git a/lib/setup-win32.h b/lib/setup-win32.h index 80efc25f13..a297bdcff4 100644 --- a/lib/setup-win32.h +++ b/lib/setup-win32.h @@ -62,11 +62,11 @@ #endif /* - * Include header files for windows builds before redefining anything. + * Include header files for Windows builds before redefining anything. * Use this preprocessor block only to include or exclude windows.h, - * winsock2.h or ws2tcpip.h. Any other windows thing belongs + * winsock2.h or ws2tcpip.h. Any other Windows thing belongs * to any other further and independent block. Under Cygwin things work - * just as under linux (e.g. ) and the winsock headers should + * just as under Linux (e.g. ) and the Winsock headers should * never be included when __CYGWIN__ is defined. */ diff --git a/lib/smb.c b/lib/smb.c index 2fb16de430..20ad49f43b 100644 --- a/lib/smb.c +++ b/lib/smb.c @@ -924,7 +924,7 @@ static CURLcode smb_connection_state(struct Curl_easy *data, bool *done) /* * Convert a timestamp from the Windows world (100 nsec units from 1 Jan 1601) - * to Posix time. Cap the output to fit within a time_t. + * to POSIX time. Cap the output to fit within a time_t. */ static void get_posix_time(time_t *out, curl_off_t timestamp) { diff --git a/lib/socketpair.h b/lib/socketpair.h index 42f4034fc5..3044f1122e 100644 --- a/lib/socketpair.h +++ b/lib/socketpair.h @@ -74,7 +74,7 @@ int Curl_pipe(curl_socket_t socks[2], bool nonblocking); #elif !defined(HAVE_SOCKETPAIR) #define SOCKETPAIR_FAMILY 0 /* not used */ #else -#error "unsupported unix domain and socketpair build combo" +#error "unsupported Unix domain and socketpair build combo" #endif #ifdef SOCK_CLOEXEC diff --git a/lib/system_win32.c b/lib/system_win32.c index 4af86699e3..7b9d14a7aa 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -49,14 +49,14 @@ FREEADDRINFOEXW_FN Curl_FreeAddrInfoExW = NULL; GETADDRINFOEXCANCEL_FN Curl_GetAddrInfoExCancel = NULL; GETADDRINFOEXW_FN Curl_GetAddrInfoExW = NULL; -/* Curl_win32_init() performs win32 global initialization */ +/* Curl_win32_init() performs Win32 global initialization */ CURLcode Curl_win32_init(long flags) { #ifdef USE_WINSOCK HMODULE ws2_32Dll; #endif /* CURL_GLOBAL_WIN32 controls the *optional* part of the initialization which - is just for Winsock at the moment. Any required win32 initialization + is just for Winsock at the moment. Any required Win32 initialization should take place after this block. */ if(flags & CURL_GLOBAL_WIN32) { #ifdef USE_WINSOCK diff --git a/lib/telnet.c b/lib/telnet.c index 7714f4ff3e..8cd19b1b09 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -1342,7 +1342,7 @@ static CURLcode telnet_do(struct Curl_easy *data, bool *done) #ifdef USE_WINSOCK /* We want to wait for both stdin and the socket. Since - ** the select() function in winsock only works on sockets + ** the select() function in Winsock only works on sockets ** we have to use the WaitForMultipleObjects() call. */ @@ -1353,7 +1353,7 @@ static CURLcode telnet_do(struct Curl_easy *data, bool *done) return CURLE_FAILED_INIT; } - /* Tell winsock what events we want to listen to */ + /* Tell Winsock what events we want to listen to */ if(WSAEventSelect(sockfd, event_handle, FD_READ|FD_CLOSE) == SOCKET_ERROR) { WSACloseEvent(event_handle); return CURLE_OK; diff --git a/lib/timeval.c b/lib/timeval.c index 10dbaf02c1..bb29bfdfee 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -137,7 +137,7 @@ struct curltime Curl_now(void) struct curltime Curl_now(void) { /* - ** Monotonic timer on Mac OS is provided by mach_absolute_time(), which + ** Monotonic timer on macOS is provided by mach_absolute_time(), which ** returns time in Mach "absolute time units," which are platform-dependent. ** To convert to nanoseconds, one must use conversion factors specified by ** mach_timebase_info(). diff --git a/lib/url.c b/lib/url.c index 017846a4e8..5d483a396d 100644 --- a/lib/url.c +++ b/lib/url.c @@ -2339,7 +2339,7 @@ static CURLcode parse_proxy_auth(struct Curl_easy *data, return result; } -/* create_conn helper to parse and init proxy values. to be called after unix +/* create_conn helper to parse and init proxy values. to be called after Unix socket init but before any proxy vars are evaluated. */ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data, struct connectdata *conn) @@ -2406,7 +2406,7 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data, Curl_safefree(no_proxy); #ifdef USE_UNIX_SOCKETS - /* For the time being do not mix proxy and unix domain sockets. See #1274 */ + /* For the time being do not mix proxy and Unix domain sockets. See #1274 */ if(proxy && conn->unix_domain_socket) { free(proxy); proxy = NULL; @@ -3338,7 +3338,7 @@ static CURLcode create_conn(struct Curl_easy *data, } #endif - /* After the unix socket init but before the proxy vars are used, parse and + /* After the Unix socket init but before the proxy vars are used, parse and initialize the proxy vars */ #ifndef CURL_DISABLE_PROXY result = create_conn_helper_init_proxy(data, conn); diff --git a/lib/urlapi.c b/lib/urlapi.c index b71be38470..00e12e645e 100644 --- a/lib/urlapi.c +++ b/lib/urlapi.c @@ -41,13 +41,13 @@ #include "curl_memory.h" #include "memdebug.h" - /* MSDOS/Windows style drive prefix, eg c: in c:foo */ + /* MS-DOS/Windows style drive prefix, eg c: in c:foo */ #define STARTS_WITH_DRIVE_PREFIX(str) \ ((('a' <= str[0] && str[0] <= 'z') || \ ('A' <= str[0] && str[0] <= 'Z')) && \ (str[1] == ':')) - /* MSDOS/Windows style drive prefix, optionally with + /* MS-DOS/Windows style drive prefix, optionally with * a '|' instead of ':', followed by a slash or NUL */ #define STARTS_WITH_URL_DRIVE_PREFIX(str) \ ((('a' <= (str)[0] && (str)[0] <= 'z') || \ @@ -1121,7 +1121,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags) * This catches both "file:/c:" and "file:c:" */ if(('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) || STARTS_WITH_URL_DRIVE_PREFIX(path)) { - /* File drive letters are only accepted in MSDOS/Windows */ + /* File drive letters are only accepted in MS-DOS/Windows */ result = CURLUE_BAD_FILE_URL; goto fail; } diff --git a/lib/urldata.h b/lib/urldata.h index 4ef5d65a56..589736a4c2 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -277,7 +277,7 @@ struct ssl_peer { }; struct ssl_primary_config { - char *CApath; /* certificate dir (does not work on windows) */ + char *CApath; /* certificate dir (does not work on Windows) */ char *CAfile; /* certificate to verify peer against */ char *issuercert; /* optional issuer certificate filename */ char *clientcert; @@ -442,7 +442,7 @@ struct ntlmdata { unsigned int flags; unsigned char nonce[8]; unsigned int target_info_len; - void *target_info; /* TargetInfo received in the ntlm type-2 message */ + void *target_info; /* TargetInfo received in the NTLM type-2 message */ #endif }; #endif @@ -1422,7 +1422,7 @@ enum dupstring { STRING_KEY, /* private key filename */ STRING_KEY_PASSWD, /* plain text private key password */ STRING_KEY_TYPE, /* format for private key (default: PEM) */ - STRING_SSL_CAPATH, /* CA directory name (does not work on windows) */ + STRING_SSL_CAPATH, /* CA directory name (does not work on Windows) */ STRING_SSL_CAFILE, /* certificate file to verify peer against */ STRING_SSL_PINNEDPUBLICKEY, /* public key file to verify peer against */ STRING_SSL_CIPHER_LIST, /* list of ciphers to use */ @@ -1436,7 +1436,7 @@ enum dupstring { STRING_KEY_PROXY, /* private key filename */ STRING_KEY_PASSWD_PROXY, /* plain text private key password */ STRING_KEY_TYPE_PROXY, /* format for private key (default: PEM) */ - STRING_SSL_CAPATH_PROXY, /* CA directory name (does not work on windows) */ + STRING_SSL_CAPATH_PROXY, /* CA directory name (does not work on Windows) */ STRING_SSL_CAFILE_PROXY, /* certificate file to verify peer against */ STRING_SSL_PINNEDPUBLICKEY_PROXY, /* public key file to verify proxy */ STRING_SSL_CIPHER_LIST_PROXY, /* list of ciphers to use */ diff --git a/lib/version_win32.c b/lib/version_win32.c index 10fd0b1f16..25ec827462 100644 --- a/lib/version_win32.c +++ b/lib/version_win32.c @@ -55,7 +55,7 @@ struct OUR_OSVERSIONINFOEXW { /* * curlx_verify_windows_version() * - * This is used to verify if we are running on a specific windows version. + * This is used to verify if we are running on a specific Windows version. * * Parameters: * diff --git a/lib/version_win32.h b/lib/version_win32.h index 95c066112c..95a9e7f215 100644 --- a/lib/version_win32.h +++ b/lib/version_win32.h @@ -44,7 +44,7 @@ typedef enum { PLATFORM_WINNT } PlatformIdentifier; -/* This is used to verify if we are running on a specific windows version */ +/* This is used to verify if we are running on a specific Windows version */ bool curlx_verify_windows_version(const unsigned int majorVersion, const unsigned int minorVersion, const unsigned int buildVersion, diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c index 2bb06d463b..4648b5a072 100644 --- a/lib/vquic/vquic.c +++ b/lib/vquic/vquic.c @@ -22,7 +22,7 @@ * ***************************************************************************/ -/* WIP, experimental: use recvmmsg() on linux +/* WIP, experimental: use recvmmsg() on Linux * we have no configure check, yet * and also it is only available for _GNU_SOURCE, which * we do not use otherwise. @@ -720,7 +720,7 @@ CURLcode Curl_conn_may_http3(struct Curl_easy *data, const struct connectdata *conn) { if(conn->transport == TRNSPRT_UNIX) { - /* cannot do QUIC over a unix domain socket */ + /* cannot do QUIC over a Unix domain socket */ return CURLE_QUIC_CONNECT_ERROR; } if(!(conn->handler->flags & PROTOPT_SSL)) { diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index c7bf3b7fb8..abf987bf5f 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -1786,7 +1786,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) } #if SIZEOF_TIME_T > SIZEOF_LONG if(date > 0xffffffff) { - /* if 'long' cannot old >32bit, this date cannot be sent */ + /* if 'long' cannot old >32-bit, this date cannot be sent */ failf(data, "date overflow"); fail = TRUE; } diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 9808f5ecd8..4d3990a0c0 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -1083,7 +1083,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) #ifdef HAS_ALPN /* ALPN is only supported on Windows 8.1 / Server 2012 R2 and above. - Also it does not seem to be supported for Wine, see curl bug #983. */ + Also it does not seem to be supported for WINE, see curl bug #983. */ backend->use_alpn = connssl->alpn && !GetProcAddress(GetModuleHandle(TEXT("ntdll")), "wine_get_version") && @@ -1099,7 +1099,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) * do it following a more manual process. */ backend->use_manual_cred_validation = true; #else -#error "compiler too old to support requisite manual cert verify for Win CE" +#error "compiler too old to support Windows CE requisite manual cert verify" #endif #else #ifdef HAS_MANUAL_VERIFY_API @@ -1242,7 +1242,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data) https://msdn.microsoft.com/en-us/library/windows/desktop/aa375924.aspx At the moment we do not pass inbuf unless we are using ALPN since we only - use it for that, and Wine (for which we currently disable ALPN) is giving + use it for that, and WINE (for which we currently disable ALPN) is giving us problems with inbuf regardless. https://github.com/curl/curl/issues/983 */ sspi_status = s_pSecFn->InitializeSecurityContext( diff --git a/lib/vtls/schannel_verify.c b/lib/vtls/schannel_verify.c index 96ad0e517a..b2d91cb99e 100644 --- a/lib/vtls/schannel_verify.c +++ b/lib/vtls/schannel_verify.c @@ -83,7 +83,7 @@ static int is_cr_or_lf(char c) /* Search the substring needle,needlelen into string haystack,haystacklen * Strings do not need to be terminated by a '\0'. - * Similar of OSX/Linux memmem (not available on Visual Studio). + * Similar of macOS/Linux memmem (not available on Visual Studio). * Return position of beginning of first occurrence or NULL if not found */ static const char *c_memmem(const void *haystack, size_t haystacklen, diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index a45e6ab6a4..688027ce7d 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -216,7 +216,7 @@ static const uint16_t default_ciphers[] = { #define SECTRANSP_PINNEDPUBKEY_V1 1 #endif -/* version 2 supports MacOSX 10.7+ */ +/* version 2 supports macOS 10.7+ */ #if (!TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) #define SECTRANSP_PINNEDPUBKEY_V2 1 #endif @@ -592,7 +592,7 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath, cPassword, kCFStringEncodingUTF8) : NULL; CFDataRef pkcs_data = NULL; - /* We can import P12 files on iOS or OS X 10.7 or later: */ + /* We can import P12 files on iOS or macOS 10.7 or later: */ /* These constants are documented as having first appeared in 10.6 but they raise linker errors when used on that cat for some reason. */ #if CURL_BUILD_MAC_10_7 || CURL_BUILD_IOS @@ -928,7 +928,7 @@ static SSLCipherSuite * sectransp_get_supported_ciphers(SSLContextRef ssl_ctx, /* There is a known bug in early versions of Mountain Lion where ST's ECC ciphers (cipher suite 0xC001 through 0xC032) simply do not work. Work around the problem here by disabling those ciphers if we are - running in an affected version of OS X. */ + running in an affected version of macOS. */ if(maj == 12 && min <= 3) { size_t i = 0, j = 0; for(; i < *len; i++) { diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 001e5f4aa4..27b84f861a 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -569,7 +569,7 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [ # INTEL_UNIX_C) # - dnl On unix this compiler uses gcc's header files, so + dnl On Unix this compiler uses gcc's header files, so dnl we select ANSI C89 dialect plus GNU extensions. tmp_CFLAGS="$tmp_CFLAGS -std=gnu89" dnl Change some warnings into errors @@ -853,8 +853,8 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sometimes-uninitialized]) case $host_os in cygwin* | mingw*) - dnl skip missing-variable-declarations warnings for cygwin and - dnl mingw because the libtool wrapper executable causes them + dnl skip missing-variable-declarations warnings for Cygwin and + dnl MinGW because the libtool wrapper executable causes them ;; *) CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [missing-variable-declarations]) @@ -1032,7 +1032,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ # dnl Only gcc 4.5 or later if test "$compiler_num" -ge "405"; then - dnl Only windows targets + dnl Only Windows targets if test "$curl_cv_native_windows" = "yes"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-pedantic-ms-format" fi diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index c65120271a..38d7dfee6f 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -1475,35 +1475,35 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ AC_MSG_CHECKING([if getaddrinfo is threadsafe]) case $host_os in aix[[1234]].* | aix5.[[01]].*) - dnl aix 5.1 and older + dnl AIX 5.1 and older tst_tsafe_getaddrinfo="no" ;; aix*) - dnl aix 5.2 and newer + dnl AIX 5.2 and newer tst_tsafe_getaddrinfo="yes" ;; darwin[[12345]].*) - dnl darwin 5.0 and mac os x 10.1.X and older + dnl Darwin 5.0 and macOS 10.1.X and older tst_tsafe_getaddrinfo="no" ;; darwin*) - dnl darwin 6.0 and mac os x 10.2.X and newer + dnl Darwin 6.0 and macOS 10.2.X and newer tst_tsafe_getaddrinfo="yes" ;; freebsd[[1234]].* | freebsd5.[[1234]]*) - dnl freebsd 5.4 and older + dnl FreeBSD 5.4 and older tst_tsafe_getaddrinfo="no" ;; freebsd*) - dnl freebsd 5.5 and newer + dnl FreeBSD 5.5 and newer tst_tsafe_getaddrinfo="yes" ;; hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*) - dnl hpux 11.10 and older + dnl HP-UX 11.10 and older tst_tsafe_getaddrinfo="no" ;; hpux*) - dnl hpux 11.11 and newer + dnl HP-UX 11.11 and newer tst_tsafe_getaddrinfo="yes" ;; midnightbsd*) @@ -1511,19 +1511,19 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ tst_tsafe_getaddrinfo="yes" ;; netbsd[[123]].*) - dnl netbsd 3.X and older + dnl NetBSD 3.X and older tst_tsafe_getaddrinfo="no" ;; netbsd*) - dnl netbsd 4.X and newer + dnl NetBSD 4.X and newer tst_tsafe_getaddrinfo="yes" ;; *bsd*) - dnl All other bsd's + dnl All other BSD's tst_tsafe_getaddrinfo="no" ;; solaris2*) - dnl solaris which have it + dnl Solaris which have it tst_tsafe_getaddrinfo="yes" ;; esac diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index 76107c21a0..a0c292d72b 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -38,7 +38,7 @@ if test "x$OPT_OPENSSL" != xno; then CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" - dnl This is for Msys/Mingw + dnl This is for MSYS/MinGW case $host in *-*-msys* | *-*-mingw*) AC_MSG_CHECKING([for gdi32]) diff --git a/projects/wolfssl_options.h b/projects/wolfssl_options.h index 3ef23fbcd4..96813b959a 100644 --- a/projects/wolfssl_options.h +++ b/projects/wolfssl_options.h @@ -29,7 +29,7 @@ build-wolfssl will copy to the wolfSSL include directories and will result in maximum compatibility. These are the configure options that were used to build wolfSSL v5.1.1 in -mingw and generate the options in this file: +MinGW and generate the options in this file: C_EXTRA_FLAGS="\ -Wno-attributes \ diff --git a/projects/wolfssl_override.props b/projects/wolfssl_override.props index fab60f3c9e..b81ba13d94 100644 --- a/projects/wolfssl_override.props +++ b/projects/wolfssl_override.props @@ -16,7 +16,7 @@ file by using the CustomAfterMicrosoftCommonTargets property. --> $(SolutionDir)\wolfssl\options.h;%(ForcedIncludeFiles); _UNICODE;UNICODE;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(UndefinePreprocessorDefinitions); diff --git a/scripts/delta b/scripts/delta index a294f5a5a7..8f99901e24 100755 --- a/scripts/delta +++ b/scripts/delta @@ -89,7 +89,7 @@ $deletes=`git diff-tree --diff-filter=A -r --summary origin/$branch $start 2>/de $creates=`git diff-tree --diff-filter=D -r --summary origin/$branch $start 2>/dev/null| wc -l`; # Time since that tag -$tagged=`git for-each-ref --format="%(refname:short) | %(taggerdate:unix)" refs/tags/* | grep ^$start | cut "-d|" -f2`; # unix timestamp +$tagged=`git for-each-ref --format="%(refname:short) | %(taggerdate:unix)" refs/tags/* | grep ^$start | cut "-d|" -f2`; # Unix timestamp $taggednice=`git for-each-ref --format="%(refname:short) | %(creatordate)" refs/tags/* | grep ^$start | cut '-d|' -f2`; # human readable time chomp $taggednice; $now=`date +%s`; diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c index 7ce678aabf..fdd1f1f72c 100644 --- a/src/tool_cb_see.c +++ b/src/tool_cb_see.c @@ -54,13 +54,13 @@ int tool_seek_cb(void *userdata, curl_off_t offset, int whence) #if(SIZEOF_CURL_OFF_T > SIZEOF_OFF_T) && !defined(USE_WIN32_LARGE_FILES) /* The offset check following here is only interesting if curl_off_t is - larger than off_t and we are not using the WIN32 large file support - macros that provide the support to do 64bit seeks correctly */ + larger than off_t and we are not using the Win32 large file support + macros that provide the support to do 64-bit seeks correctly */ if(offset > OUR_MAX_SEEK_O) { /* Some precaution code to work around problems with different data sizes - to allow seeking >32bit even if off_t is 32bit. Should be very rare and - is really valid on weirdo-systems. */ + to allow seeking >32-bit even if off_t is 32-bit. Should be very rare + and is really valid on weirdo-systems. */ curl_off_t left = offset; if(whence != SEEK_SET) diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c index ccc0109171..370847753a 100644 --- a/src/tool_cb_wrt.c +++ b/src/tool_cb_wrt.c @@ -219,7 +219,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata) #ifdef _WIN32 fhnd = _get_osfhandle(fileno(outs->stream)); - /* if windows console then UTF-8 must be converted to UTF-16 */ + /* if Windows console then UTF-8 must be converted to UTF-16 */ if(isatty(fileno(outs->stream)) && GetConsoleScreenBufferInfo((HANDLE)fhnd, &console_info)) { wchar_t *wc_buf; diff --git a/src/tool_doswin.c b/src/tool_doswin.c index 38ef0a01eb..321e44f9c0 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -297,11 +297,11 @@ SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos) */ /* -Extra sanitization MSDOS for file_name. +Extra sanitization MS-DOS for file_name. This is a supporting function for sanitize_file_name. -Warning: This is an MSDOS legacy function and was purposely written in a way +Warning: This is an MS-DOS legacy function and was purposely written in a way that some path information may pass through. For example drive letter names (C:, D:, etc) are allowed to pass through. For sanitizing a filename use sanitize_file_name. @@ -449,7 +449,7 @@ Rename file_name if it is a reserved dos device name. This is a supporting function for sanitize_file_name. -Warning: This is an MSDOS legacy function and was purposely written in a way +Warning: This is an MS-DOS legacy function and was purposely written in a way that some path information may pass through. For example drive letter names (C:, D:, etc) are allowed to pass through. For sanitizing a filename use sanitize_file_name. @@ -558,7 +558,7 @@ SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized, } /* This is the legacy portion from rename_if_dos_device_name that checks for - reserved device names. It only works on MSDOS. On Windows XP the stat + reserved device names. It only works on MS-DOS. On Windows XP the stat check errors with EINVAL if the device name is reserved. On Windows Vista/7/8 it sets mode S_IFREG (regular file or device). According to MSDN stat doc the latter behavior is correct, but that does not help us @@ -603,7 +603,7 @@ char **__crt0_glob_function(char *arg) /* * Function to find CACert bundle on a Win32 platform using SearchPath. * (SearchPath is already declared via inclusions done in setup header file) - * (Use the ASCII version instead of the unicode one!) + * (Use the ASCII version instead of the Unicode one!) * The order of the directories it searches is: * 1. application's directory * 2. current working directory diff --git a/src/tool_filetime.c b/src/tool_filetime.c index 549b8bea59..a80019f152 100644 --- a/src/tool_filetime.c +++ b/src/tool_filetime.c @@ -38,7 +38,7 @@ int getfiletime(const char *filename, struct GlobalConfig *global, { int rc = 1; -/* Windows stat() may attempt to adjust the unix GMT file time by a daylight +/* Windows stat() may attempt to adjust the Unix GMT file time by a daylight saving time offset and since it is GMT that is bad behavior. When we have access to a 64-bit type we can bypass stat and get the times directly. */ #if defined(_WIN32) && !defined(CURL_WINDOWS_APP) @@ -92,14 +92,14 @@ void setfiletime(curl_off_t filetime, const char *filename, struct GlobalConfig *global) { if(filetime >= 0) { -/* Windows utime() may attempt to adjust the unix GMT file time by a daylight +/* Windows utime() may attempt to adjust the Unix GMT file time by a daylight saving time offset and since it is GMT that is bad behavior. When we have access to a 64-bit type we can bypass utime and set the times directly. */ #if defined(_WIN32) && !defined(CURL_WINDOWS_APP) HANDLE hfile; TCHAR *tchar_filename = curlx_convert_UTF8_to_tchar((char *)filename); - /* 910670515199 is the maximum unix filetime that can be used as a + /* 910670515199 is the maximum Unix filetime that can be used as a Windows FILETIME without overflow: 30827-12-31T23:59:59. */ if(filetime > CURL_OFF_T_C(910670515199)) { warnf(global, "Failed to set filetime %" CURL_FORMAT_CURL_OFF_T diff --git a/src/tool_findfile.c b/src/tool_findfile.c index a1544a5633..2e36a39612 100644 --- a/src/tool_findfile.c +++ b/src/tool_findfile.c @@ -97,7 +97,7 @@ static char *checkhome(const char *home, const char *fname, bool dotscore) * * 1. Iterate over the environment variables in order, and if set, check for * the given file to be accessed there, then it is a match. - * 2. Non-windows: try getpwuid + * 2. Non-Windows: try getpwuid */ char *findfile(const char *fname, int dotscore) { diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 0c2f08faf4..40b2d54928 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -419,11 +419,11 @@ void parse_cert_parameter(const char *cert_parameter, } break; case ':': - /* Since we live in a world of weirdness and confusion, the win32 + /* Since we live in a world of weirdness and confusion, the Windows dudes can use : when using drive letters and thus c:\file:password needs to work. In order not to break compatibility, we still use : as separator, but we try to detect when it is used for a filename! On - windows. */ + Windows. */ #ifdef _WIN32 if((param_place == &cert_parameter[1]) && (cert_parameter[2] == '\\' || cert_parameter[2] == '/') && @@ -1145,7 +1145,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ nextarg); } else if(!strncmp("\xe2\x80\x9c", nextarg, 3)) { - warnf(global, "The argument '%s' starts with a unicode quote where " + warnf(global, "The argument '%s' starts with a Unicode quote where " "maybe an ASCII \" was intended?", nextarg); } diff --git a/src/tool_operate.c b/src/tool_operate.c index caade1346a..25dc19a638 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -2692,10 +2692,10 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, return CURLE_FAILED_INIT; } - /* On WIN32 we cannot set the path to curl-ca-bundle.crt at compile time. We - * look for the file in two ways: + /* On Windows we cannot set the path to curl-ca-bundle.crt at compile time. + * We look for the file in two ways: * 1: look at the environment variable CURL_CA_BUNDLE for a path - * 2: if #1 is not found, use the windows API function SearchPath() + * 2: if #1 is not found, use the Windows API function SearchPath() * to find it along the app's path (includes app's dir and CWD) * * We support the environment variable thing for non-Windows platforms diff --git a/src/tool_vms.c b/src/tool_vms.c index 7fc23e77ed..9860e16e5b 100644 --- a/src/tool_vms.c +++ b/src/tool_vms.c @@ -94,7 +94,7 @@ void vms_special_exit(int code, int vms_show) { int vms_code; - /* The Posix exit mode is only available after VMS 7.0 */ + /* The POSIX exit mode is only available after VMS 7.0 */ #if __CRTL_VER >= 70000000 if(is_vms_shell() == 0) { decc$__posix_exit(code); diff --git a/tests/CI.md b/tests/CI.md index 1f60682f65..4a8249eaa9 100644 --- a/tests/CI.md +++ b/tests/CI.md @@ -58,7 +58,7 @@ are configured: GitHub Actions runs the following tests: -- Mac OS tests with a variety of different compilation options +- macOS tests with a variety of different compilation options - Fuzz tests ([see the curl-fuzzer repo for more info](https://github.com/curl/curl-fuzzer)). - Curl compiled using the Rust TLS backend with Hyper diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index 2c36a91cd4..9341998fd0 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -152,7 +152,7 @@ Available substitute variables include: - `%NOLISTENPORT` - Port number where no service is listening - `%POP36PORT` - IPv6 port number of the POP3 server - `%POP3PORT` - Port number of the POP3 server -- `%POSIX_PWD` - Current directory somewhat mingw friendly +- `%POSIX_PWD` - Current directory somewhat MinGW friendly - `%PROXYPORT` - Port number of the HTTP proxy - `%PWD` - Current directory - `%RTSP6PORT` - IPv6 port number of the RTSP server diff --git a/tests/README.md b/tests/README.md index 03744ede7d..f450bbea3d 100644 --- a/tests/README.md +++ b/tests/README.md @@ -45,8 +45,8 @@ SPDX-License-Identifier: curl ## Requires to run - - perl (and a unix-style shell) - - python (and a unix-style shell, for SMB and TELNET tests) + - perl (and a Unix-style shell) + - python (and a Unix-style shell, for SMB and TELNET tests) - python-impacket (for SMB tests) - diff (when a test fails, a diff is shown) - stunnel (for HTTPS and FTPS tests) diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 7442738ca8..cd735634e2 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -46,11 +46,11 @@ # fnmatch differences are just too common to make testing them sensible 1307 1316 -# test 1510 causes problems on the CI on github +# test 1510 causes problems on the CI on GitHub # example: https://travis-ci.org/curl/curl/builds/81633600 1510 1512 -# test 1801 causes problems on Mac OS X and github +# test 1801 causes problems on macOS and GitHub # https://github.com/curl/curl/issues/380 1801 # test 2086 causes issues on Windows only diff --git a/tests/data/test128 b/tests/data/test128 index d1a5d2acff..089717da79 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -24,7 +24,7 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --crlf file -with unix newlines +with Unix newlines meant to be converted with @@ -46,7 +46,7 @@ QUIT file -with unix newlines +with Unix newlines meant to be converted with diff --git a/tests/data/test1467 b/tests/data/test1467 index e160a16255..568670a71a 100644 --- a/tests/data/test1467 +++ b/tests/data/test1467 @@ -39,7 +39,7 @@ http socks5unix -HTTP GET via SOCKS5 proxy via unix sockets +HTTP GET via SOCKS5 proxy via Unix sockets --socks5 localhost%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1468 b/tests/data/test1468 index 49748d1190..9836434d4a 100644 --- a/tests/data/test1468 +++ b/tests/data/test1468 @@ -40,7 +40,7 @@ http socks5unix -HTTP GET with host name using SOCKS5h via unix sockets +HTTP GET with host name using SOCKS5h via Unix sockets http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOCKSUNIXPATH diff --git a/tests/data/test1470 b/tests/data/test1470 index c5d74ae650..1c9389a4cc 100644 --- a/tests/data/test1470 +++ b/tests/data/test1470 @@ -41,7 +41,7 @@ https socks5unix -HTTPS GET with host name using SOCKS5h via unix sockets +HTTPS GET with host name using SOCKS5h via Unix sockets https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%SOCKSUNIXPATH diff --git a/tests/data/test1604 b/tests/data/test1604 index 33e4e26c41..c8d19f5480 100644 --- a/tests/data/test1604 +++ b/tests/data/test1604 @@ -15,7 +15,7 @@ none unittest -Test WIN32/MSDOS filename sanitization +Test Windows/MS-DOS filename sanitization diff --git a/tests/data/test2057 b/tests/data/test2057 index 1e7568c6e1..5cbb945901 100644 --- a/tests/data/test2057 +++ b/tests/data/test2057 @@ -51,7 +51,7 @@ Nice auth sir! http -HTTP Negotiate authentication (stub ntlm) +HTTP Negotiate authentication (stub NTLM) GSS-API diff --git a/tests/data/test2072 b/tests/data/test2072 index 50cb4b60a6..caa8c75c2c 100644 --- a/tests/data/test2072 +++ b/tests/data/test2072 @@ -21,13 +21,13 @@ moo file -file:// with unix path resolution behavior for the case of extra slashes +file:// with Unix path resolution behavior for the case of extra slashes file:////%PWD/%LOGDIR/test%TESTNUMBER.txt -perl -e "print 'Test requires a unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');" +perl -e "print 'Test requires a Unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');" foo diff --git a/tests/data/test268 b/tests/data/test268 index 3a1ab6a9b5..0d205fe734 100644 --- a/tests/data/test268 +++ b/tests/data/test268 @@ -32,7 +32,7 @@ Funny-head: yesyes http -JSON encoding of unicode string +JSON encoding of Unicode string %hex[%e2%80%9c]hex% diff --git a/tests/data/test3017 b/tests/data/test3017 index 4d907b39f0..209babf202 100644 --- a/tests/data/test3017 +++ b/tests/data/test3017 @@ -47,7 +47,7 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -m 3 s/^(.* 00044d5154540402003c000c6375726c).*/$1/ -# on windows the disconnect is never seen - no idea why +# on Windows the disconnect is never seen - no idea why ^server DISCONNECT 0 e000 diff --git a/tests/data/test3018 b/tests/data/test3018 index 71e06b593c..d58daf41ab 100644 --- a/tests/data/test3018 +++ b/tests/data/test3018 @@ -45,7 +45,7 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER --max-filesize 11 s/^(.* 00044d5154540402003c000c6375726c).*/$1/ -# on windows the disconnect is never seen - no idea why +# on Windows the disconnect is never seen - no idea why ^server DISCONNECT 0 e000 diff --git a/tests/data/test469 b/tests/data/test469 index 9bcdc5980a..81d341cd8c 100644 --- a/tests/data/test469 +++ b/tests/data/test469 @@ -35,7 +35,7 @@ Funny-head: yesyes http -warn about unicode quote character +warn about Unicode quote character -H “host: %HOSTIP:%HTTPPORT/” -s @@ -46,7 +46,7 @@ warn about unicode quote character # Verify data after the test has been "shot" -%hex[Warning: The argument '%e2%80%9chost:' starts with a unicode quote where maybe an ]hex% +%hex[Warning: The argument '%e2%80%9chost:' starts with a Unicode quote where maybe an ]hex% Warning: ASCII " was intended? diff --git a/tests/data/test470 b/tests/data/test470 index 30dd9a82e7..70e50e621d 100644 --- a/tests/data/test470 +++ b/tests/data/test470 @@ -35,7 +35,7 @@ Funny-head: yesyes http -warn about unicode quote character read from config file +warn about Unicode quote character read from config file -H “host:fake” @@ -49,7 +49,7 @@ warn about unicode quote character read from config file # Verify data after the test has been "shot" -%hex[Warning: The argument '%e2%80%9chost:fake%e2%80%9d' starts with a unicode quote where ]hex% +%hex[Warning: The argument '%e2%80%9chost:fake%e2%80%9d' starts with a Unicode quote where ]hex% Warning: maybe an ASCII " was intended? diff --git a/tests/data/test941 b/tests/data/test941 index 79f88a6740..7b7669fdd9 100644 --- a/tests/data/test941 +++ b/tests/data/test941 @@ -26,7 +26,7 @@ To: another email headers and body -with unix newlines +with Unix newlines meant to be converted with @@ -55,7 +55,7 @@ To: another email headers and body -with unix newlines +with Unix newlines meant to be converted with diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 0b552e074b..de3436b967 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -226,7 +226,7 @@ sub ftpmsg { # use this, open->print->close system only to make the file # open as little as possible, to make the test suite run - # better on windows/cygwin + # better on Windows/Cygwin } #********************************************************************** diff --git a/tests/getpart.pm b/tests/getpart.pm index ed60feca52..afc1f06214 100644 --- a/tests/getpart.pm +++ b/tests/getpart.pm @@ -316,7 +316,7 @@ sub compareparts { # NOTE: this no longer strips off carriage returns from the arrays. Is that # really necessary? It ruins the testing of newlines. I believe it was once - # added to enable tests on win32. + # added to enable tests on Windows. if($first ne $second) { return 1; @@ -332,7 +332,7 @@ sub writearray { my ($filename, $arrayref)=@_; open(my $temp, ">", "$filename") || die "Failure writing file"; - binmode($temp,":raw"); # cygwin fix by Kevin Roth + binmode($temp,":raw"); # Cygwin fix by Kevin Roth for(@$arrayref) { print $temp $_; } diff --git a/tests/http/clients/h2-download.c b/tests/http/clients/h2-download.c index 7198398891..12af781de5 100644 --- a/tests/http/clients/h2-download.c +++ b/tests/http/clients/h2-download.c @@ -34,7 +34,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #include #include diff --git a/tests/http/clients/h2-serverpush.c b/tests/http/clients/h2-serverpush.c index 13f804aa26..a9b5537a5e 100644 --- a/tests/http/clients/h2-serverpush.c +++ b/tests/http/clients/h2-serverpush.c @@ -34,7 +34,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #include #include diff --git a/tests/http/clients/ws-data.c b/tests/http/clients/ws-data.c index e7d52756e8..183f982b16 100644 --- a/tests/http/clients/ws-data.c +++ b/tests/http/clients/ws-data.c @@ -34,7 +34,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #include #include diff --git a/tests/http/clients/ws-pingpong.c b/tests/http/clients/ws-pingpong.c index dc36d45482..31904712ff 100644 --- a/tests/http/clients/ws-pingpong.c +++ b/tests/http/clients/ws-pingpong.c @@ -34,7 +34,7 @@ #include #include -/* somewhat unix-specific */ +/* somewhat Unix-specific */ #include #include diff --git a/tests/http/test_11_unix.py b/tests/http/test_11_unix.py index 2df23f4ad5..d800601b34 100644 --- a/tests/http/test_11_unix.py +++ b/tests/http/test_11_unix.py @@ -95,7 +95,7 @@ class TestUnix: yield faker faker.stop() - # download http: via unix socket + # download http: via Unix socket def test_11_01_unix_connect_http(self, env: Env, httpd, uds_faker, repeat): curl = CurlClient(env=env) url = f'http://{env.domain1}:{env.http_port}/data.json' @@ -105,7 +105,7 @@ class TestUnix: ]) r.check_response(count=1, http_status=200) - # download https: via unix socket + # download https: via Unix socket @pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason=f"curl without SSL") def test_11_02_unix_connect_http(self, env: Env, httpd, uds_faker, repeat): curl = CurlClient(env=env) @@ -116,7 +116,7 @@ class TestUnix: ]) r.check_response(exitcode=35, http_status=None) - # download HTTP/3 via unix socket + # download HTTP/3 via Unix socket @pytest.mark.skipif(condition=not Env.have_h3(), reason='h3 not supported') def test_11_03_unix_connect_quic(self, env: Env, httpd, uds_faker, repeat): curl = CurlClient(env=env) diff --git a/tests/pathhelp.pm b/tests/pathhelp.pm index 3afc5dacb2..31de8ff4eb 100644 --- a/tests/pathhelp.pm +++ b/tests/pathhelp.pm @@ -23,20 +23,20 @@ ########################################################################### # This Perl package helps with path transforming when running curl tests on -# Win32 platform with Msys or Cygwin. +# Windows platform with MSYS or Cygwin. # Three main functions 'sys_native_abs_path', 'sys_native_path' and # 'build_sys_abs_path' autodetect format of given pathnames. Following formats # are supported: # (1) /some/path - absolute path in Unix-style -# (2) D:/some/path - absolute path in Win32-style +# (2) D:/some/path - absolute path in Windows-style # (3) some/path - relative path -# (4) D:some/path - path relative to current directory on Win32 drive (paths -# like 'D:' are treated as 'D:./') (*) -# (5) \some/path - path from root directory on current Win32 drive (*) +# (4) D:some/path - path relative to current directory on Windows drive +# (paths like 'D:' are treated as 'D:./') (*) +# (5) \some/path - path from root directory on current Windows drive (*) # All forward '/' and back '\' slashes are treated identically except leading # slash in forms (1) and (5). # Forward slashes are simpler processed in Perl, do not require extra escaping -# for shell (unlike back slashes) and accepted by Win32 native programs, so +# for shell (unlike back slashes) and accepted by Windows native programs, so # all functions return paths with only forward slashes except # 'sys_native_path' which returns paths with first forward slash for form (5). # All returned paths don't contain any duplicated slashes, only single slashes @@ -46,8 +46,9 @@ # so all functions can be unconditionally used on all platforms. # # (*) CAUTION! Forms (4) and (5) are not recommended to use as they can be -# interpreted incorrectly in Perl and Msys/Cygwin environment have low -# control on Win32 current drive and Win32 current path on specific drive. +# interpreted incorrectly in Perl and MSYS/Cygwin environment have low +# control on Windows current drive and Windows current path on specific +# drive. package pathhelp; @@ -88,7 +89,7 @@ BEGIN { # Cached static variable, Perl 5.0-compatible. my $cygdrive_present; - # Returns boolean true if Win32 drives mounted with '/cygdrive/' prefix. + # Returns boolean true if Windows drives mounted with '/cygdrive/' prefix. sub drives_mounted_on_cygdrive { return $cygdrive_present if defined $cygdrive_present; $cygdrive_present = ((-e '/cygdrive/') && (-d '/cygdrive/')) ? 1 : 0; @@ -96,7 +97,7 @@ BEGIN { } } -my $use_cygpath; # Only for Win32: +my $use_cygpath; # Only for Windows: # undef - autodetect # 0 - do not use cygpath # 1 - use cygpath @@ -123,17 +124,17 @@ sub should_use_cygpath { sub normalize_path; ####################################################################### -# Returns current working directory in Win32 format on Windows. +# Returns current working directory in Windows format on Windows. # sub sys_native_current_path { return Cwd::getcwd() if !os_is_win(); my $cur_dir; if($^O eq 'msys') { - # MSys shell has built-in command. + # MSYS shell has built-in command. chomp($cur_dir = `bash -c 'pwd -W'`); if($? != 0) { - warn "Can't determine Win32 current directory.\n"; + warn "Can't determine Windows current directory.\n"; return undef; } # Add final slash if required. @@ -143,7 +144,7 @@ sub sys_native_current_path { # Do not use 'cygpath' - it falsely succeed on paths like '/cygdrive'. $cur_dir = `cmd "/c;" echo %__CD__%`; if($? != 0 || substr($cur_dir, 0, 1) eq '%') { - warn "Can't determine Win32 current directory.\n"; + warn "Can't determine Windows current directory.\n"; return undef; } # Remove both '\r' and '\n'. @@ -156,30 +157,30 @@ sub sys_native_current_path { } ####################################################################### -# Returns Win32 current drive letter with colon. +# Returns Windows current drive letter with colon. # sub get_win32_current_drive { - # Notice parameter "/c;" - it's required to turn off Msys's + # Notice parameter "/c;" - it's required to turn off MSYS's # transformation of '/c' and compatible with Cygwin. my $drive_letter = `cmd "/c;" echo %__CD__:~0,2%`; if($? != 0 || substr($drive_letter, 1, 1) ne ':') { - warn "Can't determine current Win32 drive letter.\n"; + warn "Can't determine current Windows drive letter.\n"; return undef; } return substr($drive_letter, 0, 2); } -# Internal function. Converts path by using Msys's built-in transformation. +# Internal function. Converts path by using MSYS's built-in transformation. # Returned path may contain duplicated and back slashes. sub do_msys_transform; # Internal function. Gets two parameters: first parameter must be single # drive letter ('c'), second optional parameter is path relative to drive's -# current working directory. Returns Win32 absolute normalized path. +# current working directory. Returns Windows absolute normalized path. sub get_abs_path_on_win32_drive; -# Internal function. Tries to find or guess Win32 version of given +# Internal function. Tries to find or guess Windows version of given # absolute Unix-style path. Other types of paths are not supported. # Returned paths contain only single forward slashes (no back and # duplicated slashes). @@ -187,7 +188,7 @@ sub get_abs_path_on_win32_drive; sub do_dumb_guessed_transform; ####################################################################### -# Converts given path to system native format, i.e. to Win32 format on +# Converts given path to system native format, i.e. to Windows format on # Windows platform. Relative paths converted to relative, absolute # paths converted to absolute. # @@ -210,12 +211,12 @@ sub sys_native_path { return $path; } elsif($path =~ m{^\\} || $path =~ m{^[a-zA-Z]:[^/\\]}) { - # Path is a directory or filename on Win32 current drive or relative - # path on current directory on specific Win32 drive. + # Path is a directory or filename on Windows current drive or relative + # path on current directory on specific Windows drive. # ('\path' or 'D:path') - # First type of paths is not processed by Msys transformation and + # First type of paths is not processed by MSYS transformation and # resolved to absolute path by 'cygpath'. - # Second type is not processed by Msys transformation and may be + # Second type is not processed by MSYS transformation and may be # incorrectly processed by 'cygpath' (for paths like 'D:..\../.\') my $first_char = ucfirst(substr($path, 0, 1)); @@ -224,7 +225,7 @@ sub sys_native_path { $path =~ s{[\\/]+}{/}g; # Convert leading slash back to forward slash to indicate - # directory on Win32 current drive or capitalize drive letter. + # directory on Windows current drive or capitalize drive letter. substr($path, 0, 1, $first_char); return $path; } @@ -237,7 +238,7 @@ sub sys_native_path { my $has_final_slash = ($path =~ m{[/\\]$}); - # Use 'cygpath', '-m' means Win32 path with forward slashes. + # Use 'cygpath', '-m' means Windows path with forward slashes. chomp($path = `cygpath -m '$path'`); if ($? != 0) { warn "Can't convert path by \"cygpath\".\n"; @@ -254,13 +255,13 @@ sub sys_native_path { return $path; } elsif($^O eq 'msys') { - # Msys transforms automatically path to Windows native form in staring - # program parameters if program is not Msys-based. + # MSYS transforms automatically path to Windows native form in staring + # program parameters if program is not MSYS-based. $path = do_msys_transform($path); return undef if !defined $path; - # Capitalize drive letter for Win32 paths. + # Capitalize drive letter for Windows paths. $path =~ s{^([a-z]:)}{\u$1}; # Replace any back and duplicated slashes with single forward slashes. @@ -268,7 +269,7 @@ sub sys_native_path { return $path; } elsif($path =~ s{^([a-zA-Z]):[/\\]}{\u$1:/}) { - # Path is already in Win32 form. ('C:\path') + # Path is already in Windows form. ('C:\path') # Replace any back and duplicated slashes with single forward slashes. $path =~ s{[\\/]+}{/}g; @@ -282,13 +283,13 @@ sub sys_native_path { return $path; } - # OS is Windows, but not Msys, path is absolute, path is not in Win32 + # OS is Windows, but not MSYS, path is absolute, path is not in Windows # form and 'cygpath' is not available. return do_dumb_guessed_transform($path); } ####################################################################### -# Converts given path to system native absolute path, i.e. to Win32 +# Converts given path to system native absolute path, i.e. to Windows # absolute format on Windows platform. Both relative and absolute # formats are supported for input. # @@ -304,7 +305,7 @@ sub sys_native_abs_path { } if($path =~ m{^([a-zA-Z]):($|[^/\\].*$)}) { - # Path is single drive with colon or relative path on Win32 drive. + # Path is single drive with colon or relative path on Windows drive. # ('C:' or 'C:path') # This kind of relative path is not processed correctly by 'cygpath'. # Get specified drive letter @@ -326,7 +327,7 @@ sub sys_native_abs_path { $path =~ s{^([\\/])[\\/]+}{$1}g; print "Inter result: \"$path\"\n"; - # Use 'cygpath', '-m' means Win32 path with forward slashes, + # Use 'cygpath', '-m' means Windows path with forward slashes, # '-a' means absolute path chomp($path = `cygpath -m -a '$path'`); if($? != 0) { @@ -344,14 +345,14 @@ sub sys_native_abs_path { return $path } elsif($path =~ s{^([a-zA-Z]):[/\\]}{\u$1:/}) { - # Path is already in Win32 form. ('C:\path') + # Path is already in Windows form. ('C:\path') # Replace any possible back slashes with forward slashes, # remove any duplicated slashes, resolve relative dirs. return normalize_path($path); } elsif(substr($path, 0, 1) eq '\\' ) { - # Path is directory or filename on Win32 current drive. ('\Windows') + # Path is directory or filename on Windows current drive. ('\Windows') my $w32drive = get_win32_current_drive(); return undef if !defined $w32drive; @@ -364,11 +365,11 @@ sub sys_native_abs_path { if(substr($path, 0, 1) ne '/') { # Path is in relative form. Resolve relative directories in Unix form - # *BEFORE* converting to Win32 form otherwise paths like + # *BEFORE* converting to Windows form otherwise paths like # '../../../cygdrive/c/windows' will not be resolved. my $cur_dir; - # MSys shell has built-in command. + # MSYS shell has built-in command. if($^O eq 'msys') { $cur_dir = `bash -c 'pwd -L'`; } @@ -389,8 +390,8 @@ sub sys_native_abs_path { return undef unless defined $path; if($^O eq 'msys') { - # Msys transforms automatically path to Windows native form in staring - # program parameters if program is not Msys-based. + # MSYS transforms automatically path to Windows native form in staring + # program parameters if program is not MSYS-based. $path = do_msys_transform($path); return undef if !defined $path; @@ -398,18 +399,18 @@ sub sys_native_abs_path { $path =~ s{[\\/]+}{/}g; return $path; } - # OS is Windows, but not Msys, path is absolute, path is not in Win32 + # OS is Windows, but not MSYS, path is absolute, path is not in Windows # form and 'cygpath' is not available. return do_dumb_guessed_transform($path); } -# Internal function. Converts given Unix-style absolute path to Win32 format. +# Internal function. Converts given Unix-style absolute path to Windows format. sub simple_transform_win32_to_unix; ####################################################################### # Converts given path to build system format absolute path, i.e. to -# Msys/Cygwin Unix-style absolute format on Windows platform. Both +# MSYS/Cygwin Unix-style absolute format on Windows platform. Both # relative and absolute formats are supported for input. # sub build_sys_abs_path { @@ -424,12 +425,12 @@ sub build_sys_abs_path { } if($path =~ m{^([a-zA-Z]):($|[^/\\].*$)}) { - # Path is single drive with colon or relative path on Win32 drive. + # Path is single drive with colon or relative path on Windows drive. # ('C:' or 'C:path') # This kind of relative path is not processed correctly by 'cygpath'. # Get specified drive letter - # Resolve relative dirs in Win32-style path or paths like 'D:/../c/' + # Resolve relative dirs in Windows-style path or paths like 'D:/../c/' # will be resolved incorrectly. # Replace any possible back slashes with forward slashes, # remove any duplicated slashes. @@ -442,7 +443,7 @@ sub build_sys_abs_path { # Path is empty string. Return current directory. # Empty string processed correctly by 'cygpath'. - # MSys shell has built-in command. + # MSYS shell has built-in command. if($^O eq 'msys') { chomp($path = `bash -c 'pwd -L'`); } @@ -477,7 +478,7 @@ sub build_sys_abs_path { return undef; } - # 'cygpath' removes last slash if path is root dir on Win32 drive. + # 'cygpath' removes last slash if path is root dir on Windows drive. # Restore it. $path .= '/' if($has_final_slash && substr($path, length($path) - 1, 1) ne '/'); @@ -485,9 +486,9 @@ sub build_sys_abs_path { return $path } elsif($path =~ m{^[a-zA-Z]:[/\\]}) { - # Path is already in Win32 form. ('C:\path') + # Path is already in Windows form. ('C:\path') - # Resolve relative dirs in Win32-style path otherwise paths + # Resolve relative dirs in Windows-style path otherwise paths # like 'D:/../c/' will be resolved incorrectly. # Replace any possible back slashes with forward slashes, # remove any duplicated slashes. @@ -497,13 +498,13 @@ sub build_sys_abs_path { return simple_transform_win32_to_unix($path); } elsif(substr($path, 0, 1) eq '\\') { - # Path is directory or filename on Win32 current drive. ('\Windows') + # Path is directory or filename on Windows current drive. ('\Windows') my $w32drive = get_win32_current_drive(); return undef if !defined $w32drive; # Combine drive and path. - # Resolve relative dirs in Win32-style path or paths like 'D:/../c/' + # Resolve relative dirs in Windows-style path or paths like 'D:/../c/' # will be resolved incorrectly. # Replace any possible back slashes with forward slashes, # remove any duplicated slashes. @@ -513,14 +514,14 @@ sub build_sys_abs_path { return simple_transform_win32_to_unix($path); } - # Path is not in any Win32 form. + # Path is not in any Windows form. if(substr($path, 0, 1) ne '/') { # Path in relative form. Resolve relative directories in Unix form - # *BEFORE* converting to Win32 form otherwise paths like + # *BEFORE* converting to Windows form otherwise paths like # '../../../cygdrive/c/windows' will not be resolved. my $cur_dir; - # MSys shell has built-in command. + # MSYS shell has built-in command. if($^O eq 'msys') { $cur_dir = `bash -c 'pwd -L'`; } @@ -566,7 +567,7 @@ sub normalize_path { my $prefix; my $have_root = 0; - # Check whether path starts from Win32 drive. ('C:path' or 'C:\path') + # Check whether path starts from Windows drive. ('C:path' or 'C:\path') if($path =~ m{^([a-zA-Z]:(/|\\)?)(.*$)}) { $prefix = $1; $have_root = 1 if defined $2; @@ -611,23 +612,23 @@ sub normalize_path { return $ret; } -# Internal function. Converts path by using Msys's built-in +# Internal function. Converts path by using MSYS's built-in # transformation. sub do_msys_transform { my ($path) = @_; return undef if $^O ne 'msys'; return $path if $path eq ''; - # Remove leading double forward slashes, as they turn off Msys + # Remove leading double forward slashes, as they turn off MSYS # transforming. $path =~ s{^/[/\\]+}{/}; - # Msys transforms automatically path to Windows native form in staring - # program parameters if program is not Msys-based. + # MSYS transforms automatically path to Windows native form in staring + # program parameters if program is not MSYS-based. # Note: already checked that $path is non-empty. $path = `cmd //c echo '$path'`; if($? != 0) { - warn "Can't transform path into Win32 form by using Msys" . + warn "Can't transform path into Windows form by using MSYS" . "internal transformation.\n"; return undef; } @@ -641,16 +642,16 @@ sub do_msys_transform { # Internal function. Gets two parameters: first parameter must be single # drive letter ('c'), second optional parameter is path relative to drive's -# current working directory. Returns Win32 absolute normalized path. +# current working directory. Returns Windows absolute normalized path. sub get_abs_path_on_win32_drive { my ($drv, $rel_path) = @_; my $res; # Get current directory on specified drive. - # "/c;" is compatible with both Msys and Cygwin. + # "/c;" is compatible with both MSYS and Cygwin. my $cur_dir_on_drv = `cmd "/c;" echo %=$drv:%`; if($? != 0) { - warn "Can't determine Win32 current directory on drive $drv:.\n"; + warn "Can't determine Windows current directory on drive $drv:.\n"; return undef; } @@ -675,7 +676,7 @@ sub get_abs_path_on_win32_drive { return normalize_path($res); } -# Internal function. Tries to find or guess Win32 version of given +# Internal function. Tries to find or guess Windows version of given # absolute Unix-style path. Other types of paths are not supported. # Returned paths contain only single forward slashes (no back and # duplicated slashes). @@ -690,13 +691,13 @@ sub do_dumb_guessed_transform { # Empty path is not valid. return undef if (length($path) == 0); - # RE to find Win32 drive letter + # RE to find Windows drive letter my $drv_ltr_re = drives_mounted_on_cygdrive() ? qr{^/cygdrive/([a-zA-Z])($|/.*$)} : qr{^/([a-zA-Z])($|/.*$)}; - # Check path whether path is Win32 directly mapped drive and try to - # transform it assuming that drive letter is matched to Win32 drive letter. + # Check path whether path is Windows directly mapped drive and try to + # transform it assuming that drive letter is matched to Windows drive letter. if($path =~ m{$drv_ltr_re}) { return ucfirst($1) . ':/' if(length($2) == 0); return ucfirst($1) . ':' . $2; @@ -736,14 +737,14 @@ sub do_dumb_guessed_transform { else { # Shouldn't happens as root '/' directory should always # be resolvable. - warn "Can't determine Win32 directory for path \"$path\".\n"; + warn "Can't determine Windows directory for path \"$path\".\n"; return undef; } } } -# Internal function. Converts given Unix-style absolute path to Win32 format. +# Internal function. Converts given Unix-style absolute path to Windows format. sub simple_transform_win32_to_unix { my ($path) = @_; @@ -752,12 +753,12 @@ sub simple_transform_win32_to_unix { my $res; chomp($res = `cygpath -a -u '$path'`); if($? != 0) { - warn "Can't determine Unix-style directory for Win32 " . + warn "Can't determine Unix-style directory for Windows " . "directory \"$path\".\n"; return undef; } - # 'cygpath' removes last slash if path is root dir on Win32 drive. + # 'cygpath' removes last slash if path is root dir on Windows drive. $res .= '/' if(substr($res, length($res) - 1, 1) ne '/' && $path =~ m{[/\\]$}); return $res; @@ -765,7 +766,7 @@ sub simple_transform_win32_to_unix { # 'cygpath' is not available, use guessed transformation. if($path !~ s{^([a-zA-Z]):(?:/|\\)}{/\l$1/}) { - warn "Can't determine Unix-style directory for Win32 " . + warn "Can't determine Unix-style directory for Windows " . "directory \"$path\".\n"; return undef; } diff --git a/tests/processhelp.pm b/tests/processhelp.pm index 170863f2fa..103986f3d5 100644 --- a/tests/processhelp.pm +++ b/tests/processhelp.pm @@ -48,7 +48,7 @@ BEGIN { no warnings "all"; require Time::HiRes; }; - # portable sleeping falls back to native Sleep on Win32 + # portable sleeping falls back to native Sleep on Windows eval { no warnings "all"; require Win32; diff --git a/tests/runtests.pl b/tests/runtests.pl index fec94f337a..1099a11b0c 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -535,7 +535,7 @@ sub checksystemfeatures { } if($curl =~ /win32|Windows|mingw(32|64)/) { # This is a Windows MinGW build or native build, we need to use - # Win32-style path. + # Windows-style path. $pwd = sys_native_current_path(); $has_textaware = 1; $feature{"win32"} = 1; @@ -682,7 +682,7 @@ sub checksystemfeatures { # 'https-proxy' is used as "server" so consider it a protocol push @protocols, 'https-proxy'; } - # UNICODE support + # Unicode support $feature{"Unicode"} = $feat =~ /Unicode/i; # Thread-safe init $feature{"threadsafe"} = $feat =~ /threadsafe/i; @@ -1245,7 +1245,7 @@ sub singletest_check { # get the mode attribute my $filemode=$hash{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows: fix line endings + # text mode when running on Windows: fix line endings s/\r\n/\n/g for @validstdout; s/\n/\r\n/g for @validstdout; s/\r\n/\n/g for @actual; @@ -1305,7 +1305,7 @@ sub singletest_check { s/\r\n/\n/g for @validstderr; } if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows: fix line endings + # text mode when running on Windows: fix line endings s/\r\n/\n/g for @validstderr; s/\n/\r\n/g for @validstderr; } @@ -1400,7 +1400,7 @@ sub singletest_check { # get the mode attribute my $filemode=$replycheckpartattr{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows: fix line endings + # text mode when running on Windows: fix line endings s/\r\n/\n/g for @replycheckpart; s/\n/\r\n/g for @replycheckpart; } @@ -1430,7 +1430,7 @@ sub singletest_check { # get the mode attribute my $filemode=$replyattr{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows: fix line endings + # text mode when running on Windows: fix line endings s/\r\n/\n/g for @reply; s/\n/\r\n/g for @reply; } @@ -1569,7 +1569,7 @@ sub singletest_check { my $filemode=$hash{'mode'}; if($filemode && ($filemode eq "text") && $has_textaware) { - # text mode when running on windows: fix line endings + # text mode when running on Windows: fix line endings s/\r\n/\n/g for @outfile; s/\n/\r\n/g for @outfile; } diff --git a/tests/secureserver.pl b/tests/secureserver.pl index 1b71c36c79..087764155d 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -243,7 +243,7 @@ if($stunnel_version < 310) { if($stunnel =~ /tstunnel(\.exe)?$/) { $tstunnel_windows = 1; - # convert Cygwin/MinGW paths to Win32 format + # convert Cygwin/MinGW paths to Windows format $capath = pathhelp::sys_native_abs_path($capath); $certfile = pathhelp::sys_native_abs_path($certfile); } diff --git a/tests/server/resolve.c b/tests/server/resolve.c index 8ae31bc59b..9e0345272f 100644 --- a/tests/server/resolve.c +++ b/tests/server/resolve.c @@ -38,7 +38,7 @@ #include #endif #ifdef _XOPEN_SOURCE_EXTENDED -/* This define is "almost" required to build on HPUX 11 */ +/* This define is "almost" required to build on HP-UX 11 */ #include #endif #ifdef HAVE_NETDB_H diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index ba6d158ed0..a39c8c890e 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -106,7 +106,7 @@ struct httprequest { bool auth; /* Authorization header present in the incoming request */ size_t cl; /* Content-Length of the incoming request */ bool digest; /* Authorization digest header found */ - bool ntlm; /* Authorization ntlm header found */ + bool ntlm; /* Authorization NTLM header found */ int pipe; /* if non-zero, expect this many requests to do a "piped" request/response */ int skip; /* if non-zero, the server is instructed to not read this diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 4e5cb7e4b2..aefa741682 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -422,11 +422,11 @@ static bool read_data_block(unsigned char *buffer, ssize_t maxlen, #if defined(USE_WINSOCK) && !defined(CURL_WINDOWS_APP) /* - * WinSock select() does not support standard file descriptors, + * Winsock select() does not support standard file descriptors, * it can only check SOCKETs. The following function is an attempt * to re-create a select() function with support for other handle types. * - * select() function with support for WINSOCK2 sockets and all + * select() function with support for Winsock2 sockets and all * other handle types supported by WaitForMultipleObjectsEx() as * well as disk files, anonymous and names pipes, and character input. * @@ -683,7 +683,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds, /* loop over the handles in the input descriptor sets */ nfd = 0; /* number of handled file descriptors */ nth = 0; /* number of internal waiting threads */ - nws = 0; /* number of handled WINSOCK sockets */ + nws = 0; /* number of handled Winsock sockets */ for(fd = 0; fd < nfds; fd++) { wsasock = curlx_sitosk(fd); wsaevents.lNetworkEvents = 0; @@ -829,7 +829,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds, FD_CLR(wsasock, exceptfds); } else { - /* try to handle the event with the WINSOCK2 functions */ + /* try to handle the event with the Winsock2 functions */ wsaevents.lNetworkEvents = 0; error = WSAEnumNetworkEvents(wsasock, handle, &wsaevents); if(error != SOCKET_ERROR) { diff --git a/tests/server/socksd.c b/tests/server/socksd.c index 6fd647faaa..d2de40082f 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -1117,7 +1117,7 @@ int main(int argc, char *argv[]) #ifdef USE_UNIX_SOCKETS if(socket_domain == AF_UNIX) - logmsg("Listening on unix socket %s", unix_socket); + logmsg("Listening on Unix socket %s", unix_socket); else #endif logmsg("Listening on port %hu", port); diff --git a/tests/server/sws.c b/tests/server/sws.c index 53add587d6..94fb48cc1c 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -109,7 +109,7 @@ struct httprequest { bool auth; /* Authorization header present in the incoming request */ size_t cl; /* Content-Length of the incoming request */ bool digest; /* Authorization digest header found */ - bool ntlm; /* Authorization ntlm header found */ + bool ntlm; /* Authorization NTLM header found */ int delay; /* if non-zero, delay this number of msec after connect */ int writedelay; /* if non-zero, delay this number of milliseconds between writes in the response */ diff --git a/tests/server/util.c b/tests/server/util.c index eed305d156..56a68b7f61 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -28,7 +28,7 @@ #include #endif #ifdef _XOPEN_SOURCE_EXTENDED -/* This define is "almost" required to build on HPUX 11 */ +/* This define is "almost" required to build on HP-UX 11 */ #include #endif #ifdef HAVE_NETDB_H @@ -143,7 +143,7 @@ static const char *win32_strerror(int err, char *buf, size_t buflen) return buf; } -/* use instead of perror() on generic windows */ +/* use instead of perror() on generic Windows */ void win32_perror(const char *msg) { char buf[512]; @@ -166,7 +166,7 @@ void win32_init(void) if(err) { perror("Winsock init failed"); - logmsg("Error initialising winsock -- aborting"); + logmsg("Error initialising Winsock -- aborting"); exit(1); } @@ -190,7 +190,7 @@ void win32_cleanup(void) _flushall(); } -/* socket-safe strerror (works on WinSock errors, too */ +/* socket-safe strerror (works on Winsock errors, too */ const char *sstrerror(int err) { static char buf[512]; @@ -550,7 +550,7 @@ static void exit_signal_handler(int signum) * They are included for ANSI compatibility. Therefore, you can set * signal handlers for these signals by using signal, and you can also * explicitly generate these signals by calling raise. Source: - * https://docs.microsoft.com/de-de/cpp/c-runtime-library/reference/signal + * https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/signal */ static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType) { @@ -690,7 +690,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler, void install_signal_handlers(bool keep_sigalrm) { #ifdef _WIN32 - /* setup windows exit event before any signal can trigger */ + /* setup Windows exit event before any signal can trigger */ exit_event = CreateEvent(NULL, TRUE, FALSE, NULL); if(!exit_event) logmsg("cannot create exit event"); diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 20939f0daa..fcfe90a620 100755 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -437,7 +437,7 @@ if((! -e pp($hstprvkeyf)) || (! -s pp($hstprvkeyf)) || #*************************************************************************** -# Convert paths for curl's tests running on Windows with Cygwin/Msys OpenSSH +# Convert paths for curl's tests running on Windows with Cygwin/MSYS OpenSSH # my $clipubkeyf_config; my $hstprvkeyf_config; diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 09b0d98b18..a9154855ba 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -150,7 +150,7 @@ $binext = ''; $libext = '.la'; # .la since both libcurl and libcares are made with libtool if ($^O eq 'MSWin32' || $targetos) { if (!$targetos) { - # If no target defined on Win32 lets assume vc + # If no target defined on Windows, let's assume vc $targetos = 'vc'; } if ($targetos =~ /vc/ || $targetos =~ /borland/) { @@ -683,7 +683,7 @@ if (!$crosscompile || (($extvercmd ne '') && (-x $extvercmd))) { my $cmd = ($extvercmd ne '' ? $extvercmd.' ' : '')."./src/curl${binext} --version|"; open($f, "<", $cmd); while(<$f>) { - # strip CR from output on non-win32 platforms (wine on Linux) + # strip CR from output on non-Windows platforms (WINE on Linux) s/\r// if ($^O ne 'MSWin32'); print; } diff --git a/tests/unit/unit1604.c b/tests/unit/unit1604.c index cba3dfcf60..e518e40a14 100644 --- a/tests/unit/unit1604.c +++ b/tests/unit/unit1604.c @@ -201,9 +201,9 @@ UNITTEST_START { "COM56", 0, "COM56", SANITIZE_ERR_OK }, - /* At the moment we expect a maximum path length of 259. I assume MSDOS + /* At the moment we expect a maximum path length of 259. I assume MS-DOS has variable max path lengths depending on compiler that are shorter - so currently these "good" truncate tests won't run on MSDOS */ + so currently these "good" truncate tests will not run on MS-DOS */ #ifndef MSDOS { "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" diff --git a/winbuild/README.md b/winbuild/README.md index 1ab5f5825e..f35c117963 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -100,7 +100,7 @@ where `` is one or many of: - `ENABLE_OPENSSL_AUTO_LOAD_CONFIG=` - Enable loading OpenSSL configuration automatically, defaults to yes - - `ENABLE_UNICODE=` - Enable UNICODE support, defaults to no + - `ENABLE_UNICODE=` - Enable Unicode support, defaults to no - `ENABLE_WEBSOCKETS=` - Enable Web Socket support, defaults to no - `GEN_PDB=` - Generate External Program Database (debug symbols for release build) -- 2.47.3