uclient: defer read notifications to uloop timer

[project/uclient.git] / uclient-fetch.c

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 5f7ac6200bb867690d91468433225820562ad8b3..359715c2db9bf87d0e286ced841bdf71b807acd8 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -21,7 +21,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <glob.h>
@@ -35,10 +34,8 @@
 #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";
@@ -233,6 +230,7 @@ static void header_done_cb(struct uclient *cl)
                        error_ret = 8;
                        break;
                }
+               /* fall through */
        case 204:
        case 200:
                if (no_output)
@@ -474,17 +472,20 @@ static int usage(const char *progname)
                "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"
@@ -502,21 +503,7 @@ static void init_ca_cert(void)
        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)
@@ -581,7 +568,7 @@ int main(int argc, char **argv)
        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) {
@@ -589,6 +576,8 @@ int main(int argc, char **argv)
                        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;
@@ -607,13 +596,13 @@ int main(int argc, char **argv)
                        case L_USER:
                                if (!strlen(optarg))
                                        break;
-                               username = strdup(optarg);
+                               username = strdupa(optarg);
                                memset(optarg, '*', strlen(optarg));
                                break;
                        case L_PASSWORD:
                                if (!strlen(optarg))
                                        break;
-                               password = strdup(optarg);
+                               password = strdupa(optarg);
                                memset(optarg, '*', strlen(optarg));
                                break;
                        case L_USER_AGENT: