fixing 1584

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

diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 6201c5dbb39ced22f0c7b1d2daec481e96453085..8f58025c51213515c2a45df81ff96d10a415d4e7 100644 (file)
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -4,7 +4,7 @@
 
      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
@@ -31,18 +31,30 @@ static int ret;
  * Print a meta data entry.
  *
  * @param cls closure (unused)
+ * @param plugin_name name of the plugin that generated the meta data
  * @param type type of the keyword
- * @param data value of the keyword
+ * @param format format of data
+ * @param data_mime_type mime type of data
+ * @param data value of the meta data
+ * @param data_size number of bytes in data
+ * @return always 0 (to continue iterating)
  */
 static int
 item_printer (void *cls,
-             EXTRACTOR_KeywordType type, 
-             const char *data)
+             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) )
+    return 0;
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
-                    EXTRACTOR_getKeywordTypeAsString (type)), data);
-  return GNUNET_OK;
+                    EXTRACTOR_metatype_to_string (type)), data);
+  return 0;
 }
 
 
@@ -72,12 +84,21 @@ print_entry (void *cls,
 {
   char *string;
 
+  if (uri == NULL)
+    {
+      printf (_("Directory summary:\n"));
+      GNUNET_CONTAINER_meta_data_iterate (meta,
+                                         &item_printer,
+                                         NULL);
+      printf ("\n");
+      return;
+    }
   string = GNUNET_FS_uri_to_string (uri);
   printf ("%s:\n", string);
   GNUNET_free (string);
-  GNUNET_CONTAINER_meta_data_get_contents (meta,
-                                          &item_printer,
-                                          NULL);
+  GNUNET_CONTAINER_meta_data_iterate (meta,
+                                     &item_printer,
+                                     NULL);
 }
 
 
@@ -145,14 +166,6 @@ run (void *cls,
     }
 }
 
-/**
- * gnunet-directory command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to inspect GNUnet directories.
  *
@@ -163,6 +176,9 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,