X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-unindex.c;h=52a79524068c7722642db103146fa9789f38331d;hb=1b49510e7736620d7e10a33326076e2d75c86943;hp=bc7a2434b7e7c4b5acb7d42fc14ba27b9a3487eb;hpb=200aaa0dd6813f19eb7ed67a0fdc301d091fc2d7;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index bc7a2434b..52a795240 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c @@ -1,10 +1,10 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** * @file fs/gnunet-unindex.c @@ -38,12 +38,9 @@ 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) +cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_FS_stop (ctx); ctx = NULL; @@ -51,21 +48,20 @@ cleanup_task (void *cls, static void -shutdown_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +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); - } + { + u = uc; + uc = NULL; + GNUNET_FS_unindex_stop (u); + } } /** - * Called by FS client to give information about the progress of an + * Called by FS client to give information about the progress of an * operation. * * @param cls closure @@ -78,50 +74,39 @@ shutdown_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) { - char *s; + const char *s; switch (info->status) + { + case GNUNET_FS_STATUS_UNINDEX_START: + break; + case GNUNET_FS_STATUS_UNINDEX_PROGRESS: + if (verbose) { - case GNUNET_FS_STATUS_UNINDEX_START: - break; - case GNUNET_FS_STATUS_UNINDEX_PROGRESS: - if (verbose) - { - 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_SCHEDULER_shutdown (sched); - break; - case GNUNET_FS_STATUS_UNINDEX_COMPLETED: - fprintf (stdout, - _("Unindexing done.\n")); - GNUNET_SCHEDULER_shutdown (sched); - break; - case GNUNET_FS_STATUS_UNINDEX_STOPPED: - GNUNET_SCHEDULER_add_continuation (sched, - &cleanup_task, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); - break; - default: - fprintf (stderr, - _("Unexpected status: %d\n"), - info->status); - break; + s = GNUNET_STRINGS_relative_time_to_string (info->value.unindex.eta, GNUNET_YES); + FPRINTF (stdout, _("Unindexing at %llu/%llu (%s remaining)\n"), + (unsigned long long) info->value.unindex.completed, + (unsigned long long) info->value.unindex.size, s); } + break; + case GNUNET_FS_STATUS_UNINDEX_ERROR: + FPRINTF (stderr, _("Error unindexing: %s.\n"), + info->value.unindex.specifics.error.message); + GNUNET_SCHEDULER_shutdown (); + break; + case GNUNET_FS_STATUS_UNINDEX_COMPLETED: + FPRINTF (stdout, "%s", _("Unindexing done.\n")); + GNUNET_SCHEDULER_shutdown (); + break; + case GNUNET_FS_STATUS_UNINDEX_STOPPED: + GNUNET_SCHEDULER_add_now (&cleanup_task, NULL); + break; + default: + FPRINTF (stderr, _("Unexpected status: %d\n"), info->status); + break; + } return NULL; } @@ -130,57 +115,40 @@ progress_cb (void *cls, * Main function that will be run by the scheduler. * * @param cls closure - * @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 c configuration */ static void -run (void *cls, - struct GNUNET_SCHEDULER_Handle *s, - char *const *args, - const char *cfgfile, +run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { /* check arguments */ - if ( (args[0] == NULL) || (args[1] != NULL) ) - { - printf (_ - ("You must specify one and only one filename for unindexing.\n")); - ret = -1; - return; - } - sched = s; + if ((args[0] == NULL) || (args[1] != NULL)) + { + printf (_("You must specify one and only one filename for unindexing.\n")); + ret = -1; + return; + } cfg = c; - ctx = GNUNET_FS_start (sched, - cfg, - "gnunet-unindex", - &progress_cb, - NULL, - GNUNET_FS_FLAGS_NONE, - GNUNET_FS_OPTIONS_END); + ctx = + GNUNET_FS_start (cfg, "gnunet-unindex", &progress_cb, NULL, + GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); if (NULL == ctx) - { - fprintf (stderr, - _("Could not initialize `%s' subsystem.\n"), - "FS"); - ret = 1; - return; - } - uc = GNUNET_FS_unindex_start (ctx, - args[0], - NULL); + { + FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); + ret = 1; + return; + } + 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); + { + FPRINTF (stderr, "%s", _("Could not start unindex operation.\n")); + GNUNET_FS_stop (ctx); + return; + } + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, + NULL); } @@ -200,13 +168,17 @@ main (int argc, char *const *argv) 0, &GNUNET_GETOPT_set_one, &verbose}, GNUNET_GETOPT_OPTION_END }; - return (GNUNET_OK == - GNUNET_PROGRAM_run (argc, - argv, - "gnunet-unindex", - gettext_noop - ("Unindex files."), - options, &run, NULL)) ? ret : 1; + + if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + return 2; + + ret = (GNUNET_OK == + GNUNET_PROGRAM_run (argc, argv, "gnunet-unindex [OPTIONS] FILENAME", + gettext_noop + ("Unindex a file that was previously indexed with gnunet-publish."), + options, &run, NULL)) ? ret : 1; + GNUNET_free ((void*) argv); + return ret; } /* end of gnunet-unindex.c */