code/docs: Use Unix rather than UNIX to avoid use of the trademark

Use Unix when generically writing about Unix based systems as UNIX is
the trademark and should only be used in a particular product's name.

diff --git a/CHANGES.0 b/CHANGES.0
index 3dc8185cb95ef35d48f4f28e680c88dd7dc339d5..2975f73114f5ed3f6dfb249660224802e16ac300 100644 (file)
--- a/CHANGES.0
+++ b/CHANGES.0
@@ -17598,7 +17598,7 @@ Version 4.8.4
  - As Julian Romero Nieto reported, curl reported wrong version number.
  - As Teemu Yli-Elsila pointed out, the win32 version of 4.8 (and probably all
    other versions for win32) didn't work with binary files since I'm too used
-   to the UNIX style fopen() where binary and text don't differ...
+   to the Unix style fopen() where binary and text don't differ...
  - Ralph Beckmann brought me some changes that lets curl compile error and
    warning free with -Wall -pedantic with g++. I also took the opportunity to
    clean off some unused variables and similar.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6abaab77286c83c059e02553a0fcf3b50f61dd4..fc75d59deb87616361d81c57ff32ea8a2c7f5aea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,7 +527,7 @@ if(CMAKE_USE_GSSAPI)
   endif()
 endif()
 
-option(ENABLE_UNIX_SOCKETS "Define if you want UNIX domain sockets support" ON)
+option(ENABLE_UNIX_SOCKETS "Define if you want Unix domain sockets support" ON)
 if(ENABLE_UNIX_SOCKETS)
   include(CheckStructHasMember)
   check_struct_has_member("struct sockaddr_un" sun_path "sys/un.h" USE_UNIX_SOCKETS)

