add strdupa macro for compatibility

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 061f0fd4f808f5708664cb52d683529bbe95bc04..1e51ff3e8e46cecdc98f3341e24ba09065baf193 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -41,6 +41,10 @@
 #define LIB_EXT "so"
 #endif
 
+#ifndef strdupa
+#define strdupa(x) strcpy(alloca(strlen(x)+1),x)
+#endif
+
 static const char *user_agent = "uclient-fetch";
 static const char *post_data;
 static const char *post_file;
@@ -233,6 +237,7 @@ static void header_done_cb(struct uclient *cl)
                        error_ret = 8;
                        break;
                }
+               /* fall through */
        case 204:
        case 200:
                if (no_output)
@@ -474,17 +479,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"
@@ -497,11 +505,12 @@ static int usage(const char *progname)
 static void init_ca_cert(void)
 {
        glob_t gl;
-       int i;
+       unsigned int i;
 
        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]);
+       globfree(&gl);
 }
 
 static void init_ustream_ssl(void)
@@ -548,20 +557,20 @@ enum {
 };
 
 static const struct option longopts[] = {
-       [L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument },
-       [L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
-       [L_CIPHERS] = { "ciphers", required_argument },
-       [L_USER] = { "user", required_argument },
-       [L_PASSWORD] = { "password", required_argument },
-       [L_USER_AGENT] = { "user-agent", required_argument },
-       [L_POST_DATA] = { "post-data", required_argument },
-       [L_POST_FILE] = { "post-file", required_argument },
-       [L_SPIDER] = { "spider", no_argument },
-       [L_TIMEOUT] = { "timeout", required_argument },
-       [L_CONTINUE] = { "continue", no_argument },
-       [L_PROXY] = { "proxy", required_argument },
-       [L_NO_PROXY] = { "no-proxy", no_argument },
-       [L_QUIET] = { "quiet", no_argument },
+       [L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument, NULL, 0 },
+       [L_CA_CERTIFICATE] = { "ca-certificate", required_argument, NULL, 0 },
+       [L_CIPHERS] = { "ciphers", required_argument, NULL, 0 },
+       [L_USER] = { "user", required_argument, NULL, 0 },
+       [L_PASSWORD] = { "password", required_argument, NULL, 0 },
+       [L_USER_AGENT] = { "user-agent", required_argument, NULL, 0 },
+       [L_POST_DATA] = { "post-data", required_argument, NULL, 0 },
+       [L_POST_FILE] = { "post-file", required_argument, NULL, 0 },
+       [L_SPIDER] = { "spider", no_argument, NULL, 0 },
+       [L_TIMEOUT] = { "timeout", required_argument, NULL, 0 },
+       [L_CONTINUE] = { "continue", no_argument, NULL, 0 },
+       [L_PROXY] = { "proxy", required_argument, NULL, 0 },
+       [L_NO_PROXY] = { "no-proxy", no_argument, NULL, 0 },
+       [L_QUIET] = { "quiet", no_argument, NULL, 0 },
        {}
 };
 
@@ -589,6 +598,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 +618,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: