X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-directory.c;h=536766abba6db1a2631fa29888f31690eede29bd;hb=ed51bc86aad5044b88ce4fc3641cc920c8186863;hp=9bd5ed9c191ecdde15a0ecb77af5d290b914c9fd;hpb=d188dc870a727cf798b01b7026ff8748c500db5e;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index 9bd5ed9c1..536766abb 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.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 @@ -40,22 +40,18 @@ static int ret; * @return always 0 (to continue iterating) */ 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) +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) { - if (type == EXTRACTOR_METATYPE_GNUNET_FULL_DATA) - { - printf(_("\t\n"), - (unsigned int) data_size); - return 0; - } - if ( (format != EXTRACTOR_METAFORMAT_UTF8) && - (format != EXTRACTOR_METAFORMAT_C_STRING) ) + if (type == EXTRACTOR_METATYPE_GNUNET_FULL_DATA) + { + printf (_("\t\n"), + (unsigned int) data_size); + return 0; + } + if ((format != EXTRACTOR_METAFORMAT_UTF8) && + (format != EXTRACTOR_METAFORMAT_C_STRING)) return 0; if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) return 0; @@ -83,39 +79,31 @@ item_printer (void *cls, * @param data data available for the file (length bytes) */ static void -print_entry (void *cls, - const char *filename, - const struct GNUNET_FS_Uri *uri, - const struct GNUNET_CONTAINER_MetaData *meta, - size_t length, - const void *data) +print_entry (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri, + const struct GNUNET_CONTAINER_MetaData *meta, size_t length, + const void *data) { char *string; char *name; - - name = GNUNET_CONTAINER_meta_data_get_by_type (meta, - EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); + + name = + GNUNET_CONTAINER_meta_data_get_by_type (meta, + EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); if (uri == NULL) - { - printf (_("Directory `%s' meta data:\n"), - name); - GNUNET_CONTAINER_meta_data_iterate (meta, - &item_printer, - NULL); - printf ("\n"); - printf (_("Directory `%s' contents:\n"), - name); - GNUNET_free (name); - return; - } + { + printf (_("Directory `%s' meta data:\n"), name ? name : ""); + GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL); + printf ("\n"); + printf (_("Directory `%s' contents:\n"), name ? name : ""); + GNUNET_free_non_null (name); + return; + } string = GNUNET_FS_uri_to_string (uri); - printf ("%s (%s):\n", name, string); + printf ("%s (%s):\n", name ? name : "", string); GNUNET_free (string); - GNUNET_CONTAINER_meta_data_iterate (meta, - &item_printer, - NULL); + GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL); printf ("\n"); - GNUNET_free (name); + GNUNET_free_non_null (name); } @@ -128,9 +116,7 @@ print_entry (void *cls, * @param cfg configuration */ static void -run (void *cls, - char *const *args, - const char *cfgfile, +run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_DISK_MapHandle *map; @@ -142,44 +128,36 @@ run (void *cls, int i; if (NULL == args[0]) - { - fprintf (stderr, - _("You must specify a filename to inspect.")); - ret = 1; - return; - } + { + FPRINTF (stderr, "%s", _("You must specify a filename to inspect.\n")); + ret = 1; + return; + } i = 0; while (NULL != (filename = args[i++])) + { + if ((GNUNET_OK != GNUNET_DISK_file_size (filename, &size, GNUNET_YES, GNUNET_YES)) || + (NULL == + (h = + GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ, + GNUNET_DISK_PERM_NONE)))) { - if ( (GNUNET_OK != - GNUNET_DISK_file_size (filename, - &size, - GNUNET_YES)) || - (NULL == (h = GNUNET_DISK_file_open (filename, - GNUNET_DISK_OPEN_READ, - GNUNET_DISK_PERM_NONE))) ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to read directory `%s'\n"), - filename); - ret = 1; - continue; - } - len = (size_t) size; - data = GNUNET_DISK_file_map (h, - &map, - GNUNET_DISK_MAP_TYPE_READ, - len); - GNUNET_assert (NULL != data); - GNUNET_FS_directory_list_contents (len, - data, - 0, - &print_entry, - NULL); - printf ("\n"); - GNUNET_DISK_file_unmap (map); - GNUNET_DISK_file_close (h); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to read directory `%s'\n"), + filename); + ret = 1; + continue; } + len = (size_t) size; + data = GNUNET_DISK_file_map (h, &map, GNUNET_DISK_MAP_TYPE_READ, len); + GNUNET_assert (NULL != data); + if (GNUNET_OK != GNUNET_FS_directory_list_contents (len, data, 0, &print_entry, NULL)) + fprintf (stdout, _("`%s' is not a GNUnet directory\n"), + filename); + else + printf ("\n"); + GNUNET_DISK_file_unmap (map); + GNUNET_DISK_file_close (h); + } } /** @@ -195,13 +173,17 @@ main (int argc, char *const *argv) static struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - return (GNUNET_OK == - GNUNET_PROGRAM_run (argc, - argv, - "gnunet-directory [OPTIONS] FILENAME", - gettext_noop - ("Display contents of a GNUnet directory"), - 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-directory [OPTIONS] FILENAME", + gettext_noop + ("Display contents of a GNUnet directory"), + options, &run, NULL)) ? ret : 1; + GNUNET_free ((void*) argv); + return ret; } /* end of gnunet-directory.c */