summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/man/Makefile.am1
-rw-r--r--doc/man/gnunet-config.143
-rw-r--r--src/util/Makefile.am10
-rw-r--r--src/util/gnunet-config.c183
4 files changed, 237 insertions, 0 deletions
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 4a50dec55..34ea50d21 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,6 +1,7 @@
man_MANS = \
gnunet-arm.1 \
gnunet-auto-share.1 \
+ gnunet-config.1 \
gnunet-core.1 \
gnunet-directory.1 \
gnunet-download.1 \
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
new file mode 100644
index 000000000..3a7fa624b
--- /dev/null
+++ b/doc/man/gnunet-config.1
@@ -0,0 +1,43 @@
+.TH GNUNET\-CONFIG 1 "Jul 15, 2012" "GNUnet"
+
+.SH NAME
+gnunet\-config \- manipulate GNUnet configuration files
+
+.SH SYNOPSIS
+.B gnunet\-config
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+\fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
+
+.SH OPTIONS
+.B
+.IP "\-f, \-\-filename"
+When accessing a specific option using \-s and \-o, perform expansions as if the value represents a filename.
+.B
+.IP "\-s SECTION, \-\-section=SECTION"
+Which configuration section should be accessed or edited. Required option.
+.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
+.IP "\-V VALUE, \-\-value VALUE"
+Configuration value to store in the given section under the given option. Must only be given together with \-s and \-o options.
+.B
+.IP "\-c FILENAME, \-\-config=FILENAME"
+Use the configuration file FILENAME.
+.B
+.IP "\-h, \-\-help"
+Print short help on options.
+.B
+.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging. Valid values are DEBUG, INFO, WARNING and ERROR.
+.B
+.IP "\-v, \-\-version"
+Print GNUnet version number.
+
+
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 87681fd88..35b006483 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -122,6 +122,7 @@ libgnunetutil_la_LDFLAGS = \
bin_PROGRAMS = \
gnunet-service-resolver \
gnunet-resolver \
+ gnunet-config \
gnunet-rsa \
gnunet-uri
@@ -153,6 +154,15 @@ gnunet_rsa_DEPENDENCIES = \
libgnunetutil.la
+gnunet_config_SOURCES = \
+ gnunet-config.c
+gnunet_config_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+gnunet_config_DEPENDENCIES = \
+ libgnunetutil.la
+
+
gnunet_uri_SOURCES = \
gnunet-uri.c
gnunet_uri_LDADD = \
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
new file mode 100644
index 000000000..5c8a715de
--- /dev/null
+++ b/src/util/gnunet-config.c
@@ -0,0 +1,183 @@
+/*
+ This file is part of GNUnet.
+ (C) 2012 Christian Grothoff (and other contributing authors)
+
+ 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 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+*/
+
+/**
+ * @file util/gnunet-config.c
+ * @brief tool to access and manipulate GNUnet configuration files
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+
+
+/**
+ * Name of the section
+ */
+static char *section;
+
+/**
+ * Name of the option
+ */
+static char *option;
+
+/**
+ * Value to set
+ */
+static char *value;
+
+/**
+ * Treat option as a filename.
+ */
+static int is_filename;
+
+/**
+ * Return value from 'main'.
+ */
+static int ret;
+
+
+/**
+ * Print each option in a given section.
+ *
+ * @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)
+{
+ fprintf (stdout,
+ "%s = %s\n", option, value);
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @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, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_CONFIGURATION_Handle *out;
+
+ if (NULL == section)
+ {
+ fprintf (stderr, _("--section argument is required\n"));
+ ret = 1;
+ return;
+ }
+
+ if (NULL == value)
+ {
+ if (NULL == option)
+ {
+ 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))
+ {
+ fprintf (stderr, _("No value for option `%s' in section `%s'\n"),
+ option, section);
+ ret = 3;
+ return;
+ }
+ }
+ 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);
+ ret = 3;
+ return;
+ }
+ }
+ fprintf (stdout, "%s\n", value);
+ }
+ }
+ else
+ {
+ if (NULL == option)
+ {
+ fprintf (stderr, _("--option argument required to set value\n"));
+ ret = 1;
+ return;
+ }
+ out = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_CONFIGURATION_set_value_string (out, section, option, value);
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_write (out, cfgfile))
+ ret = 2;
+ GNUNET_CONFIGURATION_destroy (out);
+ return;
+ }
+}
+
+
+/**
+ * The main function to obtain statistics in GNUnet.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+ static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ { 'f', "filename", NULL,
+ gettext_noop ("obtain option of value as a filename (with $-expansion)"),
+ 0, &GNUNET_GETOPT_set_one, &is_filename },
+ { 's', "section", "SECTION",
+ gettext_noop ("name of the section to access"),
+ 1, &GNUNET_GETOPT_set_string, &section },
+ { 'o', "option", "OPTION",
+ gettext_noop ("name of the option to access"),
+ 1, &GNUNET_GETOPT_set_string, &option },
+ { 'V', "value", "VALUE",
+ gettext_noop ("value to set"),
+ 1, &GNUNET_GETOPT_set_string, &value },
+ 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;
+}
+
+/* end of gnunet-config.c */