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 fe2ae8af66508b573f6ced3a73f729d7554ebd40..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,6 +31,7 @@ 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 format format of data
  * @param data_mime_type mime type of data
@@ -83,6 +84,15 @@ 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);
@@ -156,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.
  *
@@ -174,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,