uclient-fetch: add support for --timeout

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 914bdccdeb59c51e3c76a42e1d5eaf85eb9de8f9..7418f823122653d2295814cf03df8a754c20f5f6 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -36,11 +36,13 @@
 #endif
 
 static const char *user_agent = "uclient-fetch";
+static const char *post_data;
 static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
 static bool verify = true;
 static bool default_certs = false;
+static bool no_output;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
@@ -50,6 +52,7 @@ static char *password;
 static char *auth_str;
 static char **urls;
 static int n_urls;
+static int timeout;
 
 static void request_done(struct uclient *cl);
 
@@ -98,6 +101,8 @@ static void header_done_cb(struct uclient *cl)
        switch (cl->status_code) {
        case 204:
        case 200:
+               if (no_output)
+                       break;
                output_fd = open_output_file(cl->url->location, true);
                if (output_fd < 0) {
                        if (!quiet)
@@ -121,7 +126,7 @@ static void read_data_cb(struct uclient *cl)
        char buf[256];
        int len;
 
-       if (output_fd < 0)
+       if (!no_output && output_fd < 0)
                return;
 
        while (1) {
@@ -130,7 +135,8 @@ static void read_data_cb(struct uclient *cl)
                        return;
 
                out_bytes += len;
-               write(output_fd, buf, len);
+               if (!no_output)
+                       write(output_fd, buf, len);
        }
 }
 
@@ -153,19 +159,27 @@ static int init_request(struct uclient *cl)
        out_bytes = 0;
        uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
 
+       if (timeout)
+               cl->timeout_msecs = timeout * 1000;
+
        rc = uclient_connect(cl);
        if (rc)
                return rc;
 
        msg_connecting(cl);
 
-       rc = uclient_http_set_request_type(cl, "GET");
+       rc = uclient_http_set_request_type(cl, post_data ? "POST" : "GET");
        if (rc)
                return rc;
 
        uclient_http_reset_headers(cl);
        uclient_http_set_header(cl, "User-Agent", user_agent);
 
+       if (post_data) {
+               uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
+               uclient_write(cl, post_data, strlen(post_data));
+       }
+
        rc = uclient_request(cl);
        if (rc)
                return rc;
@@ -259,6 +273,9 @@ static int usage(const char *progname)
                "       --user=<user>                   HTTP authentication username\n"
                "       --password=<password>           HTTP authentication password\n"
                "       --user-agent|-U <str>           Set HTTP user agent\n"
+               "       --post-data=STRING              use the POST method; send STRING 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"
                "\n"
                "HTTPS options:\n"
                "       --ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -304,6 +321,9 @@ enum {
        L_USER,
        L_PASSWORD,
        L_USER_AGENT,
+       L_POST_DATA,
+       L_SPIDER,
+       L_TIMEOUT,
 };
 
 static const struct option longopts[] = {
@@ -312,6 +332,9 @@ static const struct option longopts[] = {
        [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_SPIDER] = { "spider", no_argument },
+       [L_TIMEOUT] = { "timeout", required_argument },
        {}
 };
 
@@ -328,7 +351,7 @@ int main(int argc, char **argv)
 
        init_ustream_ssl();
 
-       while ((ch = getopt_long(argc, argv, "qO:U:", longopts, &longopt_idx)) != -1) {
+       while ((ch = getopt_long(argc, argv, "O:qsU:", longopts, &longopt_idx)) != -1) {
                switch(ch) {
                case 0:
                        switch (longopt_idx) {
@@ -355,6 +378,15 @@ int main(int argc, char **argv)
                        case L_USER_AGENT:
                                user_agent = optarg;
                                break;
+                       case L_POST_DATA:
+                               post_data = optarg;
+                               break;
+                       case L_SPIDER:
+                               no_output = true;
+                               break;
+                       case L_TIMEOUT:
+                               timeout = atoi(optarg);
+                               break;
                        default:
                                return usage(progname);
                        }
@@ -368,6 +400,12 @@ int main(int argc, char **argv)
                case 'q':
                        quiet = true;
                        break;
+               case 's':
+                       no_output = true;
+                       break;
+               case 'T':
+                       timeout = atoi(optarg);
+                       break;
                default:
                        return usage(progname);
                }
@@ -410,7 +448,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       if (ssl_ctx)
+       if (ssl_ctx && default_certs)
                init_ca_cert();
 
        rc = init_request(cl);