arg

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

diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index c1a7c78f3776ff5b0087084e0c508aa42cc042c2..c40a26b74e34811753a442e815bfdc2699342b58 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
@@ -48,9 +48,17 @@ item_printer (void *cls,
              const char *data,
              size_t data_size)
 {
+  if (type == EXTRACTOR_METATYPE_GNUNET_FULL_DATA) 
+    {
+      printf(_("\t<original file embedded in %u bytes of meta data>\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;
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_metatype_to_string (type)), data);
@@ -83,22 +91,31 @@ print_entry (void *cls,
             const void *data)
 {
   char *string;
-
+  char *name;
+  
+  name = GNUNET_CONTAINER_meta_data_get_by_type (meta,
+                                                EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
   if (uri == NULL)
     {
-      printf (_("Directory summary:\n"));
+      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;
     }
   string = GNUNET_FS_uri_to_string (uri);
-  printf ("%s:\n", string);
+  printf ("%s (%s):\n", name, string);
   GNUNET_free (string);
   GNUNET_CONTAINER_meta_data_iterate (meta,
                                      &item_printer,
                                      NULL);
+  printf ("\n");
+  GNUNET_free (name);
 }
 
 
@@ -106,14 +123,12 @@ print_entry (void *cls,
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
- * @param sched the scheduler to use
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param cfg configuration
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -161,19 +176,12 @@ run (void *cls,
                                         0, 
                                         &print_entry,
                                         NULL);
+      printf ("\n");
       GNUNET_DISK_file_unmap (map);
       GNUNET_DISK_file_close (h);
     }
 }
 
-/**
- * gnunet-directory command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to inspect GNUnet directories.
  *
@@ -184,6 +192,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,