8 files changed, 12 insertions, 6 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 320612cf6..74a713dd8 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -716,7 +716,7 @@ TARGET_LINK_LIBRARIES(cmcurl ${CURL_LIBS})
 IF(CMAKE_BUILD_CURL_SHARED)
   SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
     RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
-  INSTALL_TARGETS(/bin cmcurl)
+  INSTALL(TARGETS cmcurl RUNTIME DESTINATION bin)
 ENDIF(CMAKE_BUILD_CURL_SHARED)
 
 OPTION(CURL_TESTING "Do libCurl testing" OFF)
@@ -731,4 +731,4 @@ IF(CMAKE_CURL_TEST_URL)
   ADD_TEST(curl LIBCURL ${CMAKE_CURL_TEST_URL})
 ENDIF(CMAKE_CURL_TEST_URL)
 
-INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
+INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)
diff --git a/Utilities/cmcurl/Testing/sepheaders.c b/Utilities/cmcurl/Testing/sepheaders.c
index 818578708..fc5b783bc 100644
--- a/Utilities/cmcurl/Testing/sepheaders.c
+++ b/Utilities/cmcurl/Testing/sepheaders.c
@@ -56,6 +56,7 @@ int main(int argc, char **argv)
   bodyfile = fopen(bodyfilename,"w");
   if (bodyfile == NULL) {
     curl_easy_cleanup(curl_handle);
+    fclose(headerfile);
     return -1;
   }
 
@@ -70,6 +71,7 @@ int main(int argc, char **argv)
 
   /* close the header file */
   fclose(headerfile);
+  fclose(bodyfile);
 
   /* cleanup curl stuff */
   curl_easy_cleanup(curl_handle);
diff --git a/Utilities/cmcurl/Testing/simplessl.c b/Utilities/cmcurl/Testing/simplessl.c
index 9a53603f4..e307eaa6f 100644
--- a/Utilities/cmcurl/Testing/simplessl.c
+++ b/Utilities/cmcurl/Testing/simplessl.c
@@ -114,5 +114,7 @@ int main(int argc, char **argv)
 
   curl_global_cleanup();
 
+  if (headerfile)
+    fclose(headerfile);
   return 0;
 }
diff --git a/Utilities/cmcurl/cookie.c b/Utilities/cmcurl/cookie.c
index 2856ad882..d8ea24196 100644
--- a/Utilities/cmcurl/cookie.c
+++ b/Utilities/cmcurl/cookie.c
@@ -969,6 +969,8 @@ int Curl_cookie_output(struct CookieInfo *c, char *dumphere)
       format_ptr = get_netscape_format(co);
       if (format_ptr == NULL) {
         fprintf(out, "#\n# Fatal libcurl error\n");
+        if(!use_stdout)
+          fclose(out);
         return 1;
       }
       fprintf(out, "%s\n", format_ptr);
diff --git a/Utilities/cmcurl/ftp.c b/Utilities/cmcurl/ftp.c
index 883988938..3ccbc4364 100644
--- a/Utilities/cmcurl/ftp.c
+++ b/Utilities/cmcurl/ftp.c
@@ -3683,7 +3683,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
       /* seek out the next path component */
       if (slash_pos-cur_pos) {
         /* we skip empty path components, like "x//y" since the FTP command
-           CWD requires a parameter and a non-existant parameter a) doesn't
+           CWD requires a parameter and a non-existent parameter a) doesn't
            work on many servers and b) has no effect on the others. */
         int len = (int)(slash_pos - cur_pos + absolute_dir);
         ftpc->dirs[ftpc->dirdepth] = curl_easy_unescape(conn->data,
diff --git a/Utilities/cmcurl/http.c b/Utilities/cmcurl/http.c
index c07053bdd..5405aace1 100644
--- a/Utilities/cmcurl/http.c
+++ b/Utilities/cmcurl/http.c
@@ -178,7 +178,7 @@ static bool pickoneauth(struct auth *pick)
   picked = TRUE;
 
   /* The order of these checks is highly relevant, as this will be the order
-     of preference in case of the existance of multiple accepted types. */
+     of preference in case of the existence of multiple accepted types. */
   if(avail & CURLAUTH_GSSNEGOTIATE)
     pick->picked = CURLAUTH_GSSNEGOTIATE;
   else if(avail & CURLAUTH_DIGEST)
diff --git a/Utilities/cmcurl/ssluse.c b/Utilities/cmcurl/ssluse.c
index 14d05ac65..6709278fa 100644
--- a/Utilities/cmcurl/ssluse.c
+++ b/Utilities/cmcurl/ssluse.c
@@ -442,7 +442,7 @@ int cert_stuff(struct connectdata *conn,
             failf(data, "no key set to load from crypto engine\n");
             return 0;
           }
-          /* the typecast below was added to please mingw32 */
+          /* the typecast below was added to please MinGW32 */
           priv_key = (EVP_PKEY *)
             ENGINE_load_private_key(conn->data->state.engine,key_file,
 #ifdef HAVE_ENGINE_LOAD_FOUR_ARGS
diff --git a/Utilities/cmcurl/urldata.h b/Utilities/cmcurl/urldata.h
index 9537ce36b..46d956d1a 100644
--- a/Utilities/cmcurl/urldata.h
+++ b/Utilities/cmcurl/urldata.h
@@ -621,7 +621,7 @@ typedef CURLcode (*Curl_done_func)(struct connectdata *, CURLcode, bool);
  * Store's request specific data in the easy handle (SessionHandle).
  * Previously, these members were on the connectdata struct but since
  * a conn struct may now be shared between different SessionHandles,
- * we store connection-specifc data here.
+ * we store connection-specific data here.
  *
  */
 struct HandleData {