[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37229 - gnunet/src/arm
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37229 - gnunet/src/arm |
Date: |
Wed, 1 Jun 2016 22:30:03 +0200 |
Author: grothoff
Date: 2016-06-01 22:30:03 +0200 (Wed, 01 Jun 2016)
New Revision: 37229
Modified:
gnunet/src/arm/gnunet-service-arm.c
Log:
Fix for #4553
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2016-06-01 20:13:39 UTC (rev 37228)
+++ gnunet/src/arm/gnunet-service-arm.c 2016-06-01 20:30:03 UTC (rev 37229)
@@ -444,15 +444,18 @@
/* obtain configuration */
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, sl->name, "PREFIX",
- &loprefix))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ sl->name,
+ "PREFIX",
+ &loprefix))
loprefix = GNUNET_strdup (prefix_command);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (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;
@@ -488,8 +491,11 @@
options = fin_options;
}
}
- use_debug = GNUNET_CONFIGURATION_get_value_yesno (cfg, sl->name, "DEBUG");
-
+ options = GNUNET_CONFIGURATION_expand_dollar (cfg,
+ options);
+ use_debug = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ sl->name,
+ "DEBUG");
{
const char *service_type = NULL;
const char *choices[] = { "GNUNET", "SIMPLE", NULL };
@@ -525,8 +531,11 @@
sl->proc =
GNUNET_OS_start_process_s (sl->pipe_control,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- lsocks, loprefix, quotedbinary,
- options, NULL);
+ lsocks,
+ loprefix,
+ quotedbinary,
+ options,
+ NULL);
}
else
{
@@ -545,15 +554,23 @@
sl->proc =
GNUNET_OS_start_process_s (sl->pipe_control,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- lsocks, loprefix, quotedbinary, "-L",
- "DEBUG", options, NULL);
+ lsocks,
+ loprefix,
+ quotedbinary,
+ "-L", "DEBUG",
+ options,
+ NULL);
else
sl->proc =
GNUNET_OS_start_process_s (sl->pipe_control,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- lsocks, loprefix, quotedbinary, "-c",
- sl->config, "-L",
- "DEBUG", options, NULL);
+ lsocks,
+ loprefix,
+ quotedbinary,
+ "-c", sl->config,
+ "-L", "DEBUG",
+ options,
+ NULL);
}
else
{
@@ -561,14 +578,21 @@
sl->proc =
GNUNET_OS_start_process_s (sl->pipe_control,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- lsocks, loprefix, quotedbinary,
- options, NULL);
+ lsocks,
+ loprefix,
+ quotedbinary,
+ options,
+ NULL);
else
sl->proc =
GNUNET_OS_start_process_s (sl->pipe_control,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- lsocks, loprefix, quotedbinary, "-c",
- sl->config, options, NULL);
+ lsocks,
+ loprefix,
+ quotedbinary,
+ "-c", sl->config,
+ options,
+ NULL);
}
}
GNUNET_free (binary);
@@ -1493,7 +1517,7 @@
if (( (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, section,
"CONFIG",
- &config)) &&
+ &config)) &&
(GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
"PATHS",
@@ -1519,8 +1543,12 @@
#if WINDOWS
sl->pipe_control = GNUNET_YES;
#else
- if (GNUNET_CONFIGURATION_have_value (cfg, section, "PIPECONTROL"))
- sl->pipe_control = GNUNET_CONFIGURATION_get_value_yesno (cfg, section,
"PIPECONTROL");
+ if (GNUNET_CONFIGURATION_have_value (cfg,
+ section,
+ "PIPECONTROL"))
+ sl->pipe_control = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ section,
+ "PIPECONTROL");
#endif
GNUNET_CONTAINER_DLL_insert (running_head,
running_tail,
@@ -1650,21 +1678,29 @@
}
#endif
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "GLOBAL_PREFIX",
- &prefix_command))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "ARM",
+ "GLOBAL_PREFIX",
+ &prefix_command))
prefix_command = GNUNET_strdup ("");
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "ARM", "GLOBAL_POSTFIX",
- &final_option))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "ARM",
+ "GLOBAL_POSTFIX",
+ &final_option))
final_option = GNUNET_strdup ("");
if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "ARM", "USER_ONLY"))
+ GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "ARM",
+ "USER_ONLY"))
{
GNUNET_break (GNUNET_YES == start_user);
start_system = GNUNET_NO;
}
if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "ARM", "SYSTEM_ONLY"))
+ GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "ARM",
+ "SYSTEM_ONLY"))
{
GNUNET_break (GNUNET_YES == start_system);
start_user = GNUNET_NO;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37229 - gnunet/src/arm,
gnunet <=