diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d19cb7aa..4187d37d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ # KIND, either express or implied. # ########################################################################### -# cURL/libcurl CMake script +# curl/libcurl CMake script # by Tetetest and Sukender (Benoit Neil) # TODO: @@ -72,7 +72,7 @@ set(OS "\"${CMAKE_SYSTEM_NAME}\"") include_directories(${PROJECT_BINARY_DIR}/include/curl) include_directories( ${CURL_SOURCE_DIR}/include ) -option(BUILD_CURL_EXE "Set to ON to build cURL executable." ON) +option(BUILD_CURL_EXE "Set to ON to build curl executable." ON) option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF) option(ENABLE_ARES "Set to ON to enable c-ares support" OFF) if(WIN32) @@ -454,7 +454,7 @@ check_library_exists_concat("idn" idna_to_ascii_lz HAVE_LIBIDN) # Check for symbol dlopen (same as HAVE_LIBDL) check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) -option(CURL_ZLIB "Set to ON to enable building cURL with zlib support." ON) +option(CURL_ZLIB "Set to ON to enable building curl with zlib support." ON) set(HAVE_LIBZ OFF) set(HAVE_ZLIB_H OFF) set(HAVE_ZLIB OFF) diff --git a/configure.ac b/configure.ac index 1f01467ef..0626b3810 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,7 @@ AC_SUBST(VERSIONNUM) dnl Solaris pkgadd support definitions PKGADD_PKG="HAXXcurl" -PKGADD_NAME="cURL - a client that groks URLs" +PKGADD_NAME="curl - a client that groks URLs" PKGADD_VENDOR="curl.haxx.se" AC_SUBST(PKGADD_PKG) AC_SUBST(PKGADD_NAME) diff --git a/docs/CODE_STYLE.md b/docs/CODE_STYLE.md index e1da5c2c0..a12bf57cd 100644 --- a/docs/CODE_STYLE.md +++ b/docs/CODE_STYLE.md @@ -1,4 +1,4 @@ -# cURL C code style +# curl C code style Source code that has a common style is easier to read than code that uses different styles in different places. It helps making the code feel like one diff --git a/docs/CONTRIBUTE.md b/docs/CONTRIBUTE.md index eab4a2a0a..b0b0f6ccd 100644 --- a/docs/CONTRIBUTE.md +++ b/docs/CONTRIBUTE.md @@ -4,7 +4,7 @@ This document is intended to offer guidelines on how to best contribute to the curl project. This concerns new features as well as corrections to existing flaws or bugs. -## Learning cURL +## Learning curl ### Join the Community diff --git a/docs/FAQ b/docs/FAQ index 8d37746fc..d663811a2 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -81,7 +81,7 @@ FAQ 4.16 My HTTP POST or PUT requests are slow! 4.17 Non-functional connect timeouts on Windows 4.18 file:// URLs containing drive letters (Windows, NetWare) - 4.19 Why doesn't cURL return an error when the network cable is unplugged? + 4.19 Why doesn't curl return an error when the network cable is unplugged? 4.20 curl doesn't return error for HTTP non-200 responses! 4.21 Why is there a HTTP/1.1 in my HTTP/2 request? @@ -1083,18 +1083,18 @@ FAQ 4.18 file:// URLs containing drive letters (Windows, NetWare) - When using cURL to try to download a local file, one might use a URL + When using curl to try to download a local file, one might use a URL in this format: file://D:/blah.txt - You'll find that even if D:\blah.txt does exist, cURL returns a 'file + You'll find that even if D:\blah.txt does exist, curl returns a 'file not found' error. According to RFC 1738 (https://www.ietf.org/rfc/rfc1738.txt), file:// URLs must contain a host component, but it is ignored by most implementations. In the above example, 'D:' is treated as the - host component, and is taken away. Thus, cURL tries to open '/blah.txt'. + host component, and is taken away. Thus, curl tries to open '/blah.txt'. If your system is installed to drive C:, that will resolve to 'C:\blah.txt', and if that doesn't exist you will get the not found error. @@ -1107,9 +1107,9 @@ FAQ file://localhost/D:/blah.txt - In either case, cURL should now be looking for the correct file. + In either case, curl should now be looking for the correct file. - 4.19 Why doesn't cURL return an error when the network cable is unplugged? + 4.19 Why doesn't curl return an error when the network cable is unplugged? Unplugging a cable is not an error situation. The TCP/IP protocol stack was designed to be fault tolerant, so even though there may be a physical diff --git a/docs/INSTALL b/docs/INSTALL index 2e1075ba4..4f6593116 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -648,7 +648,7 @@ AmigaOS (This section was graciously brought to us by Diego Casorran) - To build cURL/libcurl on AmigaOS just type 'make amiga' ... + To build curl/libcurl on AmigaOS just type 'make amiga' ... What you need is: (not tested with others versions) @@ -900,7 +900,7 @@ CROSS COMPILE (This section was graciously brought to us by Jim Duey, with additions by Dan Fandrich) - Download and unpack the cURL package. + Download and unpack the curl package. 'cd' to the new directory. (e.g. cd curl-7.12.3) @@ -934,7 +934,7 @@ CROSS COMPILE You may also need to provide a parameter like '--with-random=/dev/urandom' to configure as it cannot detect the presence of a random number generating device for a target system. The '--prefix' parameter - specifies where cURL will be installed. If 'configure' completes + specifies where curl will be installed. If 'configure' completes successfully, do 'make' and 'make install' as usual. In some cases, you may be able to simplify the above commands to as diff --git a/docs/MAIL-ETIQUETTE b/docs/MAIL-ETIQUETTE index c118200c4..4d439aa43 100644 --- a/docs/MAIL-ETIQUETTE +++ b/docs/MAIL-ETIQUETTE @@ -48,7 +48,7 @@ MAIL ETIQUETTE each particular group and subculture there will be differences in what is acceptable and what is considered good manners. - This document outlines what we in the cURL project considers to be good + This document outlines what we in the curl project considers to be good etiquette, and primarily this focus on how to behave on and how to use our mailing lists. diff --git a/docs/TODO b/docs/TODO index 68b6c2094..6bfef6cd2 100644 --- a/docs/TODO +++ b/docs/TODO @@ -894,7 +894,7 @@ that doesn't exist on the server, just like --ftp-create-dirs. 18.3 prevent file overwriting - Add an option that prevents cURL from overwriting existing local files. When + Add an option that prevents curl from overwriting existing local files. When used, and there already is an existing file with the target file name (either -O or -o), a number should be appended (and increased if already existing). So that index.html becomes first index.html.1 and then @@ -1017,7 +1017,7 @@ that doesn't exist on the server, just like --ftp-create-dirs. 19.2 Enable PIE and RELRO by default - Especially when having programs that execute cURL via the command line, PIE + Especially when having programs that execute curl via the command line, PIE renders the exploitation of memory corruption vulnerabilities a lot more difficult. This can be attributed to the additional information leaks being required to conduct a successful attack. RELRO, on the other hand, masks @@ -1025,7 +1025,7 @@ that doesn't exist on the server, just like --ftp-create-dirs. of techniques that come in handy when attackers are able to arbitrarily overwrite memory. A few tests showed that enabling these features had close to no impact, neither on the performance nor on the general functionality of - cURL. + curl. 20. Test suite diff --git a/docs/libcurl/opts/CURLINFO_COOKIELIST.3 b/docs/libcurl/opts/CURLINFO_COOKIELIST.3 index 961fd9828..b9f75f4db 100644 --- a/docs/libcurl/opts/CURLINFO_COOKIELIST.3 +++ b/docs/libcurl/opts/CURLINFO_COOKIELIST.3 @@ -30,7 +30,7 @@ CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_COOKIELIST, struct curl_slist **cookies); .SH DESCRIPTION Pass a pointer to a 'struct curl_slist *' to receive a linked-list of all -cookies cURL knows (expired ones, too). Don't forget to call +cookies curl knows (expired ones, too). Don't forget to call \fIcurl_slist_free_all(3)\fP on the list after it has been used. If there are no cookies (cookies for the handle have not been enabled or simply none have been received) 'struct curl_slist *' will be set to point to NULL. diff --git a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 index 299c3ccba..ed2b91b55 100644 --- a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 +++ b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -33,9 +33,9 @@ to \fIpath\fP. If \fIpath\fP is NULL, then Unix domain sockets are disabled. An empty string will result in an error at some point, it will not disable use of Unix domain sockets. -When enabled, cURL will connect to the Unix domain socket instead of +When enabled, curl will connect to the Unix domain socket instead of establishing a TCP connection to a host. Since no TCP connection is created, -cURL does not need to resolve the DNS hostname in the URL. +curl does not need to resolve the DNS hostname in the URL. The maximum path length on Cygwin, Linux and Solaris is 107. On other platforms it might be even less. diff --git a/lib/amigaos.c b/lib/amigaos.c index 5591d2220..4f55b30e7 100644 --- a/lib/amigaos.c +++ b/lib/amigaos.c @@ -57,7 +57,7 @@ bool Curl_amiga_init() } if(SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), (ULONG) &errno, - SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG) "cURL", + SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG) "curl", TAG_DONE)) { __request("SocketBaseTags ERROR"); return FALSE; diff --git a/lib/easy.c b/lib/easy.c index 08adf6d24..517c39ffc 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -217,7 +217,7 @@ curl_calloc_callback Curl_ccalloc; #endif /** - * curl_global_init() globally initializes cURL given a bitwise set of the + * curl_global_init() globally initializes curl given a bitwise set of the * different features of what to initialize. */ static CURLcode global_init(long flags, bool memoryfuncs) @@ -292,7 +292,7 @@ static CURLcode global_init(long flags, bool memoryfuncs) /** - * curl_global_init() globally initializes cURL given a bitwise set of the + * curl_global_init() globally initializes curl given a bitwise set of the * different features of what to initialize. */ CURLcode curl_global_init(long flags) @@ -301,7 +301,7 @@ CURLcode curl_global_init(long flags) } /* - * curl_global_init_mem() globally initializes cURL and also registers the + * curl_global_init_mem() globally initializes curl and also registers the * user provided callback routines. */ CURLcode curl_global_init_mem(long flags, curl_malloc_callback m, @@ -333,7 +333,7 @@ CURLcode curl_global_init_mem(long flags, curl_malloc_callback m, } /** - * curl_global_cleanup() globally cleanups cURL, uses the value of + * curl_global_cleanup() globally cleanups curl, uses the value of * "init_flags" to determine what needs to be cleaned up and what doesn't. */ void curl_global_cleanup(void) diff --git a/lib/libcurl.rc b/lib/libcurl.rc index 50b365dbb..c1efbadc6 100644 --- a/lib/libcurl.rc +++ b/lib/libcurl.rc @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -44,12 +44,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The cURL library, https://curl.haxx.se/\0" + VALUE "CompanyName", "The curl library, https://curl.haxx.se/\0" VALUE "FileDescription", "libcurl Shared Library\0" VALUE "FileVersion", LIBCURL_VERSION "\0" VALUE "InternalName", "libcurl\0" VALUE "OriginalFilename", "libcurl.dll\0" - VALUE "ProductName", "The cURL library\0" + VALUE "ProductName", "The curl library\0" VALUE "ProductVersion", LIBCURL_VERSION "\0" VALUE "LegalCopyright", "© " LIBCURL_COPYRIGHT "\0" VALUE "License", "https://curl.haxx.se/docs/copyright.html\0" diff --git a/lib/strerror.c b/lib/strerror.c index 9c58e6b77..edb96d201 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -427,7 +427,7 @@ curl_share_strerror(CURLSHcode error) #ifdef USE_WINSOCK -/* This function handles most / all (?) Winsock errors cURL is able to produce. +/* This function handles most / all (?) Winsock errors curl is able to produce. */ static const char * get_winsock_error (int err, char *buf, size_t len) diff --git a/src/curl.rc b/src/curl.rc index 30ae44493..3a2c3a0fb 100644 --- a/src/curl.rc +++ b/src/curl.rc @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -44,12 +44,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "cURL, https://curl.haxx.se/\0" - VALUE "FileDescription", "The cURL executable\0" + VALUE "CompanyName", "curl, https://curl.haxx.se/\0" + VALUE "FileDescription", "The curl executable\0" VALUE "FileVersion", CURL_VERSION "\0" VALUE "InternalName", "curl\0" VALUE "OriginalFilename", "curl.exe\0" - VALUE "ProductName", "The cURL executable\0" + VALUE "ProductName", "The curl executable\0" VALUE "ProductVersion", CURL_VERSION "\0" VALUE "LegalCopyright", "© " CURL_COPYRIGHT "\0" VALUE "License", "https://curl.haxx.se/docs/copyright.html\0"