summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-04-16 13:10:29 +0200
committerChristian Grothoff <christian@grothoff.org>2016-04-16 13:10:29 +0200
commit3abb3bc372b69aa17e87f00b22042de02830341e (patch)
tree4f1c45f40c30b18e35ffc7e983788ffdbe434ed5 /src
parentf552b7e4c03ec46c9ac562c751604466b393d9c8 (diff)
downloadexchange-3abb3bc372b69aa17e87f00b22042de02830341e.tar.gz
exchange-3abb3bc372b69aa17e87f00b22042de02830341e.tar.bz2
exchange-3abb3bc372b69aa17e87f00b22042de02830341e.zip
use user_config_file as well
Diffstat (limited to 'src')
-rw-r--r--src/exchange-tools/taler-exchange-keyup.c4
-rw-r--r--src/exchange-tools/taler-exchange-wire.c6
-rw-r--r--src/include/taler_util.h7
-rw-r--r--src/util/os_installation.c1
4 files changed, 16 insertions, 2 deletions
diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index 2bd168ca..3d9b9761 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -871,7 +871,7 @@ exchange_keys_update_denomkeys ()
* @param cls closure
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param c configuration
+ * @param cfg configuration
*/
static void
run (void *cls,
@@ -1048,7 +1048,7 @@ main (int argc,
char *const *argv)
{
const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'m', "master-key", "FILE",
+ {'m', "master-key", "FILE",
"master key file (private key)", 1,
&GNUNET_GETOPT_set_filename, &masterkeyfile},
{'o', "output", "FILE",
diff --git a/src/exchange-tools/taler-exchange-wire.c b/src/exchange-tools/taler-exchange-wire.c
index 16435127..2c11e842 100644
--- a/src/exchange-tools/taler-exchange-wire.c
+++ b/src/exchange-tools/taler-exchange-wire.c
@@ -22,6 +22,7 @@
#include <jansson.h>
#include <gnunet/gnunet_json_lib.h>
#include "taler_crypto_lib.h"
+#include "taler_util.h"
#include "taler_wire_lib.h"
#include "taler_signatures.h"
@@ -51,6 +52,7 @@ static char *output_filename;
*/
static int global_ret;
+
/**
* Main function that will be run.
*
@@ -211,6 +213,10 @@ main (int argc,
GNUNET_GETOPT_OPTION_END
};
+ /* 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-exchange-wire",
"WARNING",
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 9e52c973..1ac15112 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -110,4 +110,11 @@ TALER_config_get_denom (const struct GNUNET_CONFIGURATION_Handle *cfg,
struct TALER_Amount *denom);
+/**
+ * Return default project data used by Taler.
+ */
+const struct GNUNET_OS_ProjectData *
+TALER_project_data_default (void);
+
+
#endif
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 2c2ba8cd..4b493346 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -39,6 +39,7 @@ static const struct GNUNET_OS_ProjectData taler_pd = {
.bug_email = "taler@gnu.org",
.homepage = "http://www.gnu.org/s/taler/",
.config_file = "taler.conf",
+ .user_config_file = "~/.config/taler.conf",
};