fix

[oweals/gnunet.git] / src / fs / gnunet-unindex.c

diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index 9b335eec0102a38f56829dfa61adbb8093ebf722..bc7a2434b7e7c4b5acb7d42fc14ba27b9a3487eb 100644 (file)
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -38,6 +38,31 @@ static struct GNUNET_FS_Handle *ctx;
 
 static struct GNUNET_FS_UnindexContext *uc;
 
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+
+static void
+cleanup_task (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_FS_stop (ctx);
+  ctx = NULL;
+}
+
+
+static void
+shutdown_task (void *cls,
+             const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct GNUNET_FS_UnindexContext *u;
+
+  if (uc != NULL)
+    {
+      u = uc;
+      uc = NULL;
+      GNUNET_FS_unindex_stop (u);
+    }
+}
 
 /**
  * Called by FS client to give information about the progress of an 
@@ -56,31 +81,40 @@ static void *
 progress_cb (void *cls,
             const struct GNUNET_FS_ProgressInfo *info)
 {
+  char *s;
+
   switch (info->status)
     {
     case GNUNET_FS_STATUS_UNINDEX_START:
       break;
     case GNUNET_FS_STATUS_UNINDEX_PROGRESS:
       if (verbose)
-       fprintf (stdout,
-                _("Unindexing at %llu/%llu (%s remaining)\n"),
-                (unsigned long long) info->value.unindex.completed,
-                (unsigned long long) info->value.unindex.size,
-                GNUNET_STRINGS_relative_time_to_string(info->value.unindex.eta));
+       {
+         s = GNUNET_STRINGS_relative_time_to_string(info->value.unindex.eta);
+         fprintf (stdout,
+                  _("Unindexing at %llu/%llu (%s remaining)\n"),
+                  (unsigned long long) info->value.unindex.completed,
+                  (unsigned long long) info->value.unindex.size,
+                  s);
+         GNUNET_free (s);
+       }
       break;
     case GNUNET_FS_STATUS_UNINDEX_ERROR:
       fprintf (stderr,
               _("Error unindexing: %s.\n"),
               info->value.unindex.specifics.error.message);
-      GNUNET_FS_unindex_stop (uc);      
+      GNUNET_SCHEDULER_shutdown (sched);
       break;
     case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
       fprintf (stdout,
               _("Unindexing done.\n"));
-      GNUNET_FS_unindex_stop (uc);
+      GNUNET_SCHEDULER_shutdown (sched);
       break;
     case GNUNET_FS_STATUS_UNINDEX_STOPPED:
-      GNUNET_FS_stop (ctx);
+      GNUNET_SCHEDULER_add_continuation (sched,
+                                        &cleanup_task,
+                                        NULL,
+                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;      
     default:
       fprintf (stderr,
@@ -96,14 +130,14 @@ progress_cb (void *cls,
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
- * @param sched the scheduler to use
+ * @param s the scheduler to use
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
+ * @param c configuration
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
+     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
@@ -116,6 +150,7 @@ run (void *cls,
       ret = -1;
       return;
     }
+  sched = s;
   cfg = c;
   ctx = GNUNET_FS_start (sched,
                         cfg,
@@ -132,28 +167,23 @@ run (void *cls,
       ret = 1;
       return;
     }
-  uc = GNUNET_FS_unindex (ctx,
-                         args[0]);
+  uc = GNUNET_FS_unindex_start (ctx,
+                               args[0],
+                               NULL);
   if (NULL == uc)
     {
       fprintf (stderr,
               _("Could not start unindex operation.\n"));
       GNUNET_FS_stop (ctx);
+      return;
     }
+  GNUNET_SCHEDULER_add_delayed (sched,
+                               GNUNET_TIME_UNIT_FOREVER_REL,
+                               &shutdown_task,
+                               NULL);
 }
 
 
-/**
- * gnunet-unindex command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  {'V', "verbose", NULL,
-   gettext_noop ("be verbose (print progress information)"),
-   0, &GNUNET_GETOPT_set_one, &verbose},
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to unindex content.
  *
@@ -164,6 +194,12 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'V', "verbose", NULL,
+     gettext_noop ("be verbose (print progress information)"),
+     0, &GNUNET_GETOPT_set_one, &verbose},
+    GNUNET_GETOPT_OPTION_END
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,