/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
*/
static int is_filename;
+/**
+ * Whether to show the sections.
+ */
+static int list_sections;
+
/**
* Return value from 'main'.
*/
static int ret;
+/**
+ * Should we generate a configuration file that is clean and
+ * only contains the deltas to the defaults?
+ */
+static int rewrite;
/**
* Print each option in a given section.
* @param option name of the option
* @param value value of the option
*/
-static void
+static void
print_option (void *cls, const char *section,
const char *option,
const char *value)
{
- fprintf (stdout,
+ 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)
+{
+ fprintf (stdout, "%s\n", section);
+}
+
+
/**
* Main function that will be run by the scheduler.
*
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_CONFIGURATION_Handle *out;
+ struct GNUNET_CONFIGURATION_Handle *out = NULL;
+ struct GNUNET_CONFIGURATION_Handle *diff = NULL;
- if (NULL == section)
+ if (rewrite)
{
- fprintf (stderr, _("--section argument is required\n"));
+ struct GNUNET_CONFIGURATION_Handle *def;
+
+ def = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_load (def, NULL))
+ {
+ fprintf (stderr,
+ _("failed to load configuration defaults"));
+ ret = 1;
+ return;
+ }
+ diff = GNUNET_CONFIGURATION_get_diff (def,
+ cfg);
+ cfg = diff;
+ }
+ if ( ((! rewrite) && (NULL == section)) || list_sections)
+ {
+ 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;
+ goto cleanup;
}
- if (NULL == value)
+ if ( (NULL != section) && (NULL == value) )
{
if (NULL == option)
{
- GNUNET_CONFIGURATION_iterate_section_values (cfg, section,
- &print_option, NULL);
+ GNUNET_CONFIGURATION_iterate_section_values (cfg,
+ section,
+ &print_option,
+ NULL);
}
else
{
if (is_filename)
{
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, section, option, &value))
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ section,
+ option,
+ &value))
{
- fprintf (stderr, _("No value for option `%s' in section `%s'\n"),
- option, section);
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ section, option);
ret = 3;
- return;
+ goto cleanup;
}
}
else
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &value))
{
- fprintf (stderr, _("No value for option `%s' in section `%s'\n"),
- option, section);
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ section, option);
ret = 3;
- return;
+ goto cleanup;
}
}
fprintf (stdout, "%s\n", value);
}
}
- else
+ else if (NULL != section)
{
if (NULL == option)
{
fprintf (stderr, _("--option argument required to set value\n"));
ret = 1;
- return;
+ goto cleanup;
}
out = GNUNET_CONFIGURATION_dup (cfg);
- GNUNET_CONFIGURATION_set_value_string (out, section, option, value);
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_write (out, cfgfile))
+ GNUNET_CONFIGURATION_set_value_string (out,
+ section,
+ option,
+ value);
+ }
+ if ( (NULL != diff) || (NULL != out) )
+ {
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out,
+ cfgfile))
ret = 2;
- GNUNET_CONFIGURATION_destroy (out);
- return;
}
+ if (NULL != out)
+ GNUNET_CONFIGURATION_destroy (out);
+ cleanup:
+ if (NULL != diff)
+ GNUNET_CONFIGURATION_destroy (diff);
}
{ '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 },
+ { 'w', "rewrite", NULL,
+ gettext_noop ("write configuration file that only contains delta to defaults"),
+ 0, &GNUNET_GETOPT_set_one, &rewrite },
GNUNET_GETOPT_OPTION_END
};
-
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-config [OPTIONS]",
- gettext_noop ("Manipulate GNUnet configuration files"),
- options, &run, NULL)) ? 0 : ret;
+ ret = (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-config [OPTIONS]",
+ gettext_noop ("Manipulate GNUnet configuration files"),
+ options, &run, NULL)) ? 0 : ret;
+ GNUNET_free ((void*) argv);
+ return ret;
}
/* end of gnunet-config.c */
projects / oweals / gnunet.git / blobdiff