From fef6e0716a6bbca8096414b4e7cfd923f720da7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?=
Date: Fri, 24 Apr 2015 00:35:32 +0000 Subject: [PATCH] Partially revert r35356 --- src/arm/test_gnunet_service_arm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c index 3e4b9db..465652e 100644 --- a/src/arm/test_gnunet_service_arm.c +++ b/src/arm/test_gnunet_service_arm.c @@ -38,6 +38,7 @@ #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) +static const struct GNUNET_CONFIGURATION_Handle *cfg; static int ret = 1; @@ -172,6 +173,20 @@ run (void *cls, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { + char *armconfig; + cfg = c; + if (NULL != cfgfile) + { + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", + "CONFIG", &armconfig)) + { + GNUNET_CONFIGURATION_set_value_string ((struct GNUNET_CONFIGURATION_Handle + *) cfg, "arm", "CONFIG", + cfgfile); + } + else + GNUNET_free (armconfig); + } arm = GNUNET_ARM_connect (c, NULL, NULL); GNUNET_ARM_request_service_start (arm, "arm", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, -- 1.8.5.3