1 files changed, 16 insertions, 1 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 7918168f..af4e32ed 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -119,6 +119,7 @@ static void initiateDownload(GtkTreeModel * model,
   GtkTreeIter iiter;
   GtkWidget * spin;
   const char * name;
+  const char * mime;
   struct stat sbuf;
   unsigned int anon;
   GtkTreePath *dirTreePath;
@@ -131,11 +132,13 @@ static void initiateDownload(GtkTreeModel * model,
   uri = NULL;
   meta = NULL;
   name = NULL;
+  mime = NULL;
   gtk_tree_model_get(model,
                      iter,
                      SEARCH_NAME, &name,
                      SEARCH_URI, &uri,
                      SEARCH_META, &meta,
+                     SEARCH_MIME, &mime,
                      -1);
   if (uri == NULL) {
     BREAK();
@@ -200,7 +203,7 @@ static void initiateDownload(GtkTreeModel * model,
 #endif
   mkdirp(fn);
   pfx = MALLOC(strlen(fn) + 2 +
-               strlen(name));
+               strlen(name) + 4); /* 4 = ".gnd" */
   lnk = MALLOC(strlen(fn) + 2 +
                strlen(filename));
   strcpy(pfx, fn);
@@ -217,6 +220,18 @@ static void initiateDownload(GtkTreeModel * model,
   strcat(lnk, 
          &filename[strlen(ECRS_URI_PREFIX) +
                    strlen(ECRS_FILE_INFIX)]);
+  
+  /* Append ".gnd" if needed */
+  if (mime && strcmp(mime, "application/gnunet-directory") == 0) {
+    int len = strlen(pfx);
+    if (len > 5 && strcmp(pfx + len - 5, ".gnd") != 0) {
+      char *end = pfx + len - 1;
+      if (*end == '/' || *end == '\\')
+        *end = 0;
+    }
+    strcat(pfx, ".gnd");
+  }
+                   
 #ifdef WINDOWS
   {
     /* Do not exceed MAX_PATH under Windows