diff --git a/configure.ac b/configure.ac
index 100d9c5b66f807c97ae5d1802b252e3cd4551dc8..95068c79d21b33aec90281971929e7378c058141 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3275,12 +3275,12 @@ if test "$want_tls_srp" = "yes" && ( test "x$HAVE_GNUTLS_SRP" = "x1" || test "x$
 fi
 
 dnl ************************************************************
-dnl disable UNIX domain sockets support
+dnl disable Unix domain sockets support
 dnl
-AC_MSG_CHECKING([whether to enable UNIX domain sockets])
+AC_MSG_CHECKING([whether to enable Unix domain sockets])
 AC_ARG_ENABLE(unix-sockets,
-AC_HELP_STRING([--enable-unix-sockets],[Enable UNIX domain sockets])
-AC_HELP_STRING([--disable-unix-sockets],[Disable UNIX domain sockets]),
+AC_HELP_STRING([--enable-unix-sockets],[Enable Unix domain sockets])
+AC_HELP_STRING([--disable-unix-sockets],[Disable Unix domain sockets]),
 [ case "$enableval" in
   no)  AC_MSG_RESULT(no)
        want_unix_sockets=no
@@ -3295,7 +3295,7 @@ AC_HELP_STRING([--disable-unix-sockets],[Disable UNIX domain sockets]),
 )
 if test "x$want_unix_sockets" != "xno"; then
   AC_CHECK_MEMBER([struct sockaddr_un.sun_path], [
-    AC_DEFINE(USE_UNIX_SOCKETS, 1, [Use UNIX domain sockets])
+    AC_DEFINE(USE_UNIX_SOCKETS, 1, [Use Unix domain sockets])
     AC_SUBST(USE_UNIX_SOCKETS, [1])
     curl_unix_sockets_msg="enabled"
   ], [
@@ -3391,7 +3391,7 @@ if test "x$IPV6_ENABLED" = "x1"; then
   SUPPORT_FEATURES="$SUPPORT_FEATURES IPv6"
 fi
 if test "x$USE_UNIX_SOCKETS" = "x1"; then
-  SUPPORT_FEATURES="$SUPPORT_FEATURES UNIX-Sockets"
+  SUPPORT_FEATURES="$SUPPORT_FEATURES UnixSockets"
 fi
 if test "x$HAVE_LIBZ" = "x1"; then
   SUPPORT_FEATURES="$SUPPORT_FEATURES libz"
@@ -3601,7 +3601,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
   TLS-SRP support:  ${curl_tls_srp_msg}
   resolver:         ${curl_res_msg}
   ipv6 support:     ${curl_ipv6_msg}
-  UNIX sockets support: ${curl_unix_sockets_msg}
+  Unix sockets support: ${curl_unix_sockets_msg}
   IDN support:      ${curl_idn_msg}
   Build libcurl:    Shared=${enable_shared}, Static=${enable_static}
   Built-in manual:  ${curl_manual_msg}

diff --git a/docs/INSTALL b/docs/INSTALL
index 48c2e6c1f91c2e7e8b4bd2b063ce421cd2e45a80..30dec53432372e8a9e75f1918395421b43cc0285 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -20,10 +20,10 @@ Building from git
    If you get your code off a git repository, see the GIT-INFO file in the
    root directory for specific instructions on how to proceed.
 
-UNIX
+Unix
 ====
 
-   A normal unix installation is made in three or four steps (after you've
+   A normal Unix installation is made in three or four steps (after you've
    unpacked the source archive):
 
         ./configure

diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS
index 0a6646152b56bce9c8f0e6f1739820aa1387a6c4..77885677369573ee962848d3b183838f46566eff 100644 (file)
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -200,7 +200,7 @@ may have been fixed since this was written!
   be to use a data structure other than a plain C string, one that can handle
   embedded NUL characters.  From a practical standpoint, most FTP servers
   would not meaningfully support NUL characters within RFC 959 <string>,
-  anyway (e.g., UNIX pathnames may not contain NUL).
+  anyway (e.g., Unix pathnames may not contain NUL).
 
 14. Test case 165 might fail on a system which has libidn present, but with an
   old iconv version (2.1.3 is a known bad version), since it doesn't recognize

diff --git a/docs/curl.1 b/docs/curl.1
index 1f5389a6ba5ec436c585f0e7732ab5e4bad3a5a0..0b9971cd247eab0579b70da79aba86c8c61845d1 100644 (file)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -813,12 +813,12 @@ the following places in this order:
 
 1) curl tries to find the "home dir": It first checks for the CURL_HOME and
 then the HOME environment variables. Failing that, it uses getpwuid() on
-UNIX-like systems (which returns the home dir given the current user in your
+Unix-like systems (which returns the home dir given the current user in your
 system). On Windows, it then checks for the APPDATA variable, or as a last
 resort the '%USERPROFILE%\\Application Data'.
 
 2) On windows, if there is no _curlrc file in the home dir, it checks for one
-in the same dir the curl executable is placed. On UNIX-like systems, it will
+in the same dir the curl executable is placed. On Unix-like systems, it will
 simply try to load .curlrc from the determined home dir.
 
 .nf
@@ -1026,7 +1026,7 @@ in Metalink file, hash check will fail.
 .IP "-n, --netrc"
 Makes curl scan the \fI.netrc\fP (\fI_netrc\fP on Windows) file in the user's
 home directory for login name and password. This is typically used for FTP on
-UNIX. If used with HTTP, curl will enable user authentication. See
+Unix. If used with HTTP, curl will enable user authentication. See
 .BR netrc(4)
 or
 .BR ftp(1)
@@ -1663,7 +1663,7 @@ If this option is used several times, the last one will be used.
 Prepends a time stamp to each trace or verbose line that curl displays.
 (Added in 7.14.0)
 .IP "--unix-socket <path>"
-(HTTP) Connect through this UNIX domain socket, instead of using the
+(HTTP) Connect through this Unix domain socket, instead of using the
 network. (Added in 7.40.0)
 .IP "-u, --user <user:password>"
 Specify the user name and password to use for server authentication. Overrides

diff --git a/docs/examples/externalsocket.c b/docs/examples/externalsocket.c
index 1b326c8b29e9a57e917379a06088b7741770cd0e..5486d12558cd56074b530f8869096f2db1c8e70b 100644 (file)
--- a/docs/examples/externalsocket.c
+++ b/docs/examples/externalsocket.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -38,7 +38,7 @@
 #include <sys/socket.h>       /*  socket definitions        */
 #include <netinet/in.h>
 #include <arpa/inet.h>        /*  inet (3) funtions         */
-#include <unistd.h>           /*  misc. UNIX functions      */
+#include <unistd.h>           /*  misc. Unix functions      */
 #endif
 
 #include <errno.h>

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 71f681b70174a99c57b60e7f4199e17064f8d647..ecfa38f39eb0f1b50d63a25ecb759a121d60b0b6 100644 (file)
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -188,7 +188,7 @@ Idle time before sending keep-alive. See \fICURLOPT_TCP_KEEPIDLE(3)\fP
 .IP CURLOPT_TCP_KEEPINTVL
 Interval between keep-alive probes. See \fICURLOPT_TCP_KEEPINTVL(3)\fP
 .IP CURLOPT_UNIX_SOCKET_PATH
-Path to a UNIX domain socket. See \fICURLOPT_UNIX_SOCKET_PATH(3)\fP
+Path to a Unix domain socket. See \fICURLOPT_UNIX_SOCKET_PATH(3)\fP
 .SH NAMES and PASSWORDS OPTIONS (Authentication)
 .IP CURLOPT_NETRC
 Enable .netrc parsing. See \fICURLOPT_NETRC(3)\fP

diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3
index 6e553463ede502c92323b6917be867d187d81513..1b8f9c11942fc43ab600b8768b6407ad43ee68b9 100644 (file)
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/curl_version_info.3
@@ -147,7 +147,7 @@ libcurl was built with support for NTLM delegation to a winbind helper.
 libcurl was built with support for HTTP2.
 (Added in 7.33.0)
 .IP CURL_VERSION_UNIX_SOCKETS
-libcurl was built with support for UNIX domain sockets.
+libcurl was built with support for Unix domain sockets.
 (Added in 7.40.0)
 .RE
 \fIssl_version\fP is an ASCII string for the OpenSSL version used. If libcurl

diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3
index d496e70274a342f531b0b65e338644fff920e18e..11b019011a8f4d22bddfc93ced8e4a66ba260fa5 100644 (file)
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libcurl-tutorial.3
@@ -40,7 +40,7 @@ refer to their respective man pages.
 
 .SH "Building"
 There are many different ways to build C programs. This chapter will assume a
-UNIX-style build process. If you use a different build system, you can still
+Unix style build process. If you use a different build system, you can still
 read this to get general information that may apply to your environment as
 well.
 .IP "Compiling the Program"
@@ -412,7 +412,7 @@ similar to the \fICURLOPT_USERPWD(3)\fP option like this:
 
  curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERPWD, "myname:thesecret");
 
-There's a long time UNIX "standard" way of storing ftp user names and
+There's a long time Unix "standard" way of storing FTP user names and
 passwords, namely in the $HOME/.netrc file. The file should be made private
 so that only the user may read it (see also the "Security Considerations"
 chapter), as it might contain the password in plain text. libcurl has the
@@ -1402,7 +1402,7 @@ This happens on Windows machines when libcurl is built and used as a
 DLL. However, you can still do this on Windows if you link with a static
 library.
 .IP "[3]"
-The curl-config tool is generated at build-time (on UNIX-like systems) and
+The curl-config tool is generated at build-time (on Unix-like systems) and
 should be installed with the 'make install' or similar instruction that
 installs the library, header files, man pages etc.
 .IP "[4]"

diff --git a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3
index f656763646ca18eb64a774662971b985c1928500..a659cd2cad16d5209889301f5b8c7a159b065597 100644 (file)
--- a/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3
+++ b/docs/libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3
@@ -22,18 +22,18 @@
 .\"
 .TH CURLOPT_UNIX_SOCKET_PATH 3 "09 Oct 2014" "libcurl 7.40.0" "curl_easy_setopt options"
 .SH NAME
-CURLOPT_UNIX_SOCKET_PATH \- set UNIX domain socket
+CURLOPT_UNIX_SOCKET_PATH \- set Unix domain socket
 .SH SYNOPSIS
 #include <curl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_UNIX_SOCKET_PATH, char *path);
 .SH DESCRIPTION
-Enables the use of UNIX domain sockets as connection endpoint and sets the path
-to \fIpath\fP. If \fIpath\fP is NULL, then UNIX domain sockets are disabled. An
+Enables the use of Unix domain sockets as connection endpoint and sets the path
+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.
+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.
 
@@ -45,9 +45,9 @@ Proxy and TCP options such as
 are not supported. Proxy options such as
 .BR CURLOPT_PROXY "(3)
 have no effect either as these are TCP-oriented, and asking a proxy server to
-connect to a certain UNIX domain socket is not possible.
+connect to a certain Unix domain socket is not possible.
 .SH DEFAULT
-Default is NULL, meaning that no UNIX domain sockets are used.
+Default is NULL, meaning that no Unix domain sockets are used.
 .SH PROTOCOLS
 All protocols except for file:// and FTP are supported in theory. HTTP, IMAP,
 POP3 and SMTP should in particular work (including their SSL/TLS variants).

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 0915a20fa1dced95eb2a9f131cd1e993e1f6e8d3..0562ba8103bc00603a0350985d453d037d7a67a1 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1619,7 +1619,7 @@ typedef enum {
      this option is used only if SSL_VERIFYPEER is true */
   CINIT(PINNEDPUBLICKEY, OBJECTPOINT, 230),
 
-  /* Path to UNIX domain socket */
+  /* Path to Unix domain socket */
   CINIT(UNIX_SOCKET_PATH, OBJECTPOINT, 231),
 
   CURLOPT_LASTENTRY /* the last unused */
@@ -2269,7 +2269,7 @@ typedef struct {
 #define CURL_VERSION_HTTP2        (1<<16) /* HTTP2 support built-in */
 #define CURL_VERSION_GSSAPI       (1<<17) /* Built against a GSS-API library */
 #define CURL_VERSION_KERBEROS5    (1<<18) /* Kerberos V5 auth is supported */
-#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* UNIX domain sockets support */
+#define CURL_VERSION_UNIX_SOCKETS (1<<19) /* Unix domain sockets support */
 
  /*
  * NAME curl_version_info()

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index f283610621c2a317150e0f0fa5de8f92ec3455de..1e359d5c74941b4f4c8d232dd52fa276ebf52da1 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -482,7 +482,7 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
 
 #ifdef USE_UNIX_SOCKETS
 /**
- * Given a path to a UNIX domain socket, return a newly allocated Curl_addrinfo
+ * Given a path to a Unix domain socket, return a newly allocated Curl_addrinfo
  * struct initialized with this path.
  */
 Curl_addrinfo *Curl_unix2addr(const char *path)

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index bd367c28de46dd33c7f8badb1d0042a6867fc09c..87be9c717244c6de31187c60418f222ade2fd6c2 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -912,7 +912,7 @@
 /* if SSL is enabled */
 #cmakedefine USE_SSLEAY 1
 
-/* if UNIX domain sockets are enabled  */
+/* if Unix domain sockets are enabled  */
 #cmakedefine USE_UNIX_SOCKETS
 
 /* Define to 1 if you are building a Windows target without large file

diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index a6c6dea9f64f81b6d37921482356c283a739c1f3..9aacad91456f4161f174d929fa842eb4800c8182 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -23,13 +23,13 @@
 /**
  * Now implemented:
  *
- * 1) UNIX version 1
+ * 1) Unix version 1
  * drwxr-xr-x 1 user01 ftp  512 Jan 29 23:32 prog
- * 2) UNIX version 2
+ * 2) Unix version 2
  * drwxr-xr-x 1 user01 ftp  512 Jan 29 1997  prog
- * 3) UNIX version 3
+ * 3) Unix version 3
  * drwxr-xr-x 1      1   1  512 Jan 29 23:32 prog
- * 4) UNIX symlink
+ * 4) Unix symlink
  * lrwxr-xr-x 1 user01 ftp  512 Jan 29 23:32 prog -> prog2000
  * 5) DOS style
  * 01-29-97 11:32PM <DIR> prog

diff --git a/lib/url.c b/lib/url.c
index 3d6f8fd14f2827f12b6fcb69a2e9f8614a1c8904..788f04849d64923de319f9c055a53f2ab036d4f5 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -5089,7 +5089,7 @@ static CURLcode resolve_server(struct SessionHandle *data,
 
 #ifdef USE_UNIX_SOCKETS
     if(data->set.str[STRING_UNIX_SOCKET_PATH]) {
-      /* UNIX domain sockets are local. The host gets ignored, just use the
+      /* Unix domain sockets are local. The host gets ignored, just use the
        * specified domain socket address. Do not cache "DNS entries". There is
        * no DNS involved and we already have the filesystem path available */
       const char *path = data->set.str[STRING_UNIX_SOCKET_PATH];
@@ -5102,7 +5102,7 @@ static CURLcode resolve_server(struct SessionHandle *data,
       else {
         /* Long paths are not supported for now */
         if(strlen(path) >= sizeof(((struct sockaddr_un *)0)->sun_path)) {
-          failf(data, "UNIX socket path too long: '%s'", path);
+          failf(data, "Unix socket path too long: '%s'", path);
           result = CURLE_COULDNT_RESOLVE_HOST;
         }
         else
@@ -5430,7 +5430,7 @@ static CURLcode create_conn(struct SessionHandle *data,
 
 #ifdef USE_UNIX_SOCKETS
   if(proxy && data->set.str[STRING_UNIX_SOCKET_PATH]) {
-    free(proxy);  /* UNIX domain sockets cannot be proxied, so disable it */
+    free(proxy);  /* Unix domain sockets cannot be proxied, so disable it */
     proxy = NULL;
   }
 #endif

diff --git a/lib/urldata.h b/lib/urldata.h
index 79fcd9a4dcb83f5c3b209cf5b5d83bb102e495e5..5f774704ae5b6d1c25d4d20660f022fb232b55db 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1420,18 +1420,18 @@ enum dupstring {
   STRING_SSH_KNOWNHOSTS,  /* file name of knownhosts file */
 #endif
 #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
-  STRING_SOCKS5_GSSAPI_SERVICE,  /* GSSAPI service name */
+  STRING_SOCKS5_GSSAPI_SERVICE, /* GSSAPI service name */
 #endif
   STRING_MAIL_FROM,
   STRING_MAIL_AUTH,
 
 #ifdef USE_TLS_SRP
-  STRING_TLSAUTH_USERNAME,     /* TLS auth <username> */
-  STRING_TLSAUTH_PASSWORD,     /* TLS auth <password> */
+  STRING_TLSAUTH_USERNAME,      /* TLS auth <username> */
+  STRING_TLSAUTH_PASSWORD,      /* TLS auth <password> */
 #endif
-  STRING_BEARER,          /* <bearer>, if used */
+  STRING_BEARER,                /* <bearer>, if used */
 #ifdef USE_UNIX_SOCKETS
-  STRING_UNIX_SOCKET_PATH,  /* path to UNIX socket, if used */
+  STRING_UNIX_SOCKET_PATH,      /* path to Unix socket, if used */
 #endif
 
   /* -- end of zero-terminated strings -- */

diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj
index 1b3e757e524f71f08b4de23659593f41fe10ebac..85b611c49dc41641b2aab145d95e516470e0f845 100644 (file)
--- a/packages/DOS/common.dj
+++ b/packages/DOS/common.dj
@@ -13,7 +13,7 @@ MAKEFILE = Makefile.dj
 OBJ_DIR = djgpp
 
 #
-# Find out if using a UNIX-like shell or a DOS command interpreter
+# Find out if using a Unix-like shell or a DOS command interpreter
 #
 ifneq ($(findstring COMMAND.COM,$(SHELL)),COMMAND.COM)
   ifneq ($(findstring CMD.EXE,$(SHELL)),CMD.EXE)

diff --git a/packages/EPM/README b/packages/EPM/README
index 3529dbf5a1985fd56e385d61de96d7f9ea80daf9..0b031e84f8cb249a3a5f2e0634a1f14ad3b7786a 100644 (file)
--- a/packages/EPM/README
+++ b/packages/EPM/README
@@ -1,4 +1,4 @@
-EPM is a free UNIX software/file packaging program that generates distribution
+EPM is a free Unix software/file packaging program that generates distribution
 archives from a list of files. EPM Can:
 
  * Generate portable script-based distribution packages complete with

diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com
index 6ec27ea9942fb698906e7fe8fd59a54e44bf4b30..2a5503f765b6abe1875c64215ff717f1ac4852ec 100644 (file)
--- a/packages/vms/config_h.com
+++ b/packages/vms/config_h.com
@@ -1382,7 +1382,7 @@ $!                        search/out 'tfile1' "$_''keyterm'"
 $                      severity = '$severity'
 $                  endif
 $!
-$!                 UNIX compatability routines
+$!                 Unix compatability routines
 $!---------------------------------------------
 $                  if severity .ne. 1
 $                  then

diff --git a/packages/vms/curl_crtl_init.c b/packages/vms/curl_crtl_init.c
index 98c70ec5a828b8c7e4216a7c3d69ee11f56fe924..01a34e5559699b5ff7eece77b1b1e73d0fd79567 100644 (file)
--- a/packages/vms/curl_crtl_init.c
+++ b/packages/vms/curl_crtl_init.c
@@ -232,7 +232,7 @@ static void set_features(void)
         /* POSIX requires that open files be able to be removed */
         set_feature_default ("DECC$ALLOW_REMOVE_OPEN_FILES", ENABLE);
 
-        /* Default to outputting UNIX filesnames in VMS routines */
+        /* Default to outputting Unix filenames in VMS routines */
         set_feature_default ("DECC$FILENAME_UNIX_ONLY", ENABLE);
         /* FILENAME_UNIX_ONLY Implicitly sets */
         /* decc$disable_to_vms_logname_translation */
@@ -248,7 +248,7 @@ static void set_features(void)
         set_feature_default("DECC$FILENAME_UNIX_REPORT", ENABLE);
     }
 
-    /* When reporting UNIX filenames, glob the same way */
+    /* When reporting Unix filenames, glob the same way */
     set_feature_default ("DECC$GLOB_UNIX_STYLE", ENABLE);
 
     /* The VMS version numbers on Unix filenames is incompatible with most */

diff --git a/packages/vms/gnv_curl_configure.sh b/packages/vms/gnv_curl_configure.sh
index f71421080f5af987f8fc1a96fb2d06333293998b..2eeb209c815927811983868ebe1b1f1cefd6143e 100644 (file)
--- a/packages/vms/gnv_curl_configure.sh
+++ b/packages/vms/gnv_curl_configure.sh
@@ -23,7 +23,7 @@
 # 28-Dec-2012  J. Malmberg     Update for Bash 4.2.39
 #==========================================================================
 #
-# POSIX exit mode is needed for UNIX shells.
+# POSIX exit mode is needed for Unix shells.
 export GNV_CC_MAIN_POSIX_EXIT=1
 #
 # Where to look for the helper files.

diff --git a/packages/vms/make_gnv_curl_install.sh b/packages/vms/make_gnv_curl_install.sh
index d2150e625198096f6e93cec31739f60e3638d8f8..5099fe447ec9c95ef177379a701f0f24f55a6950 100644 (file)
--- a/packages/vms/make_gnv_curl_install.sh
+++ b/packages/vms/make_gnv_curl_install.sh
@@ -33,7 +33,7 @@ export GNV_CXX_QUALIFIERS=/DEBUG/OPTIMIZE/float=ieee/ieee_mode=denorm_results
 export GNV_CC_NO_INC_PRIMARY=1
 #
 #
-# POSIX exit mode is needed for UNIX shells.
+# POSIX exit mode is needed for Unix shells.
 export GNV_CC_MAIN_POSIX_EXIT=1
 make
 cd ../..

diff --git a/src/macos/MACINSTALL.TXT b/src/macos/MACINSTALL.TXT
index 7dffa9d1783720b4d5c3e063547408a89b2fddcf..1839ef205ca18ac093b1ceb95aa509a28dc84b03 100644 (file)
--- a/src/macos/MACINSTALL.TXT
+++ b/src/macos/MACINSTALL.TXT
@@ -1 +1 @@
-MACOS (not MACOS X)\r===================\rThis is the first attempt at porting cURL to MacOS.\rhttp, ftp, dict and telnet seems to work fine, other protocols and advanced \rfeatures have not been all tested.\r\rThis port is heavily based on the GUSI library from Matthias Neeracher.\rGUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library \rbringing some of the comforts of UNIX 98 to traditional MacOS.\rThe latest GUSI release can be downloaded from sourceforge \rat <http://sourceforge.net/projects/gusi/>\r\rI have also write a few functions to help port UNIX applications to MacOS.\rThese functions are part of the GUSI Extra library that can be downloaded at\r<http://perso.wanadoo.fr/ela/resources.html#gusiextra>\r\rOpenSSL support is still experimental but I hope to deliver a version \rincluding SSL soon.\r\rcURL for MacOS requires using the CodeWarrior compiler from Metrowerks.\r\rFirst download GUSI, GUSI Extra and cURL. Access paths have been setup so that\rGUSI, GUSI Extra and cURL directories should have the same parent directory.\r\rFollow the instructions in GUSI Extra "readme.txt" mainly the ones related to\rSIOUX and GUSI patches. If you do not apply these patches curl will not behave \rcorrectly.\r\rIn the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a \rstuffit binhexed file)\rFrom the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access \rpaths if required. Then you should be able to build:\r- the libcurl libraries for PPC and 68K.\r- the curl application (also available for PPC and 68K) which is the command\r  line version of cURL.\r\rIf the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"\rto "tool_hugehelp.c" and make sure its file type is 'TEXT'\r
+MACOS (not MACOS X)\r===================\rThis is the first attempt at porting cURL to MacOS.\rhttp, ftp, dict and telnet seems to work fine, other protocols and advanced \rfeatures have not been all tested.\r\rThis port is heavily based on the GUSI library from Matthias Neeracher.\rGUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library \rbringing some of the comforts of UNIX 98 to traditional MacOS.\rThe latest GUSI release can be downloaded from sourceforge \rat <http://sourceforge.net/projects/gusi/>\r\rI have also written a few functions to help port Unix applications to MacOS.\rThese functions are part of the GUSI Extra library that can be downloaded at\r<http://perso.wanadoo.fr/ela/resources.html#gusiextra>\r\rOpenSSL support is still experimental but I hope to deliver a version \rincluding SSL soon.\r\rcURL for MacOS requires using the CodeWarrior compiler from Metrowerks.\r\rFirst download GUSI, GUSI Extra and cURL. Access paths have been setup so that\rGUSI, GUSI Extra and cURL directories should have the same parent directory.\r\rFollow the instructions in GUSI Extra "readme.txt" mainly the ones related to\rSIOUX and GUSI patches. If you do not apply these patches curl will not behave \rcorrectly.\r\rIn the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a \rstuffit binhexed file)\rFrom the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access \rpaths if required. Then you should be able to build:\r- the libcurl libraries for PPC and 68K.\r- the curl application (also available for PPC and 68K) which is the command\r  line version of cURL.\r\rIf the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"\rto "tool_hugehelp.c" and make sure its file type is 'TEXT'\r

diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 2336016096141d85c7530cab7b4e50f937f19b12..cf8d563b023e2873c57b4dd1cc5caff251d884cc 100644 (file)
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -201,14 +201,14 @@ struct OperationConfig {
 #ifdef CURLDEBUG
   bool test_event_based;
 #endif
-  char *xoauth2_bearer;       /* XOAUTH2 bearer token */
-  bool nonpn;                 /* enable/disable TLS NPN extension */
-  bool noalpn;                /* enable/disable TLS ALPN extension */
-  char *unix_socket_path;     /* path to UNIX domain socket */
+  char *xoauth2_bearer;           /* XOAUTH2 bearer token */
+  bool nonpn;                     /* enable/disable TLS NPN extension */
+  bool noalpn;                    /* enable/disable TLS ALPN extension */
+  char *unix_socket_path;         /* path to Unix domain socket */
 
   struct GlobalConfig *global;
   struct OperationConfig *prev;
-  struct OperationConfig *next; /* Always last in the struct */
+  struct OperationConfig *next;   /* Always last in the struct */
 };
 
 struct GlobalConfig {

diff --git a/src/tool_help.c b/src/tool_help.c
index e75020ae87eac69b12137f676ab9fbe35a16c2a4..424a2fa9c12231ca83930ff7e3cd6ce340fcfbd2 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -231,7 +231,7 @@ static const char *const helptext[] = {
   "     --tlsuser USER  TLS username",
   "     --tlspassword STRING  TLS password",
   "     --tlsauthtype STRING  TLS authentication type (default: SRP)",
-  "     --unix-socket FILE    Connect through this UNIX domain socket",
+  "     --unix-socket FILE    Connect through this Unix domain socket",
   " -A, --user-agent STRING  Send User-Agent STRING to server (H)",
   " -v, --verbose       Make the operation more talkative",
   " -V, --version       Show version number and quit",
@@ -275,7 +275,7 @@ static const struct feat feats[] = {
   {"CharConv",       CURL_VERSION_CONV},
   {"TLS-SRP",        CURL_VERSION_TLSAUTH_SRP},
   {"HTTP2",          CURL_VERSION_HTTP2},
-  {"UNIX-Sockets",   CURL_VERSION_UNIX_SOCKETS},
+  {"UnixSockets",    CURL_VERSION_UNIX_SOCKETS},
 };
 
 void tool_help(void)

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 1637357c8091c4f6c3971e1e6456c9306787e764..3b46e2893fb9730de6b20a7590d652585db52112 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -333,7 +333,7 @@ Available substitute variables include:
 %HOSTIP       - IPv4 address of the host running this test
 %HTTP6PORT    - IPv6 port number of the HTTP server
 %HTTPPIPEPORT - Port number of the HTTP pipelining server
-%HTTPUNIXPATH - Path to the UNIX socket of the HTTP server
+%HTTPUNIXPATH - Path to the Unix socket of the HTTP server
 %HTTPPORT     - Port number of the HTTP server
 %HTTPSPORT    - Port number of the HTTPS server
 %HTTPTLS6PORT - IPv6 port number of the HTTP TLS server

diff --git a/tests/README b/tests/README
index 7ef7f81d2f74f225f1ed4b21d3b03f499e5e8d72..a8b8adcee9e381fea6614a584a56365eb490272a 100644 (file)
--- a/tests/README
+++ b/tests/README
@@ -81,7 +81,7 @@ The cURL Test Suite
   machine, or just move the servers in case you have local services on any of
   those ports.
 
-  The HTTP server supports listening on a UNIX domain socket, the default
+  The HTTP server supports listening on a Unix domain socket, the default
   location is 'http.sock'.
 
  1.4 Run

diff --git a/tests/data/test1435 b/tests/data/test1435
index 56ff9d11e206d5999ae1da048259cf9c96a709b3..bd171a4531f5ac509f0a9346c3bf4a46cb1a9f4b 100644 (file)
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -25,7 +25,7 @@ unix-sockets
 http-unix
 </server>
  <name>
-simple HTTP GET over UNIX socket
+simple HTTP GET over Unix socket
  </name>
  <command>
 --unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/1435

diff --git a/tests/data/test1436 b/tests/data/test1436
index b16eadde074f68930d4e848eedeee768143df69c..e40a3bf4beaa1b7e56ac7a31544a86d5fe758eaa 100644 (file)
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -39,7 +39,7 @@ unix-sockets
 http-unix
 </server>
  <name>
-HTTP requests with multiple connections over UNIX socket
+HTTP requests with multiple connections over Unix socket
  </name>
  <command>
 --unix-socket %HTTPUNIXPATH http://one.example.com/14360001 http://two.example.com/14360002 http://one.example.com/14360003

diff --git a/tests/data/test2013 b/tests/data/test2013
index 60e85f3ea90609c592d0e21e1e302847187c855c..0985b32def29700aa4f36d070c45a53a60c4b3af 100644 (file)
--- a/tests/data/test2013
+++ b/tests/data/test2013
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX absolute path
+Metalink local XML file, attempt Unix absolute path
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2013.metalink

diff --git a/tests/data/test2014 b/tests/data/test2014
index 01dc8b31b387bfaf2963abce4b52ed28bfb73b36..d2dbdc7a79cc52d65ec18558c29fd6daf8532fe0 100644 (file)
--- a/tests/data/test2014
+++ b/tests/data/test2014
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX path relative to current
+Metalink local XML file, attempt Unix path relative to current
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2014.metalink

diff --git a/tests/data/test2015 b/tests/data/test2015
index e4d09d50e34058421205ce840deab191b8021268..a35f3117d9fe69ae9f5d1bf63357b36db598bffb 100644 (file)
--- a/tests/data/test2015
+++ b/tests/data/test2015
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX path relative to upper
+Metalink local XML file, attempt Unix path relative to upper
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2015.metalink

diff --git a/tests/data/test2016 b/tests/data/test2016
index fbd6cd5d6bb15f6ae948b4ec7c5ccd534678824e..572aa65c5cd1f0dc4c44b490c085bccdc8411d80 100644 (file)
--- a/tests/data/test2016
+++ b/tests/data/test2016
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX path traversal
+Metalink local XML file, attempt Unix path traversal
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2016.metalink

diff --git a/tests/data/test2017 b/tests/data/test2017
index 52df14e3892faef1f526832c8fec479b266d7c00..15fd9347c8bca93e20bc028289775c8fa9d3a8c8 100644 (file)
--- a/tests/data/test2017
+++ b/tests/data/test2017
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX home path traversal
+Metalink local XML file, attempt Unix home path traversal
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2017.metalink

diff --git a/tests/data/test2018 b/tests/data/test2018
index b76233e1ad514c22440ab94561bb50775d3f9c7c..6d0652dcc65b51e566cb3f37e977eb4504c9e6c4 100644 (file)
--- a/tests/data/test2018
+++ b/tests/data/test2018
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX questionable file name I
+Metalink local XML file, attempt Unix questionable file name I
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2018.metalink

diff --git a/tests/data/test2019 b/tests/data/test2019
index cd098040bca2ef2bec0bb24a52a1538f1eeeeb4b..b17b3f23f988af7917264e49390a9b11b06e3819 100644 (file)
--- a/tests/data/test2019
+++ b/tests/data/test2019
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX questionable file name II
+Metalink local XML file, attempt Unix questionable file name II
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2019.metalink

diff --git a/tests/data/test2020 b/tests/data/test2020
index f89600b64cbb24bf66e0248a2314a6fdeb9e3951..8bf85a4d7fe2d4d2d8284aca6eed0c0a896d0541 100644 (file)
--- a/tests/data/test2020
+++ b/tests/data/test2020
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX questionable file name III
+Metalink local XML file, attempt Unix questionable file name III
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2020.metalink

diff --git a/tests/data/test2021 b/tests/data/test2021
index 133eb1678ccce42f90c8eea81989f36f38712578..20a92244a2c3dd668e969221e17aaa58379cd033 100644 (file)
--- a/tests/data/test2021
+++ b/tests/data/test2021
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX questionable file name IV
+Metalink local XML file, attempt Unix questionable file name IV
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2021.metalink

diff --git a/tests/data/test2022 b/tests/data/test2022
index 8cb0df520698ca360ce3350fc1ae9d23dd66b30c..4f4efd1766815f4c69e64aaa3b015df3a99d0cbc 100644 (file)
--- a/tests/data/test2022
+++ b/tests/data/test2022
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt UNIX questionable file name V
+Metalink local XML file, attempt Unix questionable file name V
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2022.metalink

diff --git a/tests/data/test574 b/tests/data/test574
index c1584480cab365d25d8183a8676feb71d539a010..cb41f03ec45c24714b16c51471181b6ce925aaec 100644 (file)
--- a/tests/data/test574
+++ b/tests/data/test574
@@ -25,7 +25,7 @@ ftp
 lib574
 </tool>
 <name>
-FTP wildcard download - changed fnmatch, 2x perform (UNIX LIST response)
+FTP wildcard download - changed fnmatch, 2x perform (Unix LIST response)
 </name>
 <command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt

diff --git a/tests/data/test576 b/tests/data/test576
index 52a6664f1abbaf41cf129e30f62db26ddedbc47e..74a3aedd13ba0ff151d15ef9cfcac3caffed9d7b 100644 (file)
--- a/tests/data/test576
+++ b/tests/data/test576
@@ -22,7 +22,7 @@ ftp
 lib576
 </tool>
  <name>
-FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (UNIX)
+FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
  </name>
  <command>
 ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*

diff --git a/tests/httpserver.pl b/tests/httpserver.pl
index 1b8c3d28466d13d5f4c78894311277915551e1bb..b60dadc3b165ca853935f5ee0e7abb027d03b451 100755 (executable)
--- a/tests/httpserver.pl
+++ b/tests/httpserver.pl
@@ -36,7 +36,7 @@ use serverhelp qw(
 
 my $verbose = 0;     # set to 1 for debugging
 my $port = 8990;     # just a default
-my $unix_socket;     # location to place a listening UNIX socket
+my $unix_socket;     # location to place a listening Unix socket
 my $ipvnum = 4;      # default IP version of http server
 my $idnum = 1;       # dafault http server instance number
 my $proto = 'http';  # protocol the http server speaks

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 6b1a502d7cd7c6fd5a784708cd2cb56750eb09b8..cac74aa476ed6f45bed2bc70858c217d4690dad9 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -141,7 +141,7 @@ my $HTTPTLSPORT;         # HTTP TLS (non-stunnel) server port
 my $HTTPTLS6PORT;        # HTTP TLS (non-stunnel) IPv6 server port
 my $HTTPPROXYPORT;       # HTTP proxy port, when using CONNECT
 my $HTTPPIPEPORT;        # HTTP pipelining port
-my $HTTPUNIXPATH;        # HTTP server UNIX domain socket path
+my $HTTPUNIXPATH;        # HTTP server Unix domain socket path
 
 my $srcdir = $ENV{'srcdir'} || '.';
 my $CURL="../src/curl".exe_ext(); # what curl executable to run on the tests
@@ -203,12 +203,12 @@ my $ssl_version;    # set if libcurl is built with SSL support
 my $large_file;     # set if libcurl is built with large file support
 my $has_idn;        # set if libcurl is built with IDN support
 my $http_ipv6;      # set if HTTP server has IPv6 support
-my $http_unix;      # set if HTTP server has UNIX sockets support
+my $http_unix;      # set if HTTP server has Unix sockets support
 my $ftp_ipv6;       # set if FTP server has IPv6 support
 my $tftp_ipv6;      # set if TFTP server has IPv6 support
 my $gopher_ipv6;    # set if Gopher server has IPv6 support
 my $has_ipv6;       # set if libcurl is built with IPv6 support
-my $has_unix;       # set if libcurl is built with UNIX sockets support
+my $has_unix;       # set if libcurl is built with Unix sockets support
 my $has_libz;       # set if libcurl is built with libz support
 my $has_getrlimit;  # set if system has getrlimit()
 my $has_ntlm;       # set if libcurl is built with NTLM support
@@ -317,7 +317,7 @@ my $USER = $ENV{USER};          # Linux
 if (!$USER) {
     $USER = $ENV{USERNAME};     # Windows
     if (!$USER) {
-        $USER = $ENV{LOGNAME};  # Some UNIX (I think)
+        $USER = $ENV{LOGNAME};  # Some Unix (I think)
     }
 }
 
@@ -726,7 +726,7 @@ sub verifyhttp {
     my $server = servername_id($proto, $ipvnum, $idnum);
     my $pid = 0;
     my $bonus="";
-    # $port_or_path contains a path for UNIX sockets, sws ignores the port
+    # $port_or_path contains a path for Unix sockets, sws ignores the port
     my $port = ($ipvnum eq "unix") ? 80 : $port_or_path;
 
     my $verifyout = "$LOGDIR/".
@@ -1215,7 +1215,7 @@ sub runhttpserver {
         $verbose_flag .= "1 ";
     }
     elsif($alt eq "unix") {
-        # IP (protocol) is mutually exclusive with UNIX sockets
+        # IP (protocol) is mutually exclusive with Unix sockets
         $ipvnum = "unix";
     }
 
@@ -2118,7 +2118,7 @@ sub responsive_http_server {
         $idnum = 2;
     }
     elsif($alt eq "unix") {
-        # IP (protocol) is mutually exclusive with UNIX sockets
+        # IP (protocol) is mutually exclusive with Unix sockets
         $ipvnum = "unix";
     }
 
@@ -2373,7 +2373,7 @@ sub checksystem {
 
             # Generate a "proto-ipv6" version of each protocol to match the
             # IPv6 <server> name and a "proto-unix" to match the variant which
-            # uses UNIX domain sockets. This works even if support isn't
+            # uses Unix domain sockets. This works even if support isn't
             # compiled in because the <features> test will fail.
             push @protocols, map(("$_-ipv6", "$_-unix"), @protocols);
 
@@ -2548,7 +2548,7 @@ sub checksystem {
     }
 
     if($has_unix) {
-        # client has UNIX sockets support, check whether the HTTP server has it
+        # client has Unix sockets support, check whether the HTTP server has it
         my @sws = `server/sws --version`;
         $http_unix = 1 if($sws[0] =~ /unix/);
     }
@@ -2584,7 +2584,7 @@ sub checksystem {
     logmsg sprintf("  track memory: %s\n", $has_memory_tracking?"ON ":"OFF");
     logmsg sprintf("* valgrind:     %8s", $valgrind?"ON ":"OFF");
     logmsg sprintf("  HTTP IPv6     %s\n", $http_ipv6?"ON ":"OFF");
-    logmsg sprintf("* HTTP UNIX     %s\n", $http_unix?"ON ":"OFF");
+    logmsg sprintf("* HTTP Unix     %s\n", $http_unix?"ON ":"OFF");
     logmsg sprintf("* FTP IPv6      %8s", $ftp_ipv6?"ON ":"OFF");
     logmsg sprintf("  Libtool lib:  %s\n", $libtool?"ON ":"OFF");
     logmsg sprintf("* Shared build:      %-3s", $has_shared);
@@ -2638,9 +2638,9 @@ sub checksystem {
     logmsg sprintf("*   HTTP-PIPE/%d \n", $HTTPPIPEPORT);
 
     if($has_unix) {
-        logmsg "* UNIX socket paths:\n";
+        logmsg "* Unix socket paths:\n";
         if($http_unix) {
-            logmsg sprintf("*   HTTP-UNIX:%s\n", $HTTPUNIXPATH);
+            logmsg sprintf("*   HTTP-Unix:%s\n", $HTTPUNIXPATH);
         }
     }
 
@@ -2692,7 +2692,7 @@ sub subVariables {
   $$thing =~ s/%TFTP6PORT/$TFTP6PORT/g;
   $$thing =~ s/%TFTPPORT/$TFTPPORT/g;
 
-  # server UNIX domain socket paths
+  # server Unix domain socket paths
 
   $$thing =~ s/%HTTPUNIXPATH/$HTTPUNIXPATH/g;
 
@@ -4962,7 +4962,7 @@ $HTTPTLSPORT     = $base++; # HTTP TLS (non-stunnel) server port
 $HTTPTLS6PORT    = $base++; # HTTP TLS (non-stunnel) IPv6 server port
 $HTTPPROXYPORT   = $base++; # HTTP proxy port, when using CONNECT
 $HTTPPIPEPORT    = $base++; # HTTP pipelining port
-$HTTPUNIXPATH    = 'http.sock'; # HTTP server UNIX domain socket path
+$HTTPUNIXPATH    = 'http.sock'; # HTTP server Unix domain socket path
 
 #######################################################################
 # clear and create logging directory:

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 24bfdebe9c16381093ebf5e84d1c1a68a28bf185..8cd30c5a5274bf201afc468231689a532c99b772 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -1368,7 +1368,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
 #endif /* ENABLE_IPV6 */
 #ifdef USE_UNIX_SOCKETS
   case AF_UNIX:
-    logmsg("Proxying through UNIX socket is not (yet?) supported.");
+    logmsg("Proxying through Unix socket is not (yet?) supported.");
     return CURL_SOCKET_BAD;
 #endif /* USE_UNIX_SOCKETS */
   }
@@ -2163,7 +2163,7 @@ int main(int argc, char *argv[])
         goto sws_cleanup;
       }
       /* socket server is not alive, now check if it was actually a socket.
-       * Systems which have UNIX sockets will also have lstat */
+       * Systems which have Unix sockets will also have lstat */
       rc = lstat(unix_socket, &statbuf);
       if (0 != rc) {
         logmsg("Error binding socket, failed to stat %s: (%d) %s",
@@ -2208,7 +2208,7 @@ int main(int argc, char *argv[])
   }
 
 #ifdef USE_UNIX_SOCKETS
-  /* listen succeeds, so let's assume a valid listening UNIX socket */
+  /* listen succeeds, so let's assume a valid listening Unix socket */
   unlink_socket = true;
 #endif
 

diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 745efad3a615c69bba02612831c245d7ae243d18..25557932f388aefddcaff7ae56ef55d786c4babd 100644 (file)
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -1371,7 +1371,7 @@ abort:
 
 /*
  * Send a nak packet (error message).  Error code passed in is one of the
- * standard TFTP codes, or a UNIX errno offset by 100.
+ * standard TFTP codes, or a Unix errno offset by 100.
  */
 static void nak(int error)
 {