fix

1 files changed, 36 insertions, 3 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 3a9c4e06..caa27695 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -119,7 +119,10 @@ static void initiateDownload(GtkTreeModel * model,
   GtkTreeIter iiter;
   GtkWidget * spin;
   const char * name;
+  const char * oname;
+  const char * cname;
   const char * mime;
+  char * dname;
   unsigned int anon;
   GtkTreePath *dirTreePath;
   char *dirPath;
@@ -174,21 +177,51 @@ static void initiateDownload(GtkTreeModel * model,
     return;
   }
 
-  if (name == NULL)
+  if (name == NULL) {
 #ifdef WINDOWS
-  {
     filehash = STRDUP(uri_name);
     filehash[16] = 0;
     name = filehash;
-  }
 #else
     name = uri_name;
 #endif
+  } 
+
+  cname = name;
+  oname = name;
+  dname = MALLOC(strlen(name)+1);
+  dname[0] = '\0';
+  while (*name != '\0') {
+    if ( (*name == DIR_SEPARATOR) &&
+         (name[1] != '\0') ) {
+      memcpy(dname, oname, name - oname);
+      dname[name - oname] = '\0';
+      cname = &name[1];
+    }
+    name++;
+  }
+  if (*cname == '\0') /* name ended in '/' - likely directory */
+    cname = oname;
+  name = cname;
 
   final_download_dir = getFileName("FS",
                                    "INCOMINGDIR",
                                    _("You must specify a directory in the configuration"
                                      " in section `%s' under `%s'."));
+  if (strlen(dname) > 0) {
+    char * tmp;
+    tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
+    strcpy(tmp, final_download_dir);
+    if (tmp[strlen(tmp)] != DIR_SEPARATOR)
+      strcat(tmp, DIR_SEPARATOR_STR);
+    if (dname[0] == DIR_SEPARATOR)
+      strcat(tmp, &dname[1]);
+    else
+      strcat(tmp, dname);
+    FREE(final_download_dir);
+    final_download_dir = tmp;
+  }
+  FREE(dname);
   mkdirp(final_download_dir);