curl: Move sources back into upstream layout

Update our build files as needed to compensate.

131 files changed, 70 insertions, 70 deletions

diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h
index 43944a3..a3b049b 100644
--- a/Utilities/cm_curl.h
+++ b/Utilities/cm_curl.h
@@ -17,7 +17,7 @@
 #ifdef CMAKE_USE_SYSTEM_CURL
 # include <curl/curl.h>
 #else
-# include <cmcurl/curl/curl.h>
+# include <cmcurl/include/curl/curl.h>
 #endif
 
 #endif
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 97fd2ff..a48de2d 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -34,75 +34,75 @@ INCLUDE (CheckSymbolExists)
 INCLUDE (CheckTypeSize)
 
 SET(libCurl_SRCS
-  #  amigaos.c - does not build on AmigaOS
-  base64.c
-  connect.c
-  content_encoding.c
-  cookie.c
-  dict.c
-  easy.c
-  escape.c
-  file.c
-  formdata.c
-  ftp.c
-  getenv.c
-  getinfo.c
-  gtls.c
-  hash.c
-  hostares.c
-  hostasyn.c
-  hostip4.c
-  hostip6.c
-  hostip.c
-  hostsyn.c
-  hostthre.c
-  http.c
-  http_chunks.c
-  http_digest.c
-  http_negotiate.c
-  http_ntlm.c
-  if2ip.c
-  inet_ntop.c
-  inet_pton.c
-  krb4.c
-  ldap.c
-  llist.c
-  md5.c
-#  memdebug.c -not used
-  mprintf.c
-  multi.c
-  netrc.c
-  # nwlib.c - Not used
-  parsedate.c
-  progress.c
-  security.c
-  select.c
-  sendf.c
-  share.c
-  socks.c
-  speedcheck.c
-  splay.c
-  ssh.c
-  sslgen.c
-  ssluse.c
-  strdup.c
-  strequal.c
-  strerror.c
-  # strtok.c - specify later
-  # strtoofft.c - specify later
-  telnet.c
-  tftp.c
-  timeval.c
-  transfer.c
-  url.c
-  version.c
+  #  lib/amigaos.c - does not build on AmigaOS
+  lib/base64.c
+  lib/connect.c
+  lib/content_encoding.c
+  lib/cookie.c
+  lib/dict.c
+  lib/easy.c
+  lib/escape.c
+  lib/file.c
+  lib/formdata.c
+  lib/ftp.c
+  lib/getenv.c
+  lib/getinfo.c
+  lib/gtls.c
+  lib/hash.c
+  lib/hostares.c
+  lib/hostasyn.c
+  lib/hostip4.c
+  lib/hostip6.c
+  lib/hostip.c
+  lib/hostsyn.c
+  lib/hostthre.c
+  lib/http.c
+  lib/http_chunks.c
+  lib/http_digest.c
+  lib/http_negotiate.c
+  lib/http_ntlm.c
+  lib/if2ip.c
+  lib/inet_ntop.c
+  lib/inet_pton.c
+  lib/krb4.c
+  lib/ldap.c
+  lib/llist.c
+  lib/md5.c
+#  lib/memdebug.c -not used
+  lib/mprintf.c
+  lib/multi.c
+  lib/netrc.c
+  # lib/nwlib.c - Not used
+  lib/parsedate.c
+  lib/progress.c
+  lib/security.c
+  lib/select.c
+  lib/sendf.c
+  lib/share.c
+  lib/socks.c
+  lib/speedcheck.c
+  lib/splay.c
+  lib/ssh.c
+  lib/sslgen.c
+  lib/ssluse.c
+  lib/strdup.c
+  lib/strequal.c
+  lib/strerror.c
+  # lib/strtok.c - specify later
+  # lib/strtoofft.c - specify later
+  lib/telnet.c
+  lib/tftp.c
+  lib/timeval.c
+  lib/transfer.c
+  lib/url.c
+  lib/version.c
   )
 
 SET(CURL_DISABLE_LDAP 1)
 IF(NOT CURL_DISABLE_LDAP)
   SET(libCurl_SRCS
     ${libCurl_SRCS}
-    ldap.c
+    lib/ldap.c
     )
 ENDIF(NOT CURL_DISABLE_LDAP)
 
@@ -110,8 +110,8 @@ ENDIF(NOT CURL_DISABLE_LDAP)
 #OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
 IF(CURL_KRB4)
   SET(libCurl_SRCS ${libCurl_SRCS}
-    krb4.c
-    security.c
+    lib/krb4.c
+    lib/security.c
     )
 ENDIF(CURL_KRB4)
 
@@ -119,7 +119,7 @@ ENDIF(CURL_KRB4)
 MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
 IF(CURL_MALLOC_DEBUG)
   SET(libCurl_SRCS ${libCurl_SRCS}
-    memdebug.c
+    lib/memdebug.c
     )
 ENDIF(CURL_MALLOC_DEBUG)
 
@@ -169,7 +169,7 @@ ENDIF(NOT CURL_SPECIAL_LIBZ)
 
 # Include the local directories before any others so that we do not end up
 # including system curl's include directory first by mistake.
-INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
 
 OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF)
@@ -472,14 +472,14 @@ CHECK_SYMBOL_EXISTS(setrlimit      "${CURL_INCLUDES}" HAVE_SETRLIMIT)
 # only build compat strtok if we need to
 IF (NOT HAVE_STRTOK_R)
   SET(libCurl_SRCS ${libCurl_SRCS}
-    strtok.c
+    lib/strtok.c
     )
 ENDIF (NOT HAVE_STRTOK_R)
 
 # only build compat strtoofft if we need to
 IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
   SET(libCurl_SRCS ${libCurl_SRCS}
-    strtoofft.c
+    lib/strtoofft.c
     )
 ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
 
diff --git a/Utilities/cmcurl/ca-bundle.h b/Utilities/cmcurl/include/ca-bundle.h
index 12390bc..12390bc 100644
--- a/Utilities/cmcurl/ca-bundle.h
+++ b/Utilities/cmcurl/include/ca-bundle.h
diff --git a/Utilities/cmcurl/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h
index e586c4a..e586c4a 100644
--- a/Utilities/cmcurl/curl/curl.h
+++ b/Utilities/cmcurl/include/curl/curl.h
diff --git a/Utilities/cmcurl/curl/curlver.h b/Utilities/cmcurl/include/curl/curlver.h
index 9380022..9380022 100644
--- a/Utilities/cmcurl/curl/curlver.h
+++ b/Utilities/cmcurl/include/curl/curlver.h
diff --git a/Utilities/cmcurl/curl/easy.h b/Utilities/cmcurl/include/curl/easy.h
index 17de210..17de210 100644
--- a/Utilities/cmcurl/curl/easy.h
+++ b/Utilities/cmcurl/include/curl/easy.h
diff --git a/Utilities/cmcurl/curl/mprintf.h b/Utilities/cmcurl/include/curl/mprintf.h
index 5c52688..5c52688 100644
--- a/Utilities/cmcurl/curl/mprintf.h
+++ b/Utilities/cmcurl/include/curl/mprintf.h
diff --git a/Utilities/cmcurl/curl/multi.h b/Utilities/cmcurl/include/curl/multi.h
index 1b66747..1b66747 100644
--- a/Utilities/cmcurl/curl/multi.h
+++ b/Utilities/cmcurl/include/curl/multi.h
diff --git a/Utilities/cmcurl/curl/stdcheaders.h b/Utilities/cmcurl/include/curl/stdcheaders.h
index 11c1e2f..11c1e2f 100644
--- a/Utilities/cmcurl/curl/stdcheaders.h
+++ b/Utilities/cmcurl/include/curl/stdcheaders.h
diff --git a/Utilities/cmcurl/curl/types.h b/Utilities/cmcurl/include/curl/types.h
index d37d6ae..d37d6ae 100644
--- a/Utilities/cmcurl/curl/types.h
+++ b/Utilities/cmcurl/include/curl/types.h
diff --git a/Utilities/cmcurl/amigaos.c b/Utilities/cmcurl/lib/amigaos.c
index 7106f8d..7106f8d 100644
--- a/Utilities/cmcurl/amigaos.c
+++ b/Utilities/cmcurl/lib/amigaos.c
diff --git a/Utilities/cmcurl/amigaos.h b/Utilities/cmcurl/lib/amigaos.h
index e5786d4..e5786d4 100644
--- a/Utilities/cmcurl/amigaos.h
+++ b/Utilities/cmcurl/lib/amigaos.h
diff --git a/Utilities/cmcurl/arpa_telnet.h b/Utilities/cmcurl/lib/arpa_telnet.h
index e6a04dc..e6a04dc 100644
--- a/Utilities/cmcurl/arpa_telnet.h
+++ b/Utilities/cmcurl/lib/arpa_telnet.h
diff --git a/Utilities/cmcurl/base64.c b/Utilities/cmcurl/lib/base64.c
index aa03f83..aa03f83 100644
--- a/Utilities/cmcurl/base64.c
+++ b/Utilities/cmcurl/lib/base64.c
diff --git a/Utilities/cmcurl/base64.h b/Utilities/cmcurl/lib/base64.h
index 59742bc..59742bc 100644
--- a/Utilities/cmcurl/base64.h
+++ b/Utilities/cmcurl/lib/base64.h
diff --git a/Utilities/cmcurl/connect.c b/Utilities/cmcurl/lib/connect.c
index 2b38972..2b38972 100644
--- a/Utilities/cmcurl/connect.c
+++ b/Utilities/cmcurl/lib/connect.c
diff --git a/Utilities/cmcurl/connect.h b/Utilities/cmcurl/lib/connect.h
index 599572b..599572b 100644
--- a/Utilities/cmcurl/connect.h
+++ b/Utilities/cmcurl/lib/connect.h
diff --git a/Utilities/cmcurl/content_encoding.c b/Utilities/cmcurl/lib/content_encoding.c
index 97f8341..97f8341 100644
--- a/Utilities/cmcurl/content_encoding.c
+++ b/Utilities/cmcurl/lib/content_encoding.c
diff --git a/Utilities/cmcurl/content_encoding.h b/Utilities/cmcurl/lib/content_encoding.h
index b31669b..b31669b 100644
--- a/Utilities/cmcurl/content_encoding.h
+++ b/Utilities/cmcurl/lib/content_encoding.h
diff --git a/Utilities/cmcurl/cookie.c b/Utilities/cmcurl/lib/cookie.c
index d8ea241..d8ea241 100644
--- a/Utilities/cmcurl/cookie.c
+++ b/Utilities/cmcurl/lib/cookie.c
diff --git a/Utilities/cmcurl/cookie.h b/Utilities/cmcurl/lib/cookie.h
index 57c3acb..57c3acb 100644
--- a/Utilities/cmcurl/cookie.h
+++ b/Utilities/cmcurl/lib/cookie.h
diff --git a/Utilities/cmcurl/curlx.h b/Utilities/cmcurl/lib/curlx.h
index 26948d3..26948d3 100644
--- a/Utilities/cmcurl/curlx.h
+++ b/Utilities/cmcurl/lib/curlx.h
diff --git a/Utilities/cmcurl/dict.c b/Utilities/cmcurl/lib/dict.c
index d6443f4..d6443f4 100644
--- a/Utilities/cmcurl/dict.c
+++ b/Utilities/cmcurl/lib/dict.c
diff --git a/Utilities/cmcurl/dict.h b/Utilities/cmcurl/lib/dict.h
index d3da193..d3da193 100644
--- a/Utilities/cmcurl/dict.h
+++ b/Utilities/cmcurl/lib/dict.h
diff --git a/Utilities/cmcurl/easy.c b/Utilities/cmcurl/lib/easy.c
index 209d1c3..209d1c3 100644
--- a/Utilities/cmcurl/easy.c
+++ b/Utilities/cmcurl/lib/easy.c
diff --git a/Utilities/cmcurl/easyif.h b/Utilities/cmcurl/lib/easyif.h
index 4c0f7e7..4c0f7e7 100644
--- a/Utilities/cmcurl/easyif.h
+++ b/Utilities/cmcurl/lib/easyif.h
diff --git a/Utilities/cmcurl/escape.c b/Utilities/cmcurl/lib/escape.c
index 9552b0f..9552b0f 100644
--- a/Utilities/cmcurl/escape.c
+++ b/Utilities/cmcurl/lib/escape.c
diff --git a/Utilities/cmcurl/escape.h b/Utilities/cmcurl/lib/escape.h
index a0a0209..a0a0209 100644
--- a/Utilities/cmcurl/escape.h
+++ b/Utilities/cmcurl/lib/escape.h
diff --git a/Utilities/cmcurl/file.c b/Utilities/cmcurl/lib/file.c
index b247a77..b247a77 100644
--- a/Utilities/cmcurl/file.c
+++ b/Utilities/cmcurl/lib/file.c
diff --git a/Utilities/cmcurl/file.h b/Utilities/cmcurl/lib/file.h
index 20a1c4c..20a1c4c 100644
--- a/Utilities/cmcurl/file.h
+++ b/Utilities/cmcurl/lib/file.h
diff --git a/Utilities/cmcurl/formdata.c b/Utilities/cmcurl/lib/formdata.c
index f10c6c7..f10c6c7 100644
--- a/Utilities/cmcurl/formdata.c
+++ b/Utilities/cmcurl/lib/formdata.c
diff --git a/Utilities/cmcurl/formdata.h b/Utilities/cmcurl/lib/formdata.h
index 4ca0f3c..4ca0f3c 100644
--- a/Utilities/cmcurl/formdata.h
+++ b/Utilities/cmcurl/lib/formdata.h
diff --git a/Utilities/cmcurl/ftp.c b/Utilities/cmcurl/lib/ftp.c
index 3ccbc43..3ccbc43 100644
--- a/Utilities/cmcurl/ftp.c
+++ b/Utilities/cmcurl/lib/ftp.c
diff --git a/Utilities/cmcurl/ftp.h b/Utilities/cmcurl/lib/ftp.h
index b64e705..b64e705 100644
--- a/Utilities/cmcurl/ftp.h
+++ b/Utilities/cmcurl/lib/ftp.h
diff --git a/Utilities/cmcurl/getenv.c b/Utilities/cmcurl/lib/getenv.c
index 4f955f8..4f955f8 100644
--- a/Utilities/cmcurl/getenv.c
+++ b/Utilities/cmcurl/lib/getenv.c
diff --git a/Utilities/cmcurl/getinfo.c b/Utilities/cmcurl/lib/getinfo.c
index 5cf3bca..5cf3bca 100644
--- a/Utilities/cmcurl/getinfo.c
+++ b/Utilities/cmcurl/lib/getinfo.c
diff --git a/Utilities/cmcurl/getinfo.h b/Utilities/cmcurl/lib/getinfo.h
index 2fe1b5c..2fe1b5c 100644
--- a/Utilities/cmcurl/getinfo.h
+++ b/Utilities/cmcurl/lib/getinfo.h
diff --git a/Utilities/cmcurl/gtls.c b/Utilities/cmcurl/lib/gtls.c
index 250ecad..250ecad 100644
--- a/Utilities/cmcurl/gtls.c
+++ b/Utilities/cmcurl/lib/gtls.c
diff --git a/Utilities/cmcurl/gtls.h b/Utilities/cmcurl/lib/gtls.h
index bff3f86..bff3f86 100644
--- a/Utilities/cmcurl/gtls.h
+++ b/Utilities/cmcurl/lib/gtls.h
diff --git a/Utilities/cmcurl/hash.c b/Utilities/cmcurl/lib/hash.c
index e004627..e004627 100644
--- a/Utilities/cmcurl/hash.c
+++ b/Utilities/cmcurl/lib/hash.c
diff --git a/Utilities/cmcurl/hash.h b/Utilities/cmcurl/lib/hash.h
index ceebb52..ceebb52 100644
--- a/Utilities/cmcurl/hash.h
+++ b/Utilities/cmcurl/lib/hash.h
diff --git a/Utilities/cmcurl/hostares.c b/Utilities/cmcurl/lib/hostares.c
index 1db0f43..1db0f43 100644
--- a/Utilities/cmcurl/hostares.c
+++ b/Utilities/cmcurl/lib/hostares.c
diff --git a/Utilities/cmcurl/hostasyn.c b/Utilities/cmcurl/lib/hostasyn.c
index 3df1479..3df1479 100644
--- a/Utilities/cmcurl/hostasyn.c
+++ b/Utilities/cmcurl/lib/hostasyn.c
diff --git a/Utilities/cmcurl/hostip.c b/Utilities/cmcurl/lib/hostip.c
index 83f1564..83f1564 100644
--- a/Utilities/cmcurl/hostip.c
+++ b/Utilities/cmcurl/lib/hostip.c
diff --git a/Utilities/cmcurl/hostip.h b/Utilities/cmcurl/lib/hostip.h
index e6d63ca..e6d63ca 100644
--- a/Utilities/cmcurl/hostip.h
+++ b/Utilities/cmcurl/lib/hostip.h
diff --git a/Utilities/cmcurl/hostip4.c b/Utilities/cmcurl/lib/hostip4.c
index 877baa2..877baa2 100644
--- a/Utilities/cmcurl/hostip4.c
+++ b/Utilities/cmcurl/lib/hostip4.c
diff --git a/Utilities/cmcurl/hostip6.c b/Utilities/cmcurl/lib/hostip6.c
index c8bbdb5..c8bbdb5 100644
--- a/Utilities/cmcurl/hostip6.c
+++ b/Utilities/cmcurl/lib/hostip6.c
diff --git a/Utilities/cmcurl/hostsyn.c b/Utilities/cmcurl/lib/hostsyn.c
index 2f816b8..2f816b8 100644
--- a/Utilities/cmcurl/hostsyn.c
+++ b/Utilities/cmcurl/lib/hostsyn.c
diff --git a/Utilities/cmcurl/hostthre.c b/Utilities/cmcurl/lib/hostthre.c
index 12e31ea..12e31ea 100644
--- a/Utilities/cmcurl/hostthre.c
+++ b/Utilities/cmcurl/lib/hostthre.c
diff --git a/Utilities/cmcurl/http.c b/Utilities/cmcurl/lib/http.c
index 5405aac..5405aac 100644
--- a/Utilities/cmcurl/http.c
+++ b/Utilities/cmcurl/lib/http.c
diff --git a/Utilities/cmcurl/http.h b/Utilities/cmcurl/lib/http.h
index 0f4b58f..0f4b58f 100644
--- a/Utilities/cmcurl/http.h
+++ b/Utilities/cmcurl/lib/http.h
diff --git a/Utilities/cmcurl/http_chunks.c b/Utilities/cmcurl/lib/http_chunks.c
index 1b03a55..1b03a55 100644
--- a/Utilities/cmcurl/http_chunks.c
+++ b/Utilities/cmcurl/lib/http_chunks.c
diff --git a/Utilities/cmcurl/http_chunks.h b/Utilities/cmcurl/lib/http_chunks.h
index 211818a..211818a 100644
--- a/Utilities/cmcurl/http_chunks.h
+++ b/Utilities/cmcurl/lib/http_chunks.h
diff --git a/Utilities/cmcurl/http_digest.c b/Utilities/cmcurl/lib/http_digest.c
index c223784..c223784 100644
--- a/Utilities/cmcurl/http_digest.c
+++ b/Utilities/cmcurl/lib/http_digest.c
diff --git a/Utilities/cmcurl/http_digest.h b/Utilities/cmcurl/lib/http_digest.h
index 6cf0259..6cf0259 100644
--- a/Utilities/cmcurl/http_digest.h
+++ b/Utilities/cmcurl/lib/http_digest.h
diff --git a/Utilities/cmcurl/http_negotiate.c b/Utilities/cmcurl/lib/http_negotiate.c
index bdfeefa..bdfeefa 100644
--- a/Utilities/cmcurl/http_negotiate.c
+++ b/Utilities/cmcurl/lib/http_negotiate.c
diff --git a/Utilities/cmcurl/http_negotiate.h b/Utilities/cmcurl/lib/http_negotiate.h
index ce0d083..ce0d083 100644
--- a/Utilities/cmcurl/http_negotiate.h
+++ b/Utilities/cmcurl/lib/http_negotiate.h
diff --git a/Utilities/cmcurl/http_ntlm.c b/Utilities/cmcurl/lib/http_ntlm.c
index aff1bb1..aff1bb1 100644
--- a/Utilities/cmcurl/http_ntlm.c
+++ b/Utilities/cmcurl/lib/http_ntlm.c
diff --git a/Utilities/cmcurl/http_ntlm.h b/Utilities/cmcurl/lib/http_ntlm.h
index a8de220..a8de220 100644
--- a/Utilities/cmcurl/http_ntlm.h
+++ b/Utilities/cmcurl/lib/http_ntlm.h
diff --git a/Utilities/cmcurl/if2ip.c b/Utilities/cmcurl/lib/if2ip.c
index b4a98c6..b4a98c6 100644
--- a/Utilities/cmcurl/if2ip.c
+++ b/Utilities/cmcurl/lib/if2ip.c
diff --git a/Utilities/cmcurl/if2ip.h b/Utilities/cmcurl/lib/if2ip.h
index 4e86e2b..4e86e2b 100644
--- a/Utilities/cmcurl/if2ip.h
+++ b/Utilities/cmcurl/lib/if2ip.h
diff --git a/Utilities/cmcurl/inet_ntoa_r.h b/Utilities/cmcurl/lib/inet_ntoa_r.h
index c6c9bd8..c6c9bd8 100644
--- a/Utilities/cmcurl/inet_ntoa_r.h
+++ b/Utilities/cmcurl/lib/inet_ntoa_r.h
diff --git a/Utilities/cmcurl/inet_ntop.c b/Utilities/cmcurl/lib/inet_ntop.c
index 9381963..9381963 100644
--- a/Utilities/cmcurl/inet_ntop.c
+++ b/Utilities/cmcurl/lib/inet_ntop.c
diff --git a/Utilities/cmcurl/inet_ntop.h b/Utilities/cmcurl/lib/inet_ntop.h
index 54d64bd..54d64bd 100644
--- a/Utilities/cmcurl/inet_ntop.h
+++ b/Utilities/cmcurl/lib/inet_ntop.h
diff --git a/Utilities/cmcurl/inet_pton.c b/Utilities/cmcurl/lib/inet_pton.c
index 9b9f88b..9b9f88b 100644
--- a/Utilities/cmcurl/inet_pton.c
+++ b/Utilities/cmcurl/lib/inet_pton.c
diff --git a/Utilities/cmcurl/inet_pton.h b/Utilities/cmcurl/lib/inet_pton.h
index a659a97..a659a97 100644
--- a/Utilities/cmcurl/inet_pton.h
+++ b/Utilities/cmcurl/lib/inet_pton.h
diff --git a/Utilities/cmcurl/krb4.c b/Utilities/cmcurl/lib/krb4.c
index f2b91df..f2b91df 100644
--- a/Utilities/cmcurl/krb4.c
+++ b/Utilities/cmcurl/lib/krb4.c
diff --git a/Utilities/cmcurl/krb4.h b/Utilities/cmcurl/lib/krb4.h
index f46416e..f46416e 100644
--- a/Utilities/cmcurl/krb4.h
+++ b/Utilities/cmcurl/lib/krb4.h
diff --git a/Utilities/cmcurl/ldap.c b/Utilities/cmcurl/lib/ldap.c
index 3e1144d..3e1144d 100644
--- a/Utilities/cmcurl/ldap.c
+++ b/Utilities/cmcurl/lib/ldap.c
diff --git a/Utilities/cmcurl/ldap.h b/Utilities/cmcurl/lib/ldap.h
index b2d4f39..b2d4f39 100644
--- a/Utilities/cmcurl/ldap.h
+++ b/Utilities/cmcurl/lib/ldap.h
diff --git a/Utilities/cmcurl/llist.c b/Utilities/cmcurl/lib/llist.c
index 921d1d1..921d1d1 100644
--- a/Utilities/cmcurl/llist.c
+++ b/Utilities/cmcurl/lib/llist.c
diff --git a/Utilities/cmcurl/llist.h b/Utilities/cmcurl/lib/llist.h
index 5c7a8a0..5c7a8a0 100644
--- a/Utilities/cmcurl/llist.h
+++ b/Utilities/cmcurl/lib/llist.h
diff --git a/Utilities/cmcurl/md5.c b/Utilities/cmcurl/lib/md5.c
index 4cfb073..4cfb073 100644
--- a/Utilities/cmcurl/md5.c
+++ b/Utilities/cmcurl/lib/md5.c
diff --git a/Utilities/cmcurl/md5.h b/Utilities/cmcurl/lib/md5.h
index 63cc70e..63cc70e 100644
--- a/Utilities/cmcurl/md5.h
+++ b/Utilities/cmcurl/lib/md5.h
diff --git a/Utilities/cmcurl/memdebug.c b/Utilities/cmcurl/lib/memdebug.c
index a8cca44..a8cca44 100644
--- a/Utilities/cmcurl/memdebug.c
+++ b/Utilities/cmcurl/lib/memdebug.c
diff --git a/Utilities/cmcurl/memdebug.h b/Utilities/cmcurl/lib/memdebug.h
index a4ce7e5..a4ce7e5 100644
--- a/Utilities/cmcurl/memdebug.h
+++ b/Utilities/cmcurl/lib/memdebug.h
diff --git a/Utilities/cmcurl/memory.h b/Utilities/cmcurl/lib/memory.h
index 076d20a..076d20a 100644
--- a/Utilities/cmcurl/memory.h
+++ b/Utilities/cmcurl/lib/memory.h
diff --git a/Utilities/cmcurl/mprintf.c b/Utilities/cmcurl/lib/mprintf.c
index 8b2f3d0..8b2f3d0 100644
--- a/Utilities/cmcurl/mprintf.c
+++ b/Utilities/cmcurl/lib/mprintf.c
diff --git a/Utilities/cmcurl/multi.c b/Utilities/cmcurl/lib/multi.c
index 869d568..869d568 100644
--- a/Utilities/cmcurl/multi.c
+++ b/Utilities/cmcurl/lib/multi.c
diff --git a/Utilities/cmcurl/multiif.h b/Utilities/cmcurl/lib/multiif.h
index 800aa0f..800aa0f 100644
--- a/Utilities/cmcurl/multiif.h
+++ b/Utilities/cmcurl/lib/multiif.h
diff --git a/Utilities/cmcurl/netrc.c b/Utilities/cmcurl/lib/netrc.c
index 54d1759..54d1759 100644
--- a/Utilities/cmcurl/netrc.c
+++ b/Utilities/cmcurl/lib/netrc.c
diff --git a/Utilities/cmcurl/netrc.h b/Utilities/cmcurl/lib/netrc.h
index 939c552..939c552 100644
--- a/Utilities/cmcurl/netrc.h
+++ b/Utilities/cmcurl/lib/netrc.h
diff --git a/Utilities/cmcurl/nwlib.c b/Utilities/cmcurl/lib/nwlib.c
index b0eea56..b0eea56 100644
--- a/Utilities/cmcurl/nwlib.c
+++ b/Utilities/cmcurl/lib/nwlib.c
diff --git a/Utilities/cmcurl/parsedate.c b/Utilities/cmcurl/lib/parsedate.c
index ef91585..ef91585 100644
--- a/Utilities/cmcurl/parsedate.c
+++ b/Utilities/cmcurl/lib/parsedate.c
diff --git a/Utilities/cmcurl/parsedate.h b/Utilities/cmcurl/lib/parsedate.h
index b29fe9b..b29fe9b 100644
--- a/Utilities/cmcurl/parsedate.h
+++ b/Utilities/cmcurl/lib/parsedate.h
diff --git a/Utilities/cmcurl/progress.c b/Utilities/cmcurl/lib/progress.c
index 5ba829a..5ba829a 100644
--- a/Utilities/cmcurl/progress.c
+++ b/Utilities/cmcurl/lib/progress.c
diff --git a/Utilities/cmcurl/progress.h b/Utilities/cmcurl/lib/progress.h
index ad9d662..ad9d662 100644
--- a/Utilities/cmcurl/progress.h
+++ b/Utilities/cmcurl/lib/progress.h
diff --git a/Utilities/cmcurl/security.c b/Utilities/cmcurl/lib/security.c
index 4c9aed8..4c9aed8 100644
--- a/Utilities/cmcurl/security.c
+++ b/Utilities/cmcurl/lib/security.c
diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/lib/select.c
index 82f9dc2..82f9dc2 100644
--- a/Utilities/cmcurl/select.c
+++ b/Utilities/cmcurl/lib/select.c
diff --git a/Utilities/cmcurl/select.h b/Utilities/cmcurl/lib/select.h
index 7573b1f..7573b1f 100644
--- a/Utilities/cmcurl/select.h
+++ b/Utilities/cmcurl/lib/select.h
diff --git a/Utilities/cmcurl/sendf.c b/Utilities/cmcurl/lib/sendf.c
index 500bf66..500bf66 100644
--- a/Utilities/cmcurl/sendf.c
+++ b/Utilities/cmcurl/lib/sendf.c
diff --git a/Utilities/cmcurl/sendf.h b/Utilities/cmcurl/lib/sendf.h
index 7877df8..7877df8 100644
--- a/Utilities/cmcurl/sendf.h
+++ b/Utilities/cmcurl/lib/sendf.h
diff --git a/Utilities/cmcurl/setup.h b/Utilities/cmcurl/lib/setup.h
index 5ae881f..5ae881f 100644
--- a/Utilities/cmcurl/setup.h
+++ b/Utilities/cmcurl/lib/setup.h
diff --git a/Utilities/cmcurl/setup_once.h b/Utilities/cmcurl/lib/setup_once.h
index ee68641..ee68641 100644
--- a/Utilities/cmcurl/setup_once.h
+++ b/Utilities/cmcurl/lib/setup_once.h
diff --git a/Utilities/cmcurl/share.c b/Utilities/cmcurl/lib/share.c
index de13b60..de13b60 100644
--- a/Utilities/cmcurl/share.c
+++ b/Utilities/cmcurl/lib/share.c
diff --git a/Utilities/cmcurl/share.h b/Utilities/cmcurl/lib/share.h
index 5cfe8c7..5cfe8c7 100644
--- a/Utilities/cmcurl/share.h
+++ b/Utilities/cmcurl/lib/share.h
diff --git a/Utilities/cmcurl/sockaddr.h b/Utilities/cmcurl/lib/sockaddr.h
index 78dad4d..78dad4d 100644
--- a/Utilities/cmcurl/sockaddr.h
+++ b/Utilities/cmcurl/lib/sockaddr.h
diff --git a/Utilities/cmcurl/socks.c b/Utilities/cmcurl/lib/socks.c
index e0e947b..e0e947b 100644
--- a/Utilities/cmcurl/socks.c
+++ b/Utilities/cmcurl/lib/socks.c
diff --git a/Utilities/cmcurl/socks.h b/Utilities/cmcurl/lib/socks.h
index 0da9879..0da9879 100644
--- a/Utilities/cmcurl/socks.h
+++ b/Utilities/cmcurl/lib/socks.h
diff --git a/Utilities/cmcurl/speedcheck.c b/Utilities/cmcurl/lib/speedcheck.c
index adda8a9..adda8a9 100644
--- a/Utilities/cmcurl/speedcheck.c
+++ b/Utilities/cmcurl/lib/speedcheck.c
diff --git a/Utilities/cmcurl/speedcheck.h b/Utilities/cmcurl/lib/speedcheck.h
index 62475f6..62475f6 100644
--- a/Utilities/cmcurl/speedcheck.h
+++ b/Utilities/cmcurl/lib/speedcheck.h
diff --git a/Utilities/cmcurl/splay.c b/Utilities/cmcurl/lib/splay.c
index 9fb66c7..9fb66c7 100644
--- a/Utilities/cmcurl/splay.c
+++ b/Utilities/cmcurl/lib/splay.c
diff --git a/Utilities/cmcurl/splay.h b/Utilities/cmcurl/lib/splay.h
index 1674534..1674534 100644
--- a/Utilities/cmcurl/splay.h
+++ b/Utilities/cmcurl/lib/splay.h
diff --git a/Utilities/cmcurl/ssh.c b/Utilities/cmcurl/lib/ssh.c
index 24cba1b..24cba1b 100644
--- a/Utilities/cmcurl/ssh.c
+++ b/Utilities/cmcurl/lib/ssh.c
diff --git a/Utilities/cmcurl/ssh.h b/Utilities/cmcurl/lib/ssh.h
index d914490..d914490 100644
--- a/Utilities/cmcurl/ssh.h
+++ b/Utilities/cmcurl/lib/ssh.h
diff --git a/Utilities/cmcurl/sslgen.c b/Utilities/cmcurl/lib/sslgen.c
index f110a51..f110a51 100644
--- a/Utilities/cmcurl/sslgen.c
+++ b/Utilities/cmcurl/lib/sslgen.c
diff --git a/Utilities/cmcurl/sslgen.h b/Utilities/cmcurl/lib/sslgen.h
index c24d46b..c24d46b 100644
--- a/Utilities/cmcurl/sslgen.h
+++ b/Utilities/cmcurl/lib/sslgen.h
diff --git a/Utilities/cmcurl/ssluse.c b/Utilities/cmcurl/lib/ssluse.c
index 6709278..6709278 100644
--- a/Utilities/cmcurl/ssluse.c
+++ b/Utilities/cmcurl/lib/ssluse.c
diff --git a/Utilities/cmcurl/ssluse.h b/Utilities/cmcurl/lib/ssluse.h
index 5bb7090..5bb7090 100644
--- a/Utilities/cmcurl/ssluse.h
+++ b/Utilities/cmcurl/lib/ssluse.h
diff --git a/Utilities/cmcurl/strdup.c b/Utilities/cmcurl/lib/strdup.c
index e16e08a..e16e08a 100644
--- a/Utilities/cmcurl/strdup.c
+++ b/Utilities/cmcurl/lib/strdup.c
diff --git a/Utilities/cmcurl/strdup.h b/Utilities/cmcurl/lib/strdup.h
index 3206db3..3206db3 100644
--- a/Utilities/cmcurl/strdup.h
+++ b/Utilities/cmcurl/lib/strdup.h
diff --git a/Utilities/cmcurl/strequal.c b/Utilities/cmcurl/lib/strequal.c
index 83796f6..83796f6 100644
--- a/Utilities/cmcurl/strequal.c
+++ b/Utilities/cmcurl/lib/strequal.c
diff --git a/Utilities/cmcurl/strequal.h b/Utilities/cmcurl/lib/strequal.h
index 6718c3c0..6718c3c0 100644
--- a/Utilities/cmcurl/strequal.h
+++ b/Utilities/cmcurl/lib/strequal.h
diff --git a/Utilities/cmcurl/strerror.c b/Utilities/cmcurl/lib/strerror.c
index 74c3457..74c3457 100644
--- a/Utilities/cmcurl/strerror.c
+++ b/Utilities/cmcurl/lib/strerror.c
diff --git a/Utilities/cmcurl/strerror.h b/Utilities/cmcurl/lib/strerror.h
index b280504..b280504 100644
--- a/Utilities/cmcurl/strerror.h
+++ b/Utilities/cmcurl/lib/strerror.h
diff --git a/Utilities/cmcurl/strtok.c b/Utilities/cmcurl/lib/strtok.c
index 630e4e0..630e4e0 100644
--- a/Utilities/cmcurl/strtok.c
+++ b/Utilities/cmcurl/lib/strtok.c
diff --git a/Utilities/cmcurl/strtok.h b/Utilities/cmcurl/lib/strtok.h
index cf9fac8..cf9fac8 100644
--- a/Utilities/cmcurl/strtok.h
+++ b/Utilities/cmcurl/lib/strtok.h
diff --git a/Utilities/cmcurl/strtoofft.c b/Utilities/cmcurl/lib/strtoofft.c
index 3ab1bfd..3ab1bfd 100644
--- a/Utilities/cmcurl/strtoofft.c
+++ b/Utilities/cmcurl/lib/strtoofft.c
diff --git a/Utilities/cmcurl/strtoofft.h b/Utilities/cmcurl/lib/strtoofft.h
index e27b432..e27b432 100644
--- a/Utilities/cmcurl/strtoofft.h
+++ b/Utilities/cmcurl/lib/strtoofft.h
diff --git a/Utilities/cmcurl/telnet.c b/Utilities/cmcurl/lib/telnet.c
index 97d22b7..97d22b7 100644
--- a/Utilities/cmcurl/telnet.c
+++ b/Utilities/cmcurl/lib/telnet.c
diff --git a/Utilities/cmcurl/telnet.h b/Utilities/cmcurl/lib/telnet.h
index 693abf3..693abf3 100644
--- a/Utilities/cmcurl/telnet.h
+++ b/Utilities/cmcurl/lib/telnet.h
diff --git a/Utilities/cmcurl/tftp.c b/Utilities/cmcurl/lib/tftp.c
index 0e2e7ab..0e2e7ab 100644
--- a/Utilities/cmcurl/tftp.c
+++ b/Utilities/cmcurl/lib/tftp.c
diff --git a/Utilities/cmcurl/tftp.h b/Utilities/cmcurl/lib/tftp.h
index c712541..c712541 100644
--- a/Utilities/cmcurl/tftp.h
+++ b/Utilities/cmcurl/lib/tftp.h
diff --git a/Utilities/cmcurl/timeval.c b/Utilities/cmcurl/lib/timeval.c
index bb9c0a1..bb9c0a1 100644
--- a/Utilities/cmcurl/timeval.c
+++ b/Utilities/cmcurl/lib/timeval.c
diff --git a/Utilities/cmcurl/timeval.h b/Utilities/cmcurl/lib/timeval.h
index effd741..effd741 100644
--- a/Utilities/cmcurl/timeval.h
+++ b/Utilities/cmcurl/lib/timeval.h
diff --git a/Utilities/cmcurl/transfer.c b/Utilities/cmcurl/lib/transfer.c
index 5cb3361..5cb3361 100644
--- a/Utilities/cmcurl/transfer.c
+++ b/Utilities/cmcurl/lib/transfer.c
diff --git a/Utilities/cmcurl/transfer.h b/Utilities/cmcurl/lib/transfer.h
index 3c415cc..3c415cc 100644
--- a/Utilities/cmcurl/transfer.h
+++ b/Utilities/cmcurl/lib/transfer.h
diff --git a/Utilities/cmcurl/url.c b/Utilities/cmcurl/lib/url.c
index da12231..da12231 100644
--- a/Utilities/cmcurl/url.c
+++ b/Utilities/cmcurl/lib/url.c
diff --git a/Utilities/cmcurl/url.h b/Utilities/cmcurl/lib/url.h
index 446b3d9..446b3d9 100644
--- a/Utilities/cmcurl/url.h
+++ b/Utilities/cmcurl/lib/url.h
diff --git a/Utilities/cmcurl/urldata.h b/Utilities/cmcurl/lib/urldata.h
index 46d956d..46d956d 100644
--- a/Utilities/cmcurl/urldata.h
+++ b/Utilities/cmcurl/lib/urldata.h
diff --git a/Utilities/cmcurl/version.c b/Utilities/cmcurl/lib/version.c
index 9085f7d..9085f7d 100644
--- a/Utilities/cmcurl/version.c
+++ b/Utilities/cmcurl/lib/version.c