namelen);
if (NULL == unicast)
{
- GNUNET_notification_context_broadcast (notifier,
- &msg->header,
- GNUNET_YES);
+ if (NULL != notifier)
+ GNUNET_notification_context_broadcast (notifier,
+ &msg->header,
+ GNUNET_YES);
GNUNET_MQ_discard (env);
}
else
/* 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;
"arm"))
return;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg,
- section,
- "BINARY",
- &binary))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ section,
+ "BINARY",
+ &binary))
{
/* not a service section */
return;
}
config = NULL;
if (( (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, section,
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ section,
"CONFIG",
&config)) &&
(GNUNET_OK !=
"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",