X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-search.c;h=5d76335916fc700f1ce506bb212900e976a95fcd;hb=a7fbcf1c827ea25046c9f9e5c4e2a567eba72318;hp=c82a0794c5d7501858c1d853e3ae9fdd8f5ad2c0;hpb=5746309cb4be2073d550ad7a6885e918631dbc38;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index c82a0794c..5d7633591 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c @@ -1,6 +1,6 @@ /* 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 @@ -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-search.c @@ -42,11 +42,14 @@ static struct GNUNET_FS_DirectoryBuilder *db; static unsigned int anonymity = 1; -static unsigned long long timeout; +/** + * Timeout for the search, 0 means to wait for CTRL-C. + */ +static struct GNUNET_TIME_Relative timeout; static unsigned int results_limit; -static unsigned int results = 0; +static unsigned int results; static int verbose; @@ -62,7 +65,7 @@ static int local_only; * used in the main libextractor library and yielding * meta data). * @param type libextractor-type describing the meta data - * @param format basic format information about data + * @param format basic format information about data * @param data_mime_type mime-type of data (not of the original file); * can be NULL (if mime-type is not known) * @param data actual meta-data found @@ -79,9 +82,15 @@ item_printer (void *cls, const char *plugin_name, enum EXTRACTOR_MetaType type, return 0; if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) return 0; +#if HAVE_LIBEXTRACTOR printf ("\t%20s: %s\n", dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, EXTRACTOR_metatype_to_string (type)), data); +#else + printf ("\t%20d: %s\n", + type, + data); +#endif return 0; } @@ -107,7 +116,7 @@ clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)) { - fprintf (stderr, + FPRINTF (stderr, _("Failed to write directory with search results to `%s'\n"), output_filename); } @@ -117,7 +126,7 @@ clean_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * 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 @@ -133,8 +142,8 @@ static void * progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) { static unsigned int cnt; + int is_directory; char *uri; - char *dotdot; char *filename; switch (info->status) @@ -150,20 +159,27 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) 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, + GNUNET_CONTAINER_meta_data_get_by_type (info->value.search. + specifics.result.meta, EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); + is_directory = + GNUNET_FS_meta_data_test_for_directory (info->value.search. + specifics.result.meta); if (filename != NULL) { - while (NULL != (dotdot = strstr (filename, ".."))) - dotdot[0] = dotdot[1] = '_'; - printf ("gnunet-download -o \"%s\" %s\n", filename, uri); + GNUNET_DISK_filename_canonicalize (filename); + if (GNUNET_YES == is_directory) + printf ("gnunet-download -o \"%s%s\" -R %s\n", filename, GNUNET_FS_DIRECTORY_EXT, uri); + else + printf ("gnunet-download -o \"%s\" %s\n", filename, uri); } + else if (GNUNET_YES == is_directory) + printf ("gnunet-download -o \"collection%s\" -R %s\n", GNUNET_FS_DIRECTORY_EXT, uri); else printf ("gnunet-download %s\n", uri); if (verbose) - GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics.result. - meta, &item_printer, NULL); + GNUNET_CONTAINER_meta_data_iterate (info->value.search.specifics. + result.meta, &item_printer, NULL); printf ("\n"); fflush (stdout); GNUNET_free_non_null (filename); @@ -178,16 +194,15 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) /* ignore */ break; case GNUNET_FS_STATUS_SEARCH_ERROR: - fprintf (stderr, _("Error searching: %s.\n"), + 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); + GNUNET_SCHEDULER_add_now (&clean_task, NULL); break; default: - fprintf (stderr, _("Unexpected status: %d\n"), info->status); + FPRINTF (stderr, _("Unexpected status: %d\n"), info->status); break; } return NULL; @@ -220,7 +235,6 @@ run (void *cls, char *const *args, const char *cfgfile, struct GNUNET_FS_Uri *uri; unsigned int argc; enum GNUNET_FS_SearchOptions options; - struct GNUNET_TIME_Relative delay; argc = 0; while (NULL != args[argc]) @@ -228,7 +242,7 @@ run (void *cls, char *const *args, const char *cfgfile, 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")); + FPRINTF (stderr, "%s", _("Could not create keyword URI from arguments.\n")); ret = 1; return; } @@ -238,7 +252,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); if (NULL == ctx) { - fprintf (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); + FPRINTF (stderr, _("Could not initialize `%s' subsystem.\n"), "FS"); GNUNET_FS_uri_destroy (uri); ret = 1; return; @@ -252,21 +266,16 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_FS_uri_destroy (uri); if (NULL == sc) { - fprintf (stderr, _("Could not start searching.\n")); + FPRINTF (stderr, "%s", _("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); - } + if (0 != timeout.rel_value_us) + GNUNET_SCHEDULER_add_delayed (timeout, &shutdown_task, NULL); else - { GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, NULL); - } } @@ -290,23 +299,29 @@ main (int argc, char *const *argv) {'o', "output", "PREFIX", 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"), - 1, &GNUNET_GETOPT_set_ulong, &timeout}, + {'t', "timeout", "DELAY", + gettext_noop ("automatically terminate search after DELAY"), + 1, &GNUNET_GETOPT_set_relative_time, &timeout}, {'V', "verbose", NULL, gettext_noop ("be verbose (print progress information)"), 0, &GNUNET_GETOPT_set_one, &verbose}, {'N', "results", "VALUE", gettext_noop ("automatically terminate search after VALUE results are found"), - 1, &GNUNET_GETOPT_set_ulong, &results_limit}, + 1, &GNUNET_GETOPT_set_uint, &results_limit}, GNUNET_GETOPT_OPTION_END }; - return (GNUNET_OK == - GNUNET_PROGRAM_run (argc, argv, "gnunet-search [OPTIONS] KEYWORD", - gettext_noop - ("Search GNUnet for files that were published on GNUnet"), - 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-search [OPTIONS] KEYWORD", + gettext_noop + ("Search GNUnet for files that were published on GNUnet"), + options, &run, NULL)) ? ret : 1; + GNUNET_free ((void*) argv); + return ret; } /* end of gnunet-search.c */