1 files changed, 28 insertions, 290 deletions

diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 11682daea..a195d6014 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2012 GNUnet e.V.
+     Copyright (C) 2012-2021 GNUnet e.V.
 
      GNUnet is free software: you can redistribute it and/or modify it
      under the terms of the GNU Affero General Public License as published
@@ -28,51 +28,12 @@
 
 
 /**
- * Name of the section
- */
-static char *section;
-
-/**
- * Name of the option
- */
-static char *option;
-
-/**
- * Value to set
- */
-static char *value;
-
-/**
  * Backend to check if the respective plugin is
  * loadable. NULL if no check is to be performed.
  * The value is the "basename" of the plugin to load.
  */
 static char *backend_check;
 
-/**
- * Treat option as a filename.
- */
-static int is_filename;
-
-/**
- * Whether to show the sections.
- */
-static int list_sections;
-
-/**
- * Return value from 'main'.
- */
-static int global_ret;
-
-/**
- * Should we write out the configuration file, even if no value was changed?
- */
-static int rewrite;
-
-/**
- * Should the generated configuration file contain the whole configuration?
- */
-static int full;
 
 /**
  * If printing the value of CFLAGS has been requested.
@@ -92,64 +53,11 @@ static int prefix;
 
 /**
  * Print each option in a given section.
+ * Main task to run to perform operations typical for
+ * gnunet-config as per the configuration settings
+ * given in @a cls.
  *
- * @param cls closure
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
-static void
-print_option (void *cls,
-              const char *section,
-              const char *option,
-              const char *value)
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
-  (void) section;
-  if (is_filename)
-  {
-    char *value_fn;
-    char *fn;
-
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                            section,
-                                                            option,
-                                                            &value_fn));
-    fn = GNUNET_STRINGS_filename_expand (value_fn);
-    if (NULL == fn)
-      fn = value_fn;
-    else
-      GNUNET_free (value_fn);
-    fprintf (stdout, "%s = %s\n", option, fn);
-    GNUNET_free (fn);
-  }
-  else
-  {
-    fprintf (stdout, "%s = %s\n", option, value);
-  }
-}
-
-
-/**
- * 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)
-{
-  (void) cls;
-  fprintf (stdout, "%s\n", section);
-}
-
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
+ * @param cls closure with the `struct GNUNET_CONFIGURATION_ConfigSettings`
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving,
  *                                                     can be NULL!)
@@ -161,10 +69,8 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  struct GNUNET_CONFIGURATION_Handle *out = NULL;
+  struct GNUNET_CONFIGURATION_ConfigSettings *cs = cls;
 
-  (void) cls;
-  (void) args;
   if (1 == cflags || 1 == libs || 1 == prefix)
   {
     char *prefixdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX);
@@ -192,153 +98,15 @@ run (void *cls,
     GNUNET_asprintf (&name,
                      "libgnunet_plugin_%s",
                      backend_check);
-    global_ret = (GNUNET_OK ==
-                  GNUNET_PLUGIN_test (name)) ? 0 : 77;
+    cs->global_ret = (GNUNET_OK ==
+                      GNUNET_PLUGIN_test (name)) ? 0 : 77;
     GNUNET_free (name);
     return;
   }
-  if (full)
-    rewrite = GNUNET_YES;
-  if (list_sections)
-  {
-    fprintf (stderr,
-             _ ("The following sections are available:\n"));
-    GNUNET_CONFIGURATION_iterate_sections (cfg,
-                                           &print_section_name,
-                                           NULL);
-    return;
-  }
-  if ( (! rewrite) &&
-       (NULL == section) )
-  {
-    fprintf (stderr,
-             _ ("%s or %s argument is required\n"),
-             "--section",
-             "--list-sections");
-    global_ret = 1;
-    return;
-  }
-
-  if ( (NULL != section) &&
-       (NULL == value) )
-  {
-    if (NULL == option)
-    {
-      GNUNET_CONFIGURATION_iterate_section_values (cfg,
-                                                   section,
-                                                   &print_option,
-                                                   (void *) cfg);
-    }
-    else
-    {
-      if (is_filename)
-      {
-        if (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                     section,
-                                                     option,
-                                                     &value))
-        {
-          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                     section,
-                                     option);
-          global_ret = 3;
-          return;
-        }
-      }
-      else
-      {
-        if (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                   section,
-                                                   option,
-                                                   &value))
-        {
-          GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                     section,
-                                     option);
-          global_ret = 3;
-          return;
-        }
-      }
-      fprintf (stdout,
-               "%s\n",
-               value);
-    }
-  }
-  else if (NULL != section)
-  {
-    if (NULL == option)
-    {
-      fprintf (stderr,
-               _ ("--option argument required to set value\n"));
-      global_ret = 1;
-      return;
-    }
-    out = GNUNET_CONFIGURATION_dup (cfg);
-    GNUNET_CONFIGURATION_set_value_string (out,
-                                           section,
-                                           option,
-                                           value);
-    rewrite = GNUNET_YES;
-  }
-  if (rewrite)
-  {
-    char *cfg_fn = NULL;
-
-    if (NULL == out)
-      out = GNUNET_CONFIGURATION_dup (cfg);
-
-    if (NULL == cfgfile)
-    {
-      const char *xdg = getenv ("XDG_CONFIG_HOME");
-      if (NULL != xdg)
-        GNUNET_asprintf (&cfg_fn,
-                         "%s%s%s",
-                         xdg,
-                         DIR_SEPARATOR_STR,
-                         GNUNET_OS_project_data_get ()->config_file);
-      else
-        cfg_fn = GNUNET_strdup (
-          GNUNET_OS_project_data_get ()->user_config_file);
-      cfgfile = cfg_fn;
-    }
-
-    if (! full)
-    {
-      struct GNUNET_CONFIGURATION_Handle *def;
-
-      def = GNUNET_CONFIGURATION_create ();
-      if (GNUNET_OK !=
-          GNUNET_CONFIGURATION_load (def,
-                                     NULL))
-      {
-        fprintf (stderr,
-                 _ ("failed to load configuration defaults"));
-        global_ret = 1;
-        GNUNET_CONFIGURATION_destroy (def);
-        GNUNET_CONFIGURATION_destroy (out);
-        GNUNET_free (cfg_fn);
-        return;
-      }
-      if (GNUNET_OK !=
-          GNUNET_CONFIGURATION_write_diffs (def,
-                                            out,
-                                            cfgfile))
-        global_ret = 2;
-      GNUNET_CONFIGURATION_destroy (def);
-    }
-    else
-    {
-      if (GNUNET_OK !=
-          GNUNET_CONFIGURATION_write (out,
-                                      cfgfile))
-        global_ret = 2;
-    }
-    GNUNET_free (cfg_fn);
-  }
-  if (NULL != out)
-    GNUNET_CONFIGURATION_destroy (out);
+  GNUNET_CONFIGURATION_config_tool_run (cs,
+                                        args,
+                                        cfgfile,
+                                        cfg);
 }
 
 
@@ -350,8 +118,13 @@ run (void *cls,
  * @return 0 ok, 1 on error
  */
 int
