diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-16 19:49:53 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-16 19:49:53 +0200 |
commit | 719b51b65df263dbd41bc1adc9eccfdf07bcda46 (patch) | |
tree | c121461ab6f0b10f87b060247ed6e4be542d15f4 | |
parent | a34891981c1311026a064af5312d7e4535c9ba11 (diff) | |
download | exchange-719b51b65df263dbd41bc1adc9eccfdf07bcda46.tar.xz |
fix config parsing for dbinit tool
-rw-r--r-- | src/exchange-tools/taler-exchange-dbinit.c | 92 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd.c | 2 |
2 files changed, 53 insertions, 41 deletions
diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c index 9f301854f..aaa468a74 100644 --- a/src/exchange-tools/taler-exchange-dbinit.c +++ b/src/exchange-tools/taler-exchange-dbinit.c @@ -23,6 +23,50 @@ #include "taler_exchangedb_plugin.h" + +/** + * Return value from main(). + */ +static int global_ret; + +/** + * Main function that will be run. + * + * @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 TALER_EXCHANGEDB_Plugin *plugin; + + if (NULL == + (plugin = TALER_EXCHANGEDB_plugin_load (cfg))) + { + fprintf (stderr, + "Failed to initialize database plugin.\n"); + global_ret = 1; + return; + } + if (GNUNET_OK != + plugin->create_tables (plugin->cls, + GNUNET_NO)) + { + fprintf (stderr, + "Failed to initialize database.\n"); + TALER_EXCHANGEDB_plugin_unload (plugin); + global_ret = 1; + return; + } + TALER_EXCHANGEDB_plugin_unload (plugin); +} + + /** * The main function of the database initialization tool. * Used to initialize the Taler Exchange's database. @@ -35,57 +79,23 @@ int main (int argc, char *const *argv) { - char *cfgfile = NULL; const struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_CFG_FILE (&cfgfile), - GNUNET_GETOPT_OPTION_HELP ("Initialize Taler Exchange database"), - GNUNET_GETOPT_OPTION_VERSION (VERSION "-" VCS_VERSION), GNUNET_GETOPT_OPTION_END }; - struct GNUNET_CONFIGURATION_Handle *cfg; - struct TALER_EXCHANGEDB_Plugin *plugin; - - if (GNUNET_GETOPT_run ("taler-exchange-dbinit", - options, - argc, argv) < 0) - return 1; GNUNET_assert (GNUNET_OK == GNUNET_log_setup ("taler-exchange-dbinit", "INFO", NULL)); - cfg = GNUNET_CONFIGURATION_create (); - if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, - cfgfile)) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Malformed configuration file `%s', exit ...\n"), - cfgfile); - GNUNET_free_non_null (cfgfile); - return 1; - } - GNUNET_free_non_null (cfgfile); - if (NULL == - (plugin = TALER_EXCHANGEDB_plugin_load (cfg))) - { - fprintf (stderr, - "Failed to initialize database plugin.\n"); - GNUNET_CONFIGURATION_destroy (cfg); - return 1; - } if (GNUNET_OK != - plugin->create_tables (plugin->cls, - GNUNET_NO)) - { - fprintf (stderr, - "Failed to initialize database.\n"); - TALER_EXCHANGEDB_plugin_unload (plugin); - GNUNET_CONFIGURATION_destroy (cfg); + GNUNET_PROGRAM_run (argc, argv, + "taler-exchange-dbinit", + "Initialize Taler exchange database", + options, + &run, NULL)) return 1; - } - TALER_EXCHANGEDB_plugin_unload (plugin); - GNUNET_CONFIGURATION_destroy (cfg); - return 0; + return global_ret; } + /* end of taler-exchange-dbinit.c */ diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index a8e9b3b08..a533a973d 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -648,6 +648,8 @@ main (int argc, options, argc, argv)) return 1; + if (NULL == cfgfile) + cfgfile = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file); cfg = GNUNET_CONFIGURATION_create (); if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfgfile)) { |