curl: Modernize tiny test code used for build inside CMake

Drop unused code.  Report the error message on failure.
Format the source file using clang-format.
This commit is contained in:
Brad King 2018-11-01 08:35:48 -04:00
parent 2b3c1bb9b0
commit 03bf934fbe
3 changed files with 56 additions and 133 deletions

View File

@ -5,3 +5,4 @@ SetupForDevelopment.sh export-ignore
# Do not format third-party sources.
/KWIML/** -format.clang-format-6.0
/cm*/** -format.clang-format-6.0
/cmcurl/curltest.c format.clang-format-6.0

View File

@ -1285,11 +1285,11 @@ endif()
#-----------------------------------------------------------------------------
# CMake-specific curl code.
add_executable(LIBCURL curltest.c)
target_link_libraries(LIBCURL cmcurl)
add_executable(curltest curltest.c)
target_link_libraries(curltest cmcurl)
if(BUILD_TESTING AND CMAKE_CURL_TEST_URL)
add_test(curl LIBCURL ${CMAKE_CURL_TEST_URL})
add_test(curl curltest ${CMAKE_CURL_TEST_URL})
endif()
install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)

View File

@ -1,159 +1,81 @@
/* Prevent warnings on Visual Studio */
struct _RPC_ASYNC_STATE;
#include "curl/curl.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
int GetFtpFile(void)
int test_curl(const char* url)
{
int retVal = 0;
CURL *curl;
CURLcode res;
curl = curl_easy_init();
if(curl)
{
/* Get curl 7.9.2 from sunet.se's FTP site: */
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
curl_easy_setopt(curl, CURLOPT_HEADER, 1);
curl_easy_setopt(curl, CURLOPT_URL,
"ftp://public.kitware.com/pub/cmake/cygwin/setup.hint");
res = curl_easy_perform(curl);
if ( res != 0 )
{
printf("Error fetching: ftp://public.kitware.com/pub/cmake/cygwin/setup.hint\n");
retVal = 1;
}
/* always cleanup */
curl_easy_cleanup(curl);
}
else
{
printf("Cannot create curl object\n");
retVal = 1;
}
return retVal;
}
int GetWebFiles(char *url1, char *url2)
{
int retVal = 0;
CURL *curl;
CURLcode res;
CURL* curl;
CURLcode r;
char proxy[1024];
int proxy_type = 0;
if ( getenv("HTTP_PROXY") )
{
if (getenv("HTTP_PROXY")) {
proxy_type = 1;
if (getenv("HTTP_PROXY_PORT") )
{
if (getenv("HTTP_PROXY_PORT")) {
sprintf(proxy, "%s:%s", getenv("HTTP_PROXY"), getenv("HTTP_PROXY_PORT"));
}
else
{
} else {
sprintf(proxy, "%s", getenv("HTTP_PROXY"));
}
if ( getenv("HTTP_PROXY_TYPE") )
{
}
if (getenv("HTTP_PROXY_TYPE")) {
/* HTTP/SOCKS4/SOCKS5 */
if ( strcmp(getenv("HTTP_PROXY_TYPE"), "HTTP") == 0 )
{
if (strcmp(getenv("HTTP_PROXY_TYPE"), "HTTP") == 0) {
proxy_type = 1;
}
else if ( strcmp(getenv("HTTP_PROXY_TYPE"), "SOCKS4") == 0 )
{
} else if (strcmp(getenv("HTTP_PROXY_TYPE"), "SOCKS4") == 0) {
proxy_type = 2;
}
else if ( strcmp(getenv("HTTP_PROXY_TYPE"), "SOCKS5") == 0 )
{
} else if (strcmp(getenv("HTTP_PROXY_TYPE"), "SOCKS5") == 0) {
proxy_type = 3;
}
}
}
}
curl = curl_easy_init();
if(curl)
{
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
curl_easy_setopt(curl, CURLOPT_HEADER, 1);
if (!curl) {
fprintf(stderr, "curl_easy_init failed\n");
return 1;
}
/* Using proxy */
if ( proxy_type > 0 )
{
curl_easy_setopt(curl, CURLOPT_PROXY, proxy);
switch (proxy_type)
{
case 2:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
break;
case 3:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
break;
default:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
}
}
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
curl_easy_setopt(curl, CURLOPT_HEADER, 1);
/* get the first document */
curl_easy_setopt(curl, CURLOPT_URL, url1);
res = curl_easy_perform(curl);
if ( res != 0 )
{
printf("Error fetching: %s\n", url1);
retVal = 1;
}
/* get another document from the same server using the same
connection */
/* avoid warnings about url2 since below block is commented out: */
(void) url2;
/*
curl_easy_setopt(curl, CURLOPT_URL, url2);
res = curl_easy_perform(curl);
if ( res != 0 )
{
printf("Error fetching: %s\n", url2);
retVal = 1;
}
*/
/* always cleanup */
curl_easy_cleanup(curl);
}
else
{
printf("Cannot create curl object\n");
retVal = 1;
if (proxy_type > 0) {
curl_easy_setopt(curl, CURLOPT_PROXY, proxy);
switch (proxy_type) {
case 2:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
break;
case 3:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
break;
default:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
}
}
return retVal;
curl_easy_setopt(curl, CURLOPT_URL, url);
r = curl_easy_perform(curl);
curl_easy_cleanup(curl);
if (r != CURLE_OK) {
fprintf(stderr, "error: fetching '%s' failed: %s\n", url,
curl_easy_strerror(r));
return 1;
}
return 0;
}
int main(int argc, char **argv)
int main(int argc, const char* argv[])
{
int retVal = 0;
int r;
curl_global_init(CURL_GLOBAL_DEFAULT);
if(argc>1)
{
retVal += GetWebFiles(argv[1], 0);
}
else
{
printf("error: first argument should be a url to download\n");
retVal = 1;
}
/* Do not check the output of FTP socks5 cannot handle FTP yet */
/* GetFtpFile(); */
/* do not test ftp right now because we don't enable that port */
if (argc == 2) {
r = test_curl(argv[1]);
} else {
fprintf(stderr, "error: no URL given as first argument\n");
r = 1;
}
curl_global_cleanup();
return retVal;
return r;
}