From 47be1a48f383fc4b84a1b9369a62468dabb4bfba Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 26 Jan 2015 19:03:03 +0000
Subject: patches from Hellekin to fix #3577

---
 doc/man/gnunet-config.1      |  3 +++
 src/ats/ats_api_scheduling.c |  2 +-
 src/util/gnunet-config.c     | 31 +++++++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index 3a7fa624b..6b4b82001 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -19,6 +19,9 @@ When accessing a specific option using \-s and \-o, perform expansions as if the
 .IP "\-s SECTION, \-\-section=SECTION"
 Which configuration section should be accessed or edited. Required option.
 .B
+.IP "\-S, \-\-list\-sections"
+List available configuration sections for use with \-\-section.
+.B
 .IP "\-o OPTION, \-\-option=OPTION"
 Which configuration option should be accessed or edited.  Required to set a value.  If not given, all values of a given section will be printed in the format "OPTION = VALUE".
 .B
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 8d2cdc84e..3bd4cddc7 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -488,7 +488,7 @@ process_ats_address_suggestion_message (void *cls,
        (GNUNET_HELLO_address_check_option (ar->address,
                                            GNUNET_HELLO_ADDRESS_INFO_INBOUND)) )
   {
-    GNUNET_assert (0);
+    GNUNET_assert (0); // FIXME: turn back into 'break' later!
     return;
   }
   sh->suggest_cb (sh->suggest_cb_cls,
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 1d204dd07..f0acf11e4 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -47,6 +47,11 @@ static char *value;
  */
 static int is_filename;
 
+/**
+ * Whether to show the sections.
+ */
+static int list_sections;
+
 /**
  * Return value from 'main'.
  */
@@ -71,6 +76,20 @@ print_option (void *cls, const char *section,
 }
 
 
+/**
+ * Print out given section name.
+ *
+ * @param cls unused
+ * @param section a section in the configuration file
+ */
+static void
+print_section_name (void *cls,
+                    const char *section)
+{
+  fprintf (stdout, "%s\n", section);
+}
+
+
 /**
  * Main function that will be run by the scheduler.
  *
@@ -85,9 +104,14 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   struct GNUNET_CONFIGURATION_Handle *out;
 
-  if (NULL == section)
+  if (NULL == section || list_sections)
   {
-    fprintf (stderr, _("--section argument is required\n"));
+    if (! list_sections)
+    {
+      fprintf (stderr, _("--section argument is required\n"));
+    }
+    fprintf (stderr, _("The following sections are available:\n"));
+    GNUNET_CONFIGURATION_iterate_sections (cfg, &print_section_name, NULL);
     ret = 1;
     return;
   }
@@ -168,6 +192,9 @@ main (int argc, char *const *argv)
     { 'V', "value", "VALUE",
       gettext_noop ("value to set"),
       1, &GNUNET_GETOPT_set_string, &value },
+    { 'S', "list-sections", NULL,
+      gettext_noop ("print available configuration sections"),
+      0, &GNUNET_GETOPT_set_one, &list_sections },
     GNUNET_GETOPT_OPTION_END
   };
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-- 
cgit v1.2.3