From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 29 Feb 2016 00:12:10 +0000 (+0000)
Subject: Do $-expansion for OPTIONS of simple services
X-Git-Tag: initial-import-from-subversion-38251~1022
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4422071097b0f6334a231a7dd1e47e6738e5a2cf;p=oweals%2Fgnunet.git

Do $-expansion for OPTIONS of simple services

In the future, this should also handle escaping
and quotation.  For compatibility reasons, the
expansion is only done for simple service configs.
---

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 628bbc99b..0ffda9331 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -520,6 +520,10 @@ start_process (struct ServiceList *sl,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Starting simple service `%s' using binary `%s'\n",
                 sl->name, sl->binary);
+    /* FIXME: dollar expansion should only be done outside
+     * of ''-quoted strings, escaping should be considered. */
+    if (NULL != options)
+      options = GNUNET_CONFIGURATION_expand_dollar (cfg, options);
     sl->proc =
       GNUNET_OS_start_process_s (sl->pipe_control,
                                  GNUNET_OS_INHERIT_STD_OUT_AND_ERR,