From 23b1a0ab70f190dbbb33dabb18ec039c7d85d6b3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 11 Jan 2020 23:51:49 +0300 Subject: Add implementation --- curl/curl/.gitignore | 1 + curl/curl/buildfile | 59 +++++++ curl/curl/curl_config.h | 1 + curl/curl/curl_ctype.c | 1 + curl/curl/lib | 1 + curl/curl/nonblock.c | 1 + curl/curl/src | 1 + curl/curl/strtoofft.c | 1 + curl/curl/tool_hugehelp.c | 3 + curl/curl/tool_main.c | 379 ++++++++++++++++++++++++++++++++++++++++++++ curl/curl/tool_main.c.patch | 55 +++++++ curl/curl/warnless.c | 1 + 12 files changed, 504 insertions(+) create mode 100644 curl/curl/.gitignore create mode 100644 curl/curl/buildfile create mode 120000 curl/curl/curl_config.h create mode 120000 curl/curl/curl_ctype.c create mode 120000 curl/curl/lib create mode 120000 curl/curl/nonblock.c create mode 120000 curl/curl/src create mode 120000 curl/curl/strtoofft.c create mode 100644 curl/curl/tool_hugehelp.c create mode 100644 curl/curl/tool_main.c create mode 100644 curl/curl/tool_main.c.patch create mode 120000 curl/curl/warnless.c (limited to 'curl/curl') diff --git a/curl/curl/.gitignore b/curl/curl/.gitignore new file mode 100644 index 0000000..13368f8 --- /dev/null +++ b/curl/curl/.gitignore @@ -0,0 +1 @@ +curl diff --git a/curl/curl/buildfile b/curl/curl/buildfile new file mode 100644 index 0000000..f6c40c4 --- /dev/null +++ b/curl/curl/buildfile @@ -0,0 +1,59 @@ +# file : curl/buildfile +# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd +# license : cURL License; see accompanying COPYING file + +import libs = libcurl%lib{curl} +import libs += libca-certificates-curl%lib{ca-certificates-curl} + +exe{curl}: h{**} c{** -src/tool_main -lib/**} $libs + +tclass = $c.target.class +tsys = $c.target.system + +# Build options. +# +c.poptions += -DHAVE_CONFIG_H + +# Note that the upstream package uses the -pthread compiler/linker option on +# Linux and FreeBSD. The option is unsupported by build2 so we pass +# -D_REENTRANT and -lpthread preprocessor/linker options instead. +# +switch $tclass, $tsys +{ + case 'linux' | 'bsd' + c.poptions += -D_REENTRANT + + case 'windows', 'win32-msvc' + c.poptions += -DWIN32 +} + +c.poptions =+ "-I$src_base" "-I$src_base/src" "-I$src_base/lib" + +switch $c.class, $tsys +{ + case 'gcc' + { + # Disable the Clang targeting MSVC warnings. + # + if ($c.id == 'clang' && $tsys == 'win32-msvc') + c.coptions += -Wno-deprecated-declarations + } + case 'msvc' + { + # Disable warnings that pop up with /W3. + # + c.coptions += /wd4996 + } +} + +switch $tclass, $tsys +{ + case 'linux' | 'bsd' + c.libs += -lpthread + + case 'windows', 'mingw32' + c.libs+= -lws2_32 + + case 'windows' + c.libs += ws2_32.lib +} diff --git a/curl/curl/curl_config.h b/curl/curl/curl_config.h new file mode 120000 index 0000000..1277375 --- /dev/null +++ b/curl/curl/curl_config.h @@ -0,0 +1 @@ +../../libcurl/libcurl/curl_config.h \ No newline at end of file diff --git a/curl/curl/curl_ctype.c b/curl/curl/curl_ctype.c new file mode 120000 index 0000000..23515cd --- /dev/null +++ b/curl/curl/curl_ctype.c @@ -0,0 +1 @@ +lib/curl_ctype.c \ No newline at end of file diff --git a/curl/curl/lib b/curl/curl/lib new file mode 120000 index 0000000..d06277d --- /dev/null +++ b/curl/curl/lib @@ -0,0 +1 @@ +../../upstream/lib \ No newline at end of file diff --git a/curl/curl/nonblock.c b/curl/curl/nonblock.c new file mode 120000 index 0000000..d2f5ee7 --- /dev/null +++ b/curl/curl/nonblock.c @@ -0,0 +1 @@ +lib/nonblock.c \ No newline at end of file diff --git a/curl/curl/src b/curl/curl/src new file mode 120000 index 0000000..ff7dce8 --- /dev/null +++ b/curl/curl/src @@ -0,0 +1 @@ +../../upstream/src \ No newline at end of file diff --git a/curl/curl/strtoofft.c b/curl/curl/strtoofft.c new file mode 120000 index 0000000..bef727b --- /dev/null +++ b/curl/curl/strtoofft.c @@ -0,0 +1 @@ +lib/strtoofft.c \ No newline at end of file diff --git a/curl/curl/tool_hugehelp.c b/curl/curl/tool_hugehelp.c new file mode 100644 index 0000000..bc33e2f --- /dev/null +++ b/curl/curl/tool_hugehelp.c @@ -0,0 +1,3 @@ +/* built-in manual is disabled, blank function */ +#include "tool_hugehelp.h" +void hugehelp(void) {} diff --git a/curl/curl/tool_main.c b/curl/curl/tool_main.c new file mode 100644 index 0000000..0a86304 --- /dev/null +++ b/curl/curl/tool_main.c @@ -0,0 +1,379 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2019, 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 + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "tool_setup.h" + +#include + +#ifdef HAVE_SIGNAL_H +#include +#endif + +#ifdef USE_NSS +#include +#include +#endif + +#include /* setenv(), _putenv() */ + +#include + +#define ENABLE_CURLX_PRINTF +/* use our own printf() functions */ +#include "curlx.h" + +#include "tool_cfgable.h" +#include "tool_convert.h" +#include "tool_doswin.h" +#include "tool_msgs.h" +#include "tool_operate.h" +#include "tool_panykey.h" +#include "tool_vms.h" +#include "tool_main.h" +#include "tool_libinfo.h" + +/* + * This is low-level hard-hacking memory leak tracking and similar. Using + * the library level code from this client-side is ugly, but we do this + * anyway for convenience. + */ +#include "memdebug.h" /* keep this as LAST include */ + +#ifdef __VMS +/* + * vms_show is a global variable, used in main() as parameter for + * function vms_special_exit() to allow proper curl tool exiting. + * Its value may be set in other tool_*.c source files thanks to + * forward declaration present in tool_vms.h + */ +int vms_show = 0; +#endif + +#ifdef __MINGW32__ +/* + * There seems to be no way to escape "*" in command-line arguments with MinGW + * when command-line argument globbing is enabled under the MSYS shell, so turn + * it off. + */ +int _CRT_glob = 0; +#endif /* __MINGW32__ */ + +/* if we build a static library for unit tests, there is no main() function */ +#ifndef UNITTESTS + +/* + * Ensure that file descriptors 0, 1 and 2 (stdin, stdout, stderr) are + * open before starting to run. Otherwise, the first three network + * sockets opened by curl could be used for input sources, downloaded data + * or error logs as they will effectively be stdin, stdout and/or stderr. + */ +static void main_checkfds(void) +{ +#ifdef HAVE_PIPE + int fd[2] = { STDIN_FILENO, STDIN_FILENO }; + while(fd[0] == STDIN_FILENO || + fd[0] == STDOUT_FILENO || + fd[0] == STDERR_FILENO || + fd[1] == STDIN_FILENO || + fd[1] == STDOUT_FILENO || + fd[1] == STDERR_FILENO) + if(pipe(fd) < 0) + return; /* Out of handles. This isn't really a big problem now, but + will be when we try to create a socket later. */ + close(fd[0]); + close(fd[1]); +#endif +} + +#ifdef CURLDEBUG +static void memory_tracking_init(void) +{ + char *env; + /* if CURL_MEMDEBUG is set, this starts memory tracking message logging */ + env = curlx_getenv("CURL_MEMDEBUG"); + if(env) { + /* use the value as file name */ + char fname[CURL_MT_LOGFNAME_BUFSIZE]; + if(strlen(env) >= CURL_MT_LOGFNAME_BUFSIZE) + env[CURL_MT_LOGFNAME_BUFSIZE-1] = '\0'; + strcpy(fname, env); + curl_free(env); + curl_dbg_memdebug(fname); + /* this weird stuff here is to make curl_free() get called before + curl_gdb_memdebug() as otherwise memory tracking will log a free() + without an alloc! */ + } + /* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */ + env = curlx_getenv("CURL_MEMLIMIT"); + if(env) { + char *endptr; + long num = strtol(env, &endptr, 10); + if((endptr != env) && (endptr == env + strlen(env)) && (num > 0)) + curl_dbg_memlimit(num); + curl_free(env); + } +} +#else +# define memory_tracking_init() Curl_nop_stmt +#endif + +/* + * This is the main global constructor for the app. Call this before + * _any_ libcurl usage. If this fails, *NO* libcurl functions may be + * used, or havoc may be the result. + */ +static CURLcode main_init(struct GlobalConfig *config) +{ + /* Set the SSL_CERT_FILE environment variable to refer to the bundled CA + * certificates, unless it is already set, and switch to the OpenSSL + * backend. + */ + char* env = curlx_getenv ("SSL_CERT_FILE"); + + if (env == NULL) + { + int r; + +#ifndef _WIN32 + r = setenv ("SSL_CERT_FILE", ca_certificates_file (), 0 /* overwrite */); +#else + char* v = curl_maprintf ("SSL_CERT_FILE=%s", ca_certificates_file ()); + + if (v != NULL) + { + r = _putenv (v); + free (v); + } + else + r = -1; +#endif + + if (r == -1) + return CURLE_FAILED_INIT; + } + else + curl_free (env); + + if (curl_global_sslset (CURLSSLBACKEND_OPENSSL, + NULL /* name */, + NULL /* avail */) != CURLSSLSET_OK) + return CURLE_FAILED_INIT; + + CURLcode result = CURLE_OK; + +#if defined(__DJGPP__) || defined(__GO32__) + /* stop stat() wasting time */ + _djstat_flags |= _STAT_INODE | _STAT_EXEC_MAGIC | _STAT_DIRSIZE; +#endif + + /* Initialise the global config */ + config->showerror = -1; /* Will show errors */ + config->errors = stderr; /* Default errors to stderr */ + config->styled_output = TRUE; /* enable detection */ + config->parallel_max = PARALLEL_DEFAULT; + + /* Allocate the initial operate config */ + config->first = config->last = malloc(sizeof(struct OperationConfig)); + if(config->first) { + /* Perform the libcurl initialization */ + result = curl_global_init(CURL_GLOBAL_DEFAULT); + if(!result) { + /* Get information about libcurl */ + result = get_libcurl_info(); + + if(!result) { + /* Initialise the config */ + config_init(config->first); + config->first->global = config; + } + else { + helpf(stderr, "error retrieving curl library information\n"); + free(config->first); + } + } + else { + helpf(stderr, "error initializing curl library\n"); + free(config->first); + } + } + else { + helpf(stderr, "error initializing curl\n"); + result = CURLE_FAILED_INIT; + } + + return result; +} + +static void free_globalconfig(struct GlobalConfig *config) +{ + Curl_safefree(config->trace_dump); + + if(config->errors_fopened && config->errors) + fclose(config->errors); + config->errors = NULL; + + if(config->trace_fopened && config->trace_stream) + fclose(config->trace_stream); + config->trace_stream = NULL; + + Curl_safefree(config->libcurl); +} + +/* + * This is the main global destructor for the app. Call this after + * _all_ libcurl usage is done. + */ +static void main_free(struct GlobalConfig *config) +{ + /* Cleanup the easy handle */ + /* Main cleanup */ + curl_global_cleanup(); + convert_cleanup(); + metalink_cleanup(); +#ifdef USE_NSS + if(PR_Initialized()) { + /* prevent valgrind from reporting still reachable mem from NSRP arenas */ + PL_ArenaFinish(); + /* prevent valgrind from reporting possibly lost memory (fd cache, ...) */ + PR_Cleanup(); + } +#endif + free_globalconfig(config); + + /* Free the config structures */ + config_free(config->last); + config->first = NULL; + config->last = NULL; +} + +#ifdef WIN32 +/* TerminalSettings for Windows */ +static struct TerminalSettings { + HANDLE hStdOut; + DWORD dwOutputMode; +} TerminalSettings; + +static void configure_terminal(void) +{ + /* + * If we're running Windows, enable VT output. + * Note: VT mode flag can be set on any version of Windows, but VT + * processing only performed on Win10 >= Creators Update) + */ + + /* Define the VT flags in case we're building with an older SDK */ +#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING + #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 +#endif + + memset(&TerminalSettings, 0, sizeof(TerminalSettings)); + + /* Enable VT output */ + TerminalSettings.hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + if((TerminalSettings.hStdOut != INVALID_HANDLE_VALUE) + && (GetConsoleMode(TerminalSettings.hStdOut, + &TerminalSettings.dwOutputMode))) { + SetConsoleMode(TerminalSettings.hStdOut, + TerminalSettings.dwOutputMode + | ENABLE_VIRTUAL_TERMINAL_PROCESSING); + } +} +#else +#define configure_terminal() +#endif + +static void restore_terminal(void) +{ +#ifdef WIN32 + /* Restore Console output mode and codepage to whatever they were + * when Curl started */ + SetConsoleMode(TerminalSettings.hStdOut, TerminalSettings.dwOutputMode); +#endif +} + +/* +** curl tool main function. +*/ +int main(int argc, char *argv[]) +{ + CURLcode result = CURLE_OK; + struct GlobalConfig global; + memset(&global, 0, sizeof(global)); + + /* Perform any platform-specific terminal configuration */ + configure_terminal(); + + main_checkfds(); + +#if defined(HAVE_SIGNAL) && defined(SIGPIPE) + (void)signal(SIGPIPE, SIG_IGN); +#endif + + /* Initialize memory tracking */ + memory_tracking_init(); + + /* Initialize the curl library - do not call any libcurl functions before + this point */ + result = main_init(&global); + +#ifdef WIN32 + /* Undocumented diagnostic option to list the full paths of all loaded + modules, regardless of whether or not initialization succeeded. */ + if(argc == 2 && !strcmp(argv[1], "--dump-module-paths")) { + struct curl_slist *item, *head = GetLoadedModulePaths(); + for(item = head; item; item = item->next) { + printf("%s\n", item->data); + } + curl_slist_free_all(head); + if(!result) + main_free(&global); + } + else +#endif /* WIN32 */ + if(!result) { + /* Start our curl operation */ + result = operate(&global, argc, argv); + +#ifdef __SYMBIAN32__ + if(global.showerror) + tool_pressanykey(); +#endif + + /* Perform the main cleanup */ + main_free(&global); + } + + /* Return the terminal to its original state */ + restore_terminal(); + +#ifdef __NOVELL_LIBC__ + if(getenv("_IN_NETWARE_BASH_") == NULL) + tool_pressanykey(); +#endif + +#ifdef __VMS + vms_special_exit(result, vms_show); +#else + return (int)result; +#endif +} + +#endif /* ndef UNITTESTS */ diff --git a/curl/curl/tool_main.c.patch b/curl/curl/tool_main.c.patch new file mode 100644 index 0000000..cae1787 --- /dev/null +++ b/curl/curl/tool_main.c.patch @@ -0,0 +1,55 @@ +--- curl/src/tool_main.c 2020-01-18 23:47:34.559751631 +0300 ++++ curl/tool_main.c 2020-01-20 16:07:17.183814044 +0300 +@@ -32,6 +32,10 @@ + #include + #endif + ++#include /* setenv(), _putenv() */ ++ ++#include ++ + #define ENABLE_CURLX_PRINTF + /* use our own printf() functions */ + #include "curlx.h" +@@ -138,6 +142,41 @@ static void memory_tracking_init(void) + */ + static CURLcode main_init(struct GlobalConfig *config) + { ++ /* Set the SSL_CERT_FILE environment variable to refer to the bundled CA ++ * certificates, unless it is already set, and switch to the OpenSSL ++ * backend. ++ */ ++ char* env = curlx_getenv ("SSL_CERT_FILE"); ++ ++ if (env == NULL) ++ { ++ int r; ++ ++#ifndef _WIN32 ++ r = setenv ("SSL_CERT_FILE", ca_certificates_file (), 0 /* overwrite */); ++#else ++ char* v = curl_maprintf ("SSL_CERT_FILE=%s", ca_certificates_file ()); ++ ++ if (v != NULL) ++ { ++ r = _putenv (v); ++ free (v); ++ } ++ else ++ r = -1; ++#endif ++ ++ if (r == -1) ++ return CURLE_FAILED_INIT; ++ } ++ else ++ curl_free (env); ++ ++ if (curl_global_sslset (CURLSSLBACKEND_OPENSSL, ++ NULL /* name */, ++ NULL /* avail */) != CURLSSLSET_OK) ++ return CURLE_FAILED_INIT; ++ + CURLcode result = CURLE_OK; + + #if defined(__DJGPP__) || defined(__GO32__) diff --git a/curl/curl/warnless.c b/curl/curl/warnless.c new file mode 120000 index 0000000..2ac2b7f --- /dev/null +++ b/curl/curl/warnless.c @@ -0,0 +1 @@ +lib/warnless.c \ No newline at end of file -- cgit v1.1