1 files changed, 16 insertions, 3 deletions

diff --git a/main.c b/main.c
index 16d1878..48c6617 100644
--- a/main.c
+++ b/main.c
@@ -1139,12 +1139,25 @@ end:
     return ret;
 }
 
+static const char *get_upload_dir(const struct http_post *const po)
+{
+    for (size_t i = 0; i < po->npairs; i++)
+    {
+        const struct http_post_pair *p = &po->pairs[i];
+
+        if (!strcmp(p->name, "dir"))
+            return p->value;
+    }
+
+    return NULL;
+}
+
 static int upload_files(const struct http_payload *const p,
     struct http_response *const r, const struct auth *const a)
 {
     const struct http_post *const po = &p->u.post;
     const char *const root = auth_dir(a), *const user = p->cookie.field,
-        *const dir = po->dir;
+        *const dir = get_upload_dir(po);
 
     if (!po->files)
     {
@@ -1181,9 +1194,9 @@ static int upload_files(const struct http_payload *const p,
         return page_bad_request(r);
     }
 
-    for (size_t i = 0; i < po->n; i++)
+    for (size_t i = 0; i < po->nfiles; i++)
     {
-        if (upload_file(&po->files[i], user, root, po->dir))
+        if (upload_file(&po->files[i], user, root, dir))
         {
             fprintf(stderr, "%s: upload_file failed\n", __func__);
             return -1;