-main (int argc, char *const *argv)
+main (int argc,
+      char *const *argv)
 {
+  struct GNUNET_CONFIGURATION_ConfigSettings cs = {
+    .api_version = GNUNET_UTIL_VERSION,
+    .global_ret = EXIT_SUCCESS
+  };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_exclusive (
       GNUNET_GETOPT_option_string (
@@ -361,44 +134,6 @@ main (int argc, char *const *argv)
         gettext_noop (
           "test if the current installation supports the specified BACKEND"),
         &backend_check)),
-    GNUNET_GETOPT_option_flag (
-      'F',
-      "full",
-      gettext_noop (
-        "write the full configuration file, including default values"),
-      &full),
-    GNUNET_GETOPT_option_flag (
-      'f',
-      "filename",
-      gettext_noop ("interpret option value as a filename (with $-expansion)"),
-      &is_filename),
-    GNUNET_GETOPT_option_string ('o',
-                                 "option",
-                                 "OPTION",
-                                 gettext_noop ("name of the option to access"),
-                                 &option),
-    GNUNET_GETOPT_option_flag (
-      'r',
-      "rewrite",
-      gettext_noop (
-        "rewrite the configuration file, even if nothing changed"),
-      &rewrite),
-    GNUNET_GETOPT_option_flag ('S',
-                               "list-sections",
-                               gettext_noop (
-                                 "print available configuration sections"),
-                               &list_sections),
-    GNUNET_GETOPT_option_string ('s',
-                                 "section",
-                                 "SECTION",
-                                 gettext_noop (
-                                   "name of the section to access"),
-                                 &section),
-    GNUNET_GETOPT_option_string ('V',
-                                 "value",
-                                 "VALUE",
-                                 gettext_noop ("value to set"),
-                                 &value),
     GNUNET_GETOPT_option_flag ('C',
                                "cflags",
                                gettext_noop (
@@ -414,15 +149,15 @@ main (int argc, char *const *argv)
                                gettext_noop (
                                  "Provide the path under which GNUnet was installed"),
                                &prefix),
+    GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
     GNUNET_GETOPT_OPTION_END
   };
-  int ret;
+  enum GNUNET_GenericReturnValue ret;
 
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
                                     &argc, &argv))
-    return 2;
-
+    return EXIT_FAILURE;
   ret =
     GNUNET_PROGRAM_run (argc,
                         argv,
@@ -430,11 +165,14 @@ main (int argc, char *const *argv)
                         gettext_noop ("Manipulate GNUnet configuration files"),
                         options,
                         &run,
-                        NULL);
+                        &cs);
   GNUNET_free_nz ((void *) argv);
-  if (GNUNET_OK == ret)
-    return global_ret;
-  return ret;
+  GNUNET_CONFIGURATION_config_settings_free (&cs);
+  if (GNUNET_NO == ret)
+    return 0;
+  if (GNUNET_SYSERR == ret)
+    return EXIT_INVALIDARGUMENT;
+  return cs.global_ret;
 }