1 files changed, 119 insertions, 150 deletions

diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index c4c8b2a46..8a3e2ed6a 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -68,32 +68,28 @@ static int local_only;
  * @param data actual meta-data found
  * @param data_size number of bytes in data
  * @return 0 to continue extracting, 1 to abort
- */ 
+ */
 static int
 item_printer (void *cls,
-              const char *plugin_name,
-              enum EXTRACTOR_MetaType type, 
-              enum EXTRACTOR_MetaFormat format,
-              const char *data_mime_type,
-              const char *data,
-              size_t data_size)
+              const char *plugin_name,
+              enum EXTRACTOR_MetaType type,
+              enum EXTRACTOR_MetaFormat format,
+              const char *data_mime_type, const char *data, size_t data_size)
 {
-  if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
-       (format != EXTRACTOR_METAFORMAT_C_STRING) )
+  if ((format != EXTRACTOR_METAFORMAT_UTF8) &&
+      (format != EXTRACTOR_METAFORMAT_C_STRING))
     return 0;
-  if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
+  if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME)
     return 0;
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
-                    EXTRACTOR_metatype_to_string (type)),
-          data);
+                    EXTRACTOR_metatype_to_string (type)), data);
   return 0;
 }
 
 
 static void
-clean_task (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   size_t dsize;
   void *ddata;
@@ -102,25 +98,23 @@ clean_task (void *cls,
   ctx = NULL;
   if (output_filename == NULL)
     return;
-  if (GNUNET_OK !=
-      GNUNET_FS_directory_builder_finish (db,
-                                          &dsize,       
-                                          &ddata))
-    {
-      GNUNET_break (0);
-      GNUNET_free (output_filename);    
-      return;
-    }
-  if (dsize != 
+  if (GNUNET_OK != GNUNET_FS_directory_builder_finish (db, &dsize, &ddata))
+  {
+    GNUNET_break (0);
+    GNUNET_free (output_filename);
+    return;
+  }
+  if (dsize !=
       GNUNET_DISK_fn_write (output_filename,
-                            ddata,
-                            dsize,
-                            GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE))
-    {
-      fprintf (stderr,
-               _("Failed to write directory with search results to `%s'\n"),
-               output_filename);
-    }
+                            ddata,
+                            dsize,
+                            GNUNET_DISK_PERM_USER_READ |
+                            GNUNET_DISK_PERM_USER_WRITE))
+  {
+    fprintf (stderr,
+             _("Failed to write directory with search results to `%s'\n"),
+             output_filename);
+  }
   GNUNET_free_non_null (ddata);
   GNUNET_free (output_filename);
 }
