diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-09-25 18:46:43 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-09-25 18:46:43 +0000 |
| commit | aa3d0dc77048dad13943dcf4a611d5131a9a01c5 (patch) | |
| tree | 545b49eafd6000279cdfb2577be10b59be3eabbd /src/arm | |
| parent | ca1cea453795dd8aa1b68dfb8f311bda85102a8c (diff) | |
want himBHexpansion, but not path-prefixing
Diffstat (limited to 'src/arm')
| -rw-r--r-- | src/arm/arm_api.c | 22 | ||||
| -rw-r--r-- | src/arm/gnunet-service-arm.c | 32 |
2 files changed, 36 insertions, 18 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 3fcb75814c..2967e62b75 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -597,17 +597,23 @@ start_arm_service (struct GNUNET_ARM_Handle *h, 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", diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 8c5113774d..5bf8236561 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -380,18 +380,23 @@ start_process (struct ServiceList *sl, /* 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 @@ setup_service (void *cls, } config = NULL; if (( (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_filename (cfg, section, + GNUNET_CONFIGURATION_get_value_filename (cfg, + section, "CONFIG", &config)) && (GNUNET_OK != @@ -1744,12 +1750,18 @@ run (void *cls, "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", "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", |