#include <sys/socket.h>
#include <unistd.h>
#include <stdio.h>
-#include <dlfcn.h>
#include <getopt.h>
#include <fcntl.h>
#include <glob.h>
#include "uclient.h"
#include "uclient-utils.h"
-#ifdef __APPLE__
-#define LIB_EXT "dylib"
-#else
-#define LIB_EXT "so"
+#ifndef strdupa
+#define strdupa(x) strcpy(alloca(strlen(x)+1),x)
#endif
static const char *user_agent = "uclient-fetch";
"Options:\n"
" -4 Use IPv4 only\n"
" -6 Use IPv6 only\n"
- " -q Turn off status messages\n"
" -O <file> Redirect output to file (use \"-\" for stdout)\n"
" -P <dir> Set directory for output files\n"
+ " --quiet | -q Turn off status messages\n"
+ " --continue | -c Continue a partially-downloaded file\n"
" --user=<user> HTTP authentication username\n"
" --password=<password> HTTP authentication password\n"
- " --user-agent|-U <str> Set HTTP user agent\n"
+ " --user-agent | -U <str> Set HTTP user agent\n"
" --post-data=STRING use the POST method; send STRING as the data\n"
" --post-file=FILE use the POST method; send FILE as the data\n"
- " --spider|-s Spider mode - only check file existence\n"
- " --timeout=N|-T N Set connect/request timeout to N seconds\n"
- " --proxy=on|off|-Y on|off Enable/disable env var configured proxy\n"
+ " --spider | -s Spider mode - only check file existence\n"
+ " --timeout=N | -T N Set connect/request timeout to N seconds\n"
+ " --proxy=on | -Y on Enable interpretation of proxy env vars (default)\n"
+ " --proxy=off | -Y off |\n"
+ " --no-proxy Disable interpretation of proxy env vars\n"
"\n"
"HTTPS options:\n"
" --ca-certificate=<cert> Load CA certificates from file <cert>\n"
glob("/etc/ssl/certs/*.crt", 0, NULL, &gl);
for (i = 0; i < gl.gl_pathc; i++)
ssl_ops->context_add_ca_crt_file(ssl_ctx, gl.gl_pathv[i]);
-}
-
-static void init_ustream_ssl(void)
-{
- void *dlh;
-
- dlh = dlopen("libustream-ssl." LIB_EXT, RTLD_LAZY | RTLD_LOCAL);
- if (!dlh)
- return;
-
- ssl_ops = dlsym(dlh, "ustream_ssl_ops");
- if (!ssl_ops)
- return;
-
- ssl_ctx = ssl_ops->context_new(false);
+ globfree(&gl);
}
static int no_ssl(const char *progname)
int af = -1;
signal(SIGPIPE, SIG_IGN);
- init_ustream_ssl();
+ ssl_ctx = uclient_new_ssl_context(&ssl_ops);
while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) {
switch(ch) {
switch (longopt_idx) {
case L_NO_CHECK_CERTIFICATE:
verify = false;
+ if (ssl_ctx)
+ ssl_ops->context_set_require_validation(ssl_ctx, verify);
break;
case L_CA_CERTIFICATE:
has_cert = true;