add uclient_get_url_filename helper function

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 7aa60ea..8dcb97b 100644 (file)
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -25,6 +25,7 @@
 #include <libubox/blobmsg.h>
 
 #include "uclient.h"
+#include "uclient-utils.h"
 
 #ifdef __APPLE__
 #define LIB_EXT "dylib"
@@ -42,10 +43,9 @@ static int error_ret;
 
 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;
@@ -61,27 +61,11 @@ static int open_output_file(const char *path, bool create)
        if (create)
                flags |= O_EXCL;
 
-       len = strcspn(path, ";&");
-       while (len > 0 && path[len - 1] == '/')
-               len--;
-
-       for (str = path + len - 1; str >= path; str--) {
-               if (*str == '/')
-                       break;
-       }
-
-       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");
+       ret = open(filename, flags, 0644);
+       free(filename);
 
-       return open(filename, flags, 0644);
+       return ret;
 }
 
 static void request_done(struct uclient *cl)
@@ -120,6 +104,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;