uclient-fetch: clean up output file selection

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index b65a9fdd7ffe9670eef56071f65b750ff93c1a33..da1126859b9521a36c231e070e9ad35b573fbc4c 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -35,11 +35,14 @@
 #define LIB_EXT "so"
 #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;
@@ -49,12 +52,13 @@ static char *password;
 static char *auth_str;
 static char **urls;
 static int n_urls;
+static int timeout;
 
 static void request_done(struct uclient *cl);
 
 static int open_output_file(const char *path, bool create)
 {
-       char *filename;
+       char *filename = NULL;
        int flags = O_WRONLY;
        int ret;
 
@@ -62,20 +66,20 @@ static int open_output_file(const char *path, bool create)
                flags |= O_CREAT | O_EXCL;
 
        if (output_file) {
-               if (!strcmp(output_file, "-"))
-                       return STDOUT_FILENO;
-
-               if (!quiet)
-                       fprintf(stderr, "Writing to stdout\n");
+               if (!strcmp(output_file, "-")) {
+                       if (!quiet)
+                               fprintf(stderr, "Writing to stdout\n");
 
-               unlink(output_file);
-               return open(output_file, flags, 0644);
+                       return STDOUT_FILENO;
+               }
+       } else {
+               filename = uclient_get_url_filename(path, "index.html");
+               output_file = filename;
        }
 
-       filename = uclient_get_url_filename(path, "index.html");
        if (!quiet)
-               fprintf(stderr, "Writing to '%s'\n", filename);
-       ret = open(filename, flags, 0644);
+               fprintf(stderr, "Writing to '%s'\n", output_file);
+       ret = open(output_file, flags, 0644);
        free(filename);
 
        return ret;
@@ -97,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)
@@ -120,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) {
@@ -129,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);
        }
 }
 
@@ -152,16 +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;
@@ -254,6 +272,10 @@ static int usage(const char *progname)
                "       -O <file>:                      Redirect output to file (use \"-\" for stdout)\n"
                "       --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"
@@ -298,6 +320,10 @@ enum {
        L_CA_CERTIFICATE,
        L_USER,
        L_PASSWORD,
+       L_USER_AGENT,
+       L_POST_DATA,
+       L_SPIDER,
+       L_TIMEOUT,
 };
 
 static const struct option longopts[] = {
@@ -305,6 +331,10 @@ static const struct option longopts[] = {
        [L_CA_CERTIFICATE] = { "ca-certificate", 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_SPIDER] = { "spider", no_argument },
+       [L_TIMEOUT] = { "timeout", required_argument },
        {}
 };
 
@@ -321,7 +351,7 @@ int main(int argc, char **argv)
 
        init_ustream_ssl();
 
-       while ((ch = getopt_long(argc, argv, "qO:", longopts, &longopt_idx)) != -1) {
+       while ((ch = getopt_long(argc, argv, "O:qsU:", longopts, &longopt_idx)) != -1) {
                switch(ch) {
                case 0:
                        switch (longopt_idx) {
@@ -345,16 +375,37 @@ int main(int argc, char **argv)
                                password = strdup(optarg);
                                memset(optarg, '*', strlen(optarg));
                                break;
+                       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);
                        }
                        break;
+               case 'U':
+                       user_agent = optarg;
+                       break;
                case 'O':
                        output_file = optarg;
                        break;
                case 'q':
                        quiet = true;
                        break;
+               case 's':
+                       no_output = true;
+                       break;
+               case 'T':
+                       timeout = atoi(optarg);
+                       break;
                default:
                        return usage(progname);
                }
@@ -397,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);