1 files changed, 69 insertions, 48 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 229fdfe8..e3db84f8 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -102,7 +102,8 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   if (S_ISDIR (buf.st_mode))
     {
       fn =
-        GNUNET_malloc (strlen (list->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
+        GNUNET_malloc (strlen (list->filename) +
+                       strlen (GNUNET_DIRECTORY_EXT) + 1);
       strcpy (fn, list->filename);
       if (fn[strlen (fn) - 1] == '/')
         fn[strlen (fn) - 1] = '\0';
@@ -134,14 +135,17 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
   if ((data == MAP_FAILED) || (data == NULL))
     {
-      GNUNET_GELOG_STRERROR_FILE (ectx, GNUNET_GEERROR | GNUNET_GEADMIN | GNUNET_GEBULK, "mmap", f);
+      GNUNET_GELOG_STRERROR_FILE (ectx,
+                                  GNUNET_GEERROR | GNUNET_GEADMIN |
+                                  GNUNET_GEBULK, "mmap", f);
       CLOSE (fd);
       GNUNET_free_non_null (fn);
       return;
     }
   GNUNET_free_non_null (fn);
   meta = NULL;
-  GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta, &addFilesToDirectory, list);
+  GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta,
+                                       &addFilesToDirectory, list);
   MUNMAP (data, size);
   CLOSE (fd);
   if (meta != NULL)
@@ -242,9 +246,9 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
              solution is to #ifndef it */
 #ifndef MINGW
           GNUNET_GEBREAK (ectx,
-                    gtk_tree_row_reference_get_model (dl_parent->
-                                                      searchViewRowReference)
-                    == model);
+                          gtk_tree_row_reference_get_model (dl_parent->
+                                                            searchViewRowReference)
+                          == model);
 #endif
           path =
             gtk_tree_row_reference_get_path (dl_parent->
@@ -284,8 +288,8 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
               gtk_tree_store_set (sl_parent->tree,
                                   &iter,
                                   SEARCH_CELL_BG_COLOR,
-                                  getColorCode (GNUNET_URITRACK_DOWNLOAD_STARTED),
-                                  -1);
+                                  getColorCode
+                                  (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
               break;
             }
           valid = gtk_tree_model_iter_next (model, &iter);
@@ -301,7 +305,8 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
   list->fsui_list = fsui_dl;
   list->total = total;
   list->is_directory = GNUNET_ECRS_meta_data_test_for_directory (fi->meta);
-  list->has_terminated = ((state != GNUNET_FSUI_ACTIVE) && (state != GNUNET_FSUI_PENDING));
+  list->has_terminated = ((state != GNUNET_FSUI_ACTIVE)
+                          && (state != GNUNET_FSUI_PENDING));
   list->next = download_head;
   download_head = list;
   if ((list->is_directory == GNUNET_YES) && (completed != 0))
@@ -342,7 +347,8 @@ fs_download_update (DownloadList * list,
     {
       meta = NULL;
       GNUNET_ECRS_directory_list_contents (ectx,
-                          data, size, &meta, &addFilesToDirectory, list);
+                                           data, size, &meta,
+                                           &addFilesToDirectory, list);
       if (meta != NULL)
         GNUNET_ECRS_meta_data_destroy (meta);
     }
@@ -370,7 +376,8 @@ fs_download_completed (DownloadList * downloadContext)
       gtk_tree_store_set (downloadContext->searchList->tree,
                           &iter,
                           SEARCH_CELL_BG_COLOR,
-                          getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED), -1);
+                          getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
+                          -1);
     }
   downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
@@ -398,7 +405,8 @@ fs_download_aborted (DownloadList * downloadContext)
       gtk_tree_store_set (downloadContext->searchList->tree,
                           &iter,
                           SEARCH_CELL_BG_COLOR,
-                          getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED), -1);
+                          getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED),
+                          -1);
     }
   downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
@@ -532,15 +540,15 @@ init_download_helper (void *cls)
   SDC *sdc = cls;
 
   GNUNET_FSUI_download_start (ctx,
-                      sdc->anonymity,
-                      sdc->recursive,
-                      sdc->idc_uri,
-                      sdc->idc_meta,
-                      sdc->idc_final_download_destination,
-                      (sdc->searchContext !=
-                       NULL) ? sdc->searchContext->fsui_list : NULL,
-                      (sdc->parentContext !=
-                       NULL) ? sdc->parentContext->fsui_list : NULL);
+                              sdc->anonymity,
+                              sdc->recursive,
+                              sdc->idc_uri,
+                              sdc->idc_meta,
+                              sdc->idc_final_download_destination,
+                              (sdc->searchContext !=
+                               NULL) ? sdc->searchContext->fsui_list : NULL,
+                              (sdc->parentContext !=
+                               NULL) ? sdc->parentContext->fsui_list : NULL);
   return NULL;
 }
 
@@ -579,7 +587,8 @@ initiateDownload (GtkTreeModel * model,
                       SEARCH_INTERNAL, &sdc.searchContext,
                       SEARCH_INTERNAL_PARENT, &sdc.parentContext, -1);
   if ((sdc.idc_uri == NULL) ||
-      (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri) || GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
+      (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri)
+         || GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
     {
       GNUNET_GEBREAK (ectx, 0);
       GNUNET_free_non_null (idc_name);
@@ -612,25 +621,27 @@ initiateDownload (GtkTreeModel * model,
       char *filehash;
 
       GNUNET_GEASSERT (NULL,
-                 strlen (sdc.uri_name) >
-                 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX));
+                       strlen (sdc.uri_name) >
+                       strlen (GNUNET_ECRS_URI_PREFIX) +
+                       strlen (GNUNET_ECRS_FILE_INFIX));
       GNUNET_free_non_null (idc_name);
       filehash =
         GNUNET_strdup (&sdc.
-                uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
-                         strlen (GNUNET_ECRS_FILE_INFIX)]);
+                       uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+                                strlen (GNUNET_ECRS_FILE_INFIX)]);
       filehash[16] = 0;
       idc_name = GNUNET_strdup (filehash);
       GNUNET_free_non_null (filehash);
 #else
       GNUNET_GEASSERT (NULL,
-                 strlen (sdc.uri_name) >
-                 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX));
+                       strlen (sdc.uri_name) >
+                       strlen (GNUNET_ECRS_URI_PREFIX) +
+                       strlen (GNUNET_ECRS_FILE_INFIX));
       GNUNET_free_non_null (idc_name);
       idc_name =
         GNUNET_strdup (&sdc.
-                uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
-                         strlen (GNUNET_ECRS_FILE_INFIX)]);
+                       uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+                                strlen (GNUNET_ECRS_FILE_INFIX)]);
 #endif
     }
 
@@ -655,10 +666,10 @@ initiateDownload (GtkTreeModel * model,
   cname = NULL;
 
   GNUNET_GC_get_configuration_value_filename (cfg,
-                                       "FS",
-                                       "INCOMINGDIR",
-                                       "$HOME/gnunet-downloads/",
-                                       &final_download_dir);
+                                              "FS",
+                                              "INCOMINGDIR",
+                                              "$HOME/gnunet-downloads/",
+                                              &final_download_dir);
   if (strlen (dname) > 0)
     {
       tmp = GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
@@ -705,7 +716,7 @@ initiateDownload (GtkTreeModel * model,
   /* construct completed/directory/real-filename */
   sdc.idc_final_download_destination =
     GNUNET_malloc (strlen (final_download_dir) + 2 + strlen (idc_name) +
-            strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
+                   strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
   strcpy (sdc.idc_final_download_destination, final_download_dir);
   if (sdc.
       idc_final_download_destination[strlen
@@ -725,7 +736,8 @@ initiateDownload (GtkTreeModel * model,
     }
   else
     {
-      GNUNET_GTK_add_log_entry (_("ERROR: already downloading `%s'"), idc_name);
+      GNUNET_GTK_add_log_entry (_("ERROR: already downloading `%s'"),
+                                idc_name);
     }
   GNUNET_free (sdc.uri_name);
   GNUNET_free (dirPath);
@@ -746,7 +758,8 @@ on_downloadButton_clicked_fs (GtkWidget * treeview,
   GtkTreeSelection *selection;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &initiateDownload, NULL);
+  GNUNET_GTK_tree_selection_selected_foreach (selection, &initiateDownload,
+                                              NULL);
 }
 
 
@@ -782,7 +795,7 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   if (GNUNET_ECRS_uri_test_ksk (sdc.idc_uri))
     {
       GNUNET_GTK_add_log_entry (_
-                   ("Please use the search function for keyword (KSK) URIs!"));
+                                ("Please use the search function for keyword (KSK) URIs!"));
       GNUNET_free (urid);
       GNUNET_ECRS_uri_destroy (sdc.idc_uri);
       return;
@@ -795,12 +808,13 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
       return;
     }
   GNUNET_GC_get_configuration_value_filename (cfg,
-                                       "FS",
-                                       "INCOMINGDIR",
-                                       "$HOME/gnunet-downloads/",
-                                       &final_download_dir);
+                                              "FS",
+                                              "INCOMINGDIR",
+                                              "$HOME/gnunet-downloads/",
+                                              &final_download_dir);
   GNUNET_disk_directory_create (ectx, final_download_dir);
-  dname = &uris[strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)];
+  dname =
+    &uris[strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)];
   sdc.idc_final_download_destination =
     GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
   strcpy (sdc.idc_final_download_destination, final_download_dir);
@@ -814,7 +828,9 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
 
   GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), uris);
   sdc.idc_meta = GNUNET_ECRS_meta_data_create ();
-  sdc.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (), "fsstatusAnonymitySpin");
+  sdc.anonymity =
+    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                        "fsstatusAnonymitySpin");
   sdc.recursive = GNUNET_NO;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
@@ -826,7 +842,8 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
 
 struct FCBC
 {
-  int (*method) (struct GNUNET_FSUI_Context * ctx, struct GNUNET_FSUI_DownloadList * list);
+  int (*method) (struct GNUNET_FSUI_Context * ctx,
+                 struct GNUNET_FSUI_DownloadList * list);
   struct GNUNET_FSUI_DownloadList *argument;
 };
 
@@ -862,7 +879,7 @@ on_clearCompletedDownloadsButton_clicked_fs (void *unused,
                                              GtkWidget * clearButton)
 {
   GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary),
-                          &clearCompletedDownloadCallback, NULL);
+                                 &clearCompletedDownloadCallback, NULL);
 }
 
 static void
@@ -886,7 +903,9 @@ on_abortDownloadButton_clicked_fs (void *unused, GtkWidget * abortButton)
   GtkTreeSelection *selection;
   GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList");
+  downloadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeDownloadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);
@@ -898,7 +917,9 @@ on_stopDownloadButton_clicked_fs (void *unused, GtkWidget * stopButton)
   GtkTreeSelection *selection;
   GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList");
+  downloadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeDownloadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);