@@ -140,8 +134,7 @@ clean_task (void *cls,
  *         field in the GNUNET_FS_ProgressInfo struct.
  */
 static void *
-progress_cb (void *cls,
-             const struct GNUNET_FS_ProgressInfo *info)
+progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
 {
   static unsigned int cnt;
   char *uri;
@@ -149,78 +142,72 @@ progress_cb (void *cls,
   char *filename;
 
   switch (info->status)
+  {
+  case GNUNET_FS_STATUS_SEARCH_START:
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT:
+    if (db != NULL)
+      GNUNET_FS_directory_builder_add (db,
+                                       info->value.search.specifics.result.uri,
+                                       info->value.search.specifics.result.meta,
+                                       NULL);
+    uri = GNUNET_FS_uri_to_string (info->value.search.specifics.result.uri);
+    printf ("#%u:\n", cnt++);
+    filename =
+        GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.
+                                                specifics.result.meta,
+                                                EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
+    if (filename != NULL)
     {
-    case GNUNET_FS_STATUS_SEARCH_START:
-      break;
-    case GNUNET_FS_STATUS_SEARCH_RESULT:
-      if (db != NULL)
-        GNUNET_FS_directory_builder_add (db,
-                                         info->value.search.specifics.result.uri,
-                                         info->value.search.specifics.result.meta,
-                                         NULL);
-      uri = GNUNET_FS_uri_to_string (info->value.search.specifics.result.uri);
-      printf ("#%u:\n", cnt++);
-      filename =
-        GNUNET_CONTAINER_meta_data_get_by_type (info->value.search.specifics.result.meta,
-                                                EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
-      if (filename != NULL)
-        {
-          while (NULL != (dotdot = strstr (filename, "..")))
-            dotdot[0] = dotdot[1] = '_';
-          printf ("gnunet-download -o \"%s\" %s\n", 
-                  filename, 
-                  uri);
-        }
-      else
-        printf ("gnunet-download %s\n", uri);
-      if (verbose)
-        GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics.result.meta, 
-                                            &item_printer,
-                                            NULL);
-      printf ("\n"); 
-      fflush(stdout);
-      GNUNET_free_non_null (filename);
-      GNUNET_free (uri);
-      results++;
-      if ( (results_limit > 0) &&
-           (results >= results_limit) )
-        GNUNET_SCHEDULER_shutdown ();
-      break;
-    case GNUNET_FS_STATUS_SEARCH_UPDATE:
-      break;
-    case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
-      /* ignore */
-      break;
-    case GNUNET_FS_STATUS_SEARCH_ERROR:
-      fprintf (stderr,
-               _("Error searching: %s.\n"),
-               info->value.search.specifics.error.message);
-      GNUNET_SCHEDULER_shutdown ();
-      break;
-    case GNUNET_FS_STATUS_SEARCH_STOPPED: 
-      GNUNET_SCHEDULER_add_continuation (&clean_task,
-                                         NULL,
-                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      break;      
-    default:
-      fprintf (stderr,
-               _("Unexpected status: %d\n"),
-               info->status);
-      break;
+      while (NULL != (dotdot = strstr (filename, "..")))
+        dotdot[0] = dotdot[1] = '_';
+      printf ("gnunet-download -o \"%s\" %s\n", filename, uri);
     }
+    else
+      printf ("gnunet-download %s\n", uri);
+    if (verbose)
+      GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics.
+                                          result.meta, &item_printer, NULL);
+    printf ("\n");
+    fflush (stdout);
+    GNUNET_free_non_null (filename);
+    GNUNET_free (uri);
+    results++;
+    if ((results_limit > 0) && (results >= results_limit))
+      GNUNET_SCHEDULER_shutdown ();
+    break;
+  case GNUNET_FS_STATUS_SEARCH_UPDATE:
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+    /* ignore */
+    break;
+  case GNUNET_FS_STATUS_SEARCH_ERROR:
+    fprintf (stderr,
+             _("Error searching: %s.\n"),
+             info->value.search.specifics.error.message);
+    GNUNET_SCHEDULER_shutdown ();
+    break;
+  case GNUNET_FS_STATUS_SEARCH_STOPPED:
+    GNUNET_SCHEDULER_add_continuation (&clean_task,
+                                       NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  default:
+    fprintf (stderr, _("Unexpected status: %d\n"), info->status);
+    break;
+  }
   return NULL;
 }
 
 
 static void
-shutdown_task (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (sc != NULL)
-    {
-      GNUNET_FS_search_stop (sc); 
-      sc = NULL;
-    }
+  {
+    GNUNET_FS_search_stop (sc);
+    sc = NULL;
+  }
 }
 
 
@@ -235,8 +222,7 @@ shutdown_task (void *cls,
 static void
 run (void *cls,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
 {
   struct GNUNET_FS_Uri *uri;
   unsigned int argc;
@@ -246,63 +232,49 @@ run (void *cls,
   argc = 0;
   while (NULL != args[argc])
     argc++;
-  uri = GNUNET_FS_uri_ksk_create_from_args (argc,
-                                            (const char **) args);
+  uri = GNUNET_FS_uri_ksk_create_from_args (argc, (const char **) args);
   if (NULL == uri)
-    {
-      fprintf (stderr,
-               _("Could not create keyword URI from arguments.\n"));
-      ret = 1;
-      return;
-    }
+  {
+    fprintf (stderr, _("Could not create keyword URI from arguments.\n"));
+    ret = 1;
+    return;
+  }
   cfg = c;
   ctx = GNUNET_FS_start (cfg,
-                         "gnunet-search",
-                         &progress_cb,
-                         NULL,
-                         GNUNET_FS_FLAGS_NONE,
-                         GNUNET_FS_OPTIONS_END);
+                         "gnunet-search",
+                         &progress_cb,
+                         NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
   if (NULL == ctx)
-    {
-      fprintf (stderr,
-               _("Could not initialize `%s' subsystem.\n"),
-               "FS");
-      GNUNET_FS_uri_destroy (uri);
-      ret = 1;
-      return;
-    }
+  {
+    fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS");
+    GNUNET_FS_uri_destroy (uri);
+    ret = 1;
+    return;
+  }
   if (output_filename != NULL)
     db = GNUNET_FS_directory_builder_create (NULL);
   options = GNUNET_FS_SEARCH_OPTION_NONE;
   if (local_only)
     options |= GNUNET_FS_SEARCH_OPTION_LOOPBACK_ONLY;
-  sc = GNUNET_FS_search_start (ctx,
-                               uri,
-                               anonymity,
-                               options,
-                               NULL);
+  sc = GNUNET_FS_search_start (ctx, uri, anonymity, options, NULL);
   GNUNET_FS_uri_destroy (uri);
   if (NULL == sc)
-    {
-      fprintf (stderr,
-               _("Could not start searching.\n"));
-      GNUNET_FS_stop (ctx);
-      ret = 1;
-      return;
-    }
+  {
+    fprintf (stderr, _("Could not start searching.\n"));
+    GNUNET_FS_stop (ctx);
+    ret = 1;
+    return;
+  }
   if (timeout != 0)
-    {
-      delay.rel_value = timeout;
-      GNUNET_SCHEDULER_add_delayed (delay,
-                                    &shutdown_task,
-                                    NULL);  
-    }
+  {
+    delay.rel_value = timeout;
+    GNUNET_SCHEDULER_add_delayed (delay, &shutdown_task, NULL);
+  }
   else
-    {
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    &shutdown_task,
-                                    NULL);  
-    }
+  {
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                  &shutdown_task, NULL);
+  }
 }
 
 
@@ -324,12 +296,10 @@ main (int argc, char *const *argv)
      gettext_noop ("only search the local peer (no P2P network search)"),
      0, &GNUNET_GETOPT_set_one, &local_only},
     {'o', "output", "PREFIX",
-     gettext_noop
-     ("write search results to file starting with PREFIX"),
-     1, &GNUNET_GETOPT_set_string, &output_filename}, 
+     gettext_noop ("write search results to file starting with PREFIX"),
+     1, &GNUNET_GETOPT_set_string, &output_filename},
     {'t', "timeout", "VALUE",
-     gettext_noop
-     ("automatically terminate search after VALUE ms"),
+     gettext_noop ("automatically terminate search after VALUE ms"),
      1, &GNUNET_GETOPT_set_ulong, &timeout},
     {'V', "verbose", NULL,
      gettext_noop ("be verbose (print progress information)"),
@@ -339,7 +309,7 @@ main (int argc, char *const *argv)
      ("automatically terminate search after VALUE results are found"),
      1, &GNUNET_GETOPT_set_ulong, &results_limit},
     GNUNET_GETOPT_OPTION_END
-  }; 
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,
@@ -350,4 +320,3 @@ main (int argc, char *const *argv)
 }
 
 /* end of gnunet-search.c */
-