[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38012 - gnunet/src/arm
From: |
gnunet |
Subject: |
[GNUnet-SVN] r38012 - gnunet/src/arm |
Date: |
Sun, 25 Sep 2016 20:46:43 +0200 |
Author: grothoff
Date: 2016-09-25 20:46:43 +0200 (Sun, 25 Sep 2016)
New Revision: 38012
Modified:
gnunet/src/arm/arm_api.c
gnunet/src/arm/gnunet-service-arm.c
Log:
want himBHexpansion, but not path-prefixing
Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c 2016-09-25 18:29:08 UTC (rev 38011)
+++ gnunet/src/arm/arm_api.c 2016-09-25 18:46:43 UTC (rev 38012)
@@ -597,17 +597,23 @@
char *lopostfix;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (h->cfg,
- "arm",
- "PREFIX",
- &loprefix))
+ GNUNET_CONFIGURATION_get_value_string (h->cfg,
+ "arm",
+ "PREFIX",
+ &loprefix))
loprefix = GNUNET_strdup ("");
+ else
+ loprefix = GNUNET_CONFIGURATION_expand_dollar (h->cfg,
+ loprefix);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (h->cfg,
- "arm",
- "OPTIONS",
- &lopostfix))
+ GNUNET_CONFIGURATION_get_value_string (h->cfg,
+ "arm",
+ "OPTIONS",
+ &lopostfix))
lopostfix = GNUNET_strdup ("");
+ else
+ lopostfix = GNUNET_CONFIGURATION_expand_dollar (h->cfg,
+ lopostfix);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (h->cfg,
"arm",
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2016-09-25 18:29:08 UTC (rev 38011)
+++ gnunet/src/arm/gnunet-service-arm.c 2016-09-25 18:46:43 UTC (rev 38012)
@@ -380,18 +380,23 @@
/* obtain configuration */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- sl->name,
- "PREFIX",
- &loprefix))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ sl->name,
+ "PREFIX",
+ &loprefix))
loprefix = GNUNET_strdup (prefix_command);
+ else
+ loprefix = GNUNET_CONFIGURATION_expand_dollar (cfg,
+ loprefix);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- sl->name,
- "OPTIONS",
- &options))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ sl->name,
+ "OPTIONS",
+ &options))
options = NULL;
-
+ else
+ options = GNUNET_CONFIGURATION_expand_dollar (cfg,
+ options);
{
char *new_options;
char *optpos;
@@ -1555,7 +1560,8 @@
}
config = NULL;
if (( (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, section,
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ section,
"CONFIG",
&config)) &&
(GNUNET_OK !=
@@ -1744,6 +1750,9 @@
"GLOBAL_PREFIX",
&prefix_command))
prefix_command = GNUNET_strdup ("");
+ else
+ prefix_command = GNUNET_CONFIGURATION_expand_dollar (cfg,
+ prefix_command);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"ARM",
@@ -1750,6 +1759,9 @@
"GLOBAL_POSTFIX",
&final_option))
final_option = GNUNET_strdup ("");
+ else
+ final_option = GNUNET_CONFIGURATION_expand_dollar (cfg,
+ final_option);
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno (cfg,
"ARM",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38012 - gnunet/src/arm,
gnunet <=