mirror of
https://github.com/curl/curl.git
synced 2026-07-28 13:53:07 +03:00
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
This commit is contained in:
parent
a4ad7dc5a3
commit
f81f351b9a
146 changed files with 355 additions and 358 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue