1 files changed, 32 insertions, 7 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index e5e16ab0..eab6ed20 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -99,7 +99,10 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
   unsigned long long size;
   char * data;
   int fd;
+  char * fn;
   struct ECRS_MetaData * meta;
+  struct stat buf;
+  const char * f;
 
   if ( (list->is_directory != YES) ||
        (list->searchList == NULL) ||
@@ -107,18 +110,37 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
        (! gtk_tree_row_reference_valid(list->searchViewRowReference)) )
     return;
 
-  if (OK != disk_file_size(ectx,
-                           list->filename,
-                           &size,
-                           YES))
+  if (0 != stat(list->filename,
+                &buf)) 
     return;
-  if (size == 0)
+  if (S_ISDIR(buf.st_mode)) {
+    fn = MALLOC(strlen(list->filename) + strlen(GNUNET_DIRECTORY_EXT) + 1);
+    strcpy(fn, list->filename);
+    if (fn[strlen(fn)-1] == '/') 
+      fn[strlen(fn)-1] = '\0';
+    strcat(fn, GNUNET_DIRECTORY_EXT);   
+    if (0 != stat(list->filename,
+                  &buf)) {
+      FREE(fn);
+      return;
+    }
+    f = fn;
+  } else {
+    fn = NULL;
+    f = list->filename;
+  }
+  size = buf.st_size;
+  if (size == 0) {
+    FREENONNULL(fn);
     return;
+  }
   fd = disk_file_open(ectx,
                       list->filename,
                       O_RDONLY);
-  if (fd == -1)
+  if (fd == -1) {
+    FREENONNULL(fn);
     return;
+  }
   data = MMAP(NULL,
               size,
               PROT_READ,
@@ -130,10 +152,12 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
     GE_LOG_STRERROR_FILE(ectx,
                          GE_ERROR | GE_ADMIN | GE_BULK,
                          "mmap",
-                         list->filename);
+                         f);
     CLOSE(fd);
+    FREENONNULL(fn);
     return;
   }
+  FREENONNULL(fn);
   meta = NULL;
   ECRS_listDirectory(ectx,
                      data,
@@ -613,6 +637,7 @@ initiateDownload(GtkTreeModel * model,
                           NULL)) {
     addLogEntry(_("Downloading `%s'"),
                 idc_name);
+    /* FIXME! DEADLOCK! */
     FSUI_startDownload(ctx,
                        getSpinButtonValue(searchContext->searchXML,
                                           "downloadAnonymitySpinButton"),