diff options
Diffstat (limited to 'src/merchant-tools/taler-merchant-dbinit.c')
-rw-r--r-- | src/merchant-tools/taler-merchant-dbinit.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/merchant-tools/taler-merchant-dbinit.c b/src/merchant-tools/taler-merchant-dbinit.c index 9c0f855d..c3a77d52 100644 --- a/src/merchant-tools/taler-merchant-dbinit.c +++ b/src/merchant-tools/taler-merchant-dbinit.c @@ -96,7 +96,6 @@ main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_flag ('r', "reset", "reset database (DANGEROUS: all existing data is lost!)", @@ -104,24 +103,29 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; + enum GNUNET_GenericReturnValue ret; /* force linker to link against libtalerutil; if we do not do this, the linker may "optimize" libtalerutil away and skip #TALER_OS_init(), which we do need */ (void) TALER_project_data_default (); - GNUNET_assert (GNUNET_OK == - GNUNET_log_setup ("taler-merchant-dbinit", - "INFO", - NULL)); if (GNUNET_OK != - GNUNET_PROGRAM_run (argc, argv, - "taler-merchant-dbinit", - "Initialize Taler merchant database", - options, - &run, NULL)) - return 1; + GNUNET_STRINGS_get_utf8_args (argc, argv, + &argc, &argv)) + return 4; + ret = GNUNET_PROGRAM_run ( + argc, argv, + "taler-merchant-dbinit", + gettext_noop ("Initialize Taler merchant database"), + options, + &run, NULL); + GNUNET_free_nz ((void *) argv); + if (GNUNET_SYSERR == ret) + return 3; + if (GNUNET_NO == ret) + return 0; return global_ret; } -/* end of taler-exchange-dbinit.c */ +/* end of taler-merchant-dbinit.c */ |