1 files changed, 51 insertions, 46 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 9d8d446f..a853eb57 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -56,6 +56,10 @@ addFilesToDirectory(const ECRS_FileInfo * fi,
     return SYSERR;
   model = GTK_TREE_MODEL(list->searchList->tree);
   path = gtk_tree_row_reference_get_path(list->searchViewRowReference);
+  if (path == NULL) {
+    GE_BREAK(ectx, 0);
+    return SYSERR;
+  }
   gtk_tree_model_get_iter(model,
                           &iter,
                           path);
@@ -221,13 +225,18 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
       /* have parent, must be download from
          directory inside of search */
       path = gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
-      valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
-                                      &piter,
-                                      path);
-      if (valid == TRUE)
-        valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
-                                             &iter,
-                                             &piter);
+      if (path != NULL) {
+        valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(sl_parent->tree),
+                                        &piter,
+                                        path);
+        if (valid == TRUE)
+          valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(sl_parent->tree),
+                                               &iter,
+                                               &piter);
+      } else {
+        GE_BREAK(ectx, 0);
+        valid = FALSE;
+      }
     } else {
       /* must be top-level entry in search */
       valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(sl_parent->tree),
@@ -294,6 +303,10 @@ void fs_download_update(DownloadList * list,
   struct ECRS_MetaData * meta;
 
   path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
+  if (path == NULL) {
+    GE_BREAK(ectx, 0);
+    return;
+  }
   gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
                           &iter,
                           path);
@@ -351,14 +364,18 @@ void fs_download_stopped(DownloadList * list) {
   DownloadList * prev;
 
   path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
-  gtk_tree_row_reference_free(list->summaryViewRowReference);
-  list->summaryViewRowReference = NULL;
-  gtk_tree_store_remove(download_summary,
-                        &iter);
+  if (path == NULL) {
+    GE_BREAK(ectx, 0);
+  } else {
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
+                            &iter,
+                            path);
+    gtk_tree_path_free(path);
+    gtk_tree_row_reference_free(list->summaryViewRowReference);
+    list->summaryViewRowReference = NULL;
+    gtk_tree_store_remove(download_summary,
+                          &iter);
+  }
   if (list->searchViewRowReference != NULL) {
     gtk_tree_row_reference_free(list->searchViewRowReference);
     list->searchViewRowReference = NULL;
@@ -449,7 +466,6 @@ initiateDownload(GtkTreeModel * model,
   SearchList * searchContext;
   DownloadList * parentContext;
 
-  DEBUG_BEGIN();
   idc_uri = NULL;
   idc_meta = NULL;
   idc_name = NULL;
@@ -500,10 +516,18 @@ initiateDownload(GtkTreeModel * model,
   cname = idc_name;
   dname = STRDUP(idc_name);
   cname = &dname[strlen(dname)-1];
+  if (cname != dname)
+    cname--; /* ignore tailing '/' */
   while ( (cname != dname) &&
           (*cname != DIR_SEPARATOR) )
     cname--;
-  *cname = '\0';
+  if (*cname == DIR_SEPARATOR) {
+    *cname = '\0';
+    FREE(idc_name);
+    idc_name = STRDUP(cname + 1);
+  } else {
+    *cname = '\0';
+  }
   cname = NULL;
 
   GC_get_configuration_value_filename(cfg,
@@ -525,9 +549,6 @@ initiateDownload(GtkTreeModel * model,
   }
   FREE(dname);
   dname = NULL;
-  disk_directory_create(ectx, final_download_dir);
-
-
   /* If file is inside a directory, get the full path */
   dirTreePath = gtk_tree_path_copy(path);
   dirPath = MALLOC(1);
@@ -535,27 +556,26 @@ initiateDownload(GtkTreeModel * model,
   dirPathLen = 0;
   while (gtk_tree_path_get_depth(dirTreePath) > 1) {
     char * dirname;
-    char * new;
+    char * newPath;
 
     if (! gtk_tree_path_up(dirTreePath))
       break;
-
-    if (!gtk_tree_model_get_iter(model,
-                                 &iiter,
-                                 dirTreePath))
+    if (! gtk_tree_model_get_iter(model,
+                                  &iiter,
+                                  dirTreePath))
       break;
     gtk_tree_model_get(model,
                        &iiter,
                        SEARCH_NAME, &dirname,
                        -1);
     dirPathLen = strlen(dirPath) + strlen(dirname) + strlen(DIR_SEPARATOR_STR) + 1;
-    new = MALLOC(dirPathLen + 1);
-    strcpy(new, dirname);
-    if (new[strlen(new)-1] != DIR_SEPARATOR)
-      strcat(new, DIR_SEPARATOR_STR);
-    strcat(new, dirPath);
+    newPath = MALLOC(dirPathLen + 1);
+    strcpy(newPath, dirname);
+    if (newPath[strlen(newPath)-1] != DIR_SEPARATOR)
+      strcat(newPath, DIR_SEPARATOR_STR);
+    strcat(newPath, dirPath);
     FREE(dirPath);
-    dirPath = new;
+    dirPath = newPath;
     free(dirname);
   }
   gtk_tree_path_free(dirTreePath);
@@ -571,23 +591,8 @@ initiateDownload(GtkTreeModel * model,
            DIR_SEPARATOR_STR);
   strcat(idc_final_download_destination, 
          dirPath);
-  disk_directory_create(ectx,
-                        idc_final_download_destination);
   strcat(idc_final_download_destination, 
          idc_name);
-  if ( (idc_final_download_destination[strlen(idc_final_download_destination) - 1] == '/') ||
-       (idc_final_download_destination[strlen(idc_final_download_destination) - 1] == '\\') )
-    idc_final_download_destination[strlen(idc_final_download_destination) - 1] = '\0';
-  /* append ".gnd" if needed (== directory and .gnd not present) */
-  if ( (idc_mime != NULL) &&
-       (0 == strcmp(idc_mime, GNUNET_DIRECTORY_MIME)) &&
-       ( (strlen(idc_final_download_destination) < strlen(GNUNET_DIRECTORY_EXT)) ||
-         (0 != strcmp(&idc_final_download_destination[strlen(idc_final_download_destination)
-                                                      - strlen(GNUNET_DIRECTORY_EXT)],
-                      GNUNET_DIRECTORY_EXT)) ) )
-    strcat(idc_final_download_destination, 
-           GNUNET_DIRECTORY_EXT);
-
   /* FIXME: check that there is no pending download for idc_name! */
   if (OK == check_pending(idc_name,
                           NULL)) {