uclient-fetch: define _GNU_SOURCE (used for asprintf)

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 7aa60ea..881b4ea 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <stdio.h>
 #include <dlfcn.h>
@@ -25,6 +26,7 @@
 #include <libubox/blobmsg.h>
 
 #include "uclient.h"
+#include "uclient-utils.h"
 
 #ifdef __APPLE__
 #define LIB_EXT "dylib"
@@ -39,49 +41,38 @@ static bool verify = true;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
+static int out_bytes;
+static char *username;
+static char *password;
+static char *auth_str;
 
 static int open_output_file(const char *path, bool create)
 {
-       const char *str;
        char *filename;
-       int len;
        int flags = O_WRONLY;
+       int ret;
 
        if (create)
-               flags |= O_CREAT;
+               flags |= O_CREAT | O_EXCL;
 
        if (output_file) {
                if (!strcmp(output_file, "-"))
                        return STDOUT_FILENO;
 
-               return open(output_file, flags, 0644);
-       }
-
-       /* Don't automatically overwrite files if the name is derived from the URL */
-       if (create)
-               flags |= O_EXCL;
-
-       len = strcspn(path, ";&");
-       while (len > 0 && path[len - 1] == '/')
-               len--;
+               if (!quiet)
+                       fprintf(stderr, "Writing to stdout\n");
 
-       for (str = path + len - 1; str >= path; str--) {
-               if (*str == '/')
-                       break;
+               unlink(output_file);
+               return open(output_file, flags, 0644);
        }
 
-       str++;
-       len -= str - path;
-
-       if (len > 0) {
-               filename = alloca(len + 1);
-               strncpy(filename, str, len);
-               filename[len] = 0;
-       } else {
-               filename = "index.html";
-       }
+       filename = uclient_get_url_filename(path, "index.html");
+       if (!quiet)
+               fprintf(stderr, "Writing to '%s'\n", filename);
+       ret = open(filename, flags, 0644);
+       free(filename);
 
-       return open(filename, flags, 0644);
+       return ret;
 }
 
 static void request_done(struct uclient *cl)
@@ -120,6 +111,8 @@ static void header_done_cb(struct uclient *cl)
                break;
 
        default:
+               if (!quiet)
+                       fprintf(stderr, "HTTP error %d\n", cl->status_code);
                request_done(cl);
                error_ret = 8;
                break;
@@ -139,6 +132,7 @@ static void read_data_cb(struct uclient *cl)
                if (!len)
                        return;
 
+               out_bytes += len;
                write(output_fd, buf, len);
        }
 }
@@ -152,11 +146,12 @@ static void msg_connecting(struct uclient *cl)
                return;
 
        uclient_get_addr(addr, &port, &cl->remote_addr);
-       fprintf(stderr, "Connecting to %s %s:%d\n", cl->url->host, addr, port);
+       fprintf(stderr, "Connecting to %s:%d\n", addr, port);
 }
 
 static void init_request(struct uclient *cl)
 {
+       out_bytes = 0;
        uclient_connect(cl);
        msg_connecting(cl);
        uclient_http_set_request_type(cl, "GET");
@@ -165,6 +160,13 @@ static void init_request(struct uclient *cl)
 
 static void eof_cb(struct uclient *cl)
 {
+       if (!cl->data_eof) {
+               if (!quiet)
+                       fprintf(stderr, "Connection reset prematurely\n");
+               error_ret = 4;
+       } else if (!quiet) {
+               fprintf(stderr, "Download completed (%d bytes)\n", out_bytes);
+       }
        request_done(cl);
 }
 
@@ -249,11 +251,15 @@ static int no_ssl(const char *progname)
 enum {
        L_NO_CHECK_CERTIFICATE,
        L_CA_CERTIFICATE,
+       L_USER,
+       L_PASSWORD,
 };
 
 static const struct option longopts[] = {
        [L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument },
        [L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
+       [L_USER] = { "user", required_argument },
+       [L_PASSWORD] = { "password", required_argument },
        {}
 };
 
@@ -277,6 +283,18 @@ int main(int argc, char **argv)
                                if (ssl_ctx)
                                        ssl_ops->context_add_ca_crt_file(ssl_ctx, optarg);
                                break;
+                       case L_USER:
+                               if (!strlen(optarg))
+                                       break;
+                               username = strdup(optarg);
+                               memset(optarg, '*', strlen(optarg));
+                               break;
+                       case L_PASSWORD:
+                               if (!strlen(optarg))
+                                       break;
+                               password = strdup(optarg);
+                               memset(optarg, '*', strlen(optarg));
+                               break;
                        default:
                                return usage(progname);
                        }
@@ -303,7 +321,17 @@ int main(int argc, char **argv)
 
        uloop_init();
 
-       cl = uclient_new(argv[0], NULL, &cb);
+       if (username) {
+               if (password)
+                       asprintf(&auth_str, "%s:%s", username, password);
+               else
+                       auth_str = username;
+       }
+
+       if (!quiet)
+               fprintf(stderr, "Downloading '%s'\n", argv[0]);
+
+       cl = uclient_new(argv[0], auth_str, &cb);
        if (!cl) {
                fprintf(stderr, "Failed to allocate uclient context\n");
                return 1;