[GNUnet-SVN] r36921 - gnunet/src/arm

[gnunet]

Author: dold
Date: 2016-02-29 01:12:10 +0100 (Mon, 29 Feb 2016)
New Revision: 36921

Modified:
   gnunet/src/arm/gnunet-service-arm.c
Log:
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.


Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2016-02-28 21:17:53 UTC (rev 36920)
+++ gnunet/src/arm/gnunet-service-arm.c 2016-02-29 00:12:10 UTC (rev 36921)
@@ -520,6 +520,10 @@
     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,