diff options
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
| -rw-r--r-- | src/arm/gnunet-service-arm.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 5efd8b72b..00b6e7196 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
| @@ -858,8 +858,9 @@ start_process (struct ServiceList *sl, | |||
| 858 | * of ''-quoted strings, escaping should be considered. */ | 858 | * of ''-quoted strings, escaping should be considered. */ |
| 859 | if (NULL != options) | 859 | if (NULL != options) |
| 860 | options = GNUNET_CONFIGURATION_expand_dollar (cfg, options); | 860 | options = GNUNET_CONFIGURATION_expand_dollar (cfg, options); |
| 861 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control, | 861 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control |
| 862 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 862 | ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL |
| 863 | : GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
| 863 | lsocks, | 864 | lsocks, |
| 864 | loprefix, | 865 | loprefix, |
| 865 | quotedbinary, | 866 | quotedbinary, |
| @@ -880,8 +881,9 @@ start_process (struct ServiceList *sl, | |||
| 880 | if (GNUNET_YES == use_debug) | 881 | if (GNUNET_YES == use_debug) |
| 881 | { | 882 | { |
| 882 | if (NULL == sl->config) | 883 | if (NULL == sl->config) |
| 883 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control, | 884 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control |
| 884 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 885 | ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL |
| 886 | : GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
| 885 | lsocks, | 887 | lsocks, |
| 886 | loprefix, | 888 | loprefix, |
| 887 | quotedbinary, | 889 | quotedbinary, |
| @@ -890,8 +892,9 @@ start_process (struct ServiceList *sl, | |||
| 890 | options, | 892 | options, |
| 891 | NULL); | 893 | NULL); |
| 892 | else | 894 | else |
| 893 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control, | 895 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control |
| 894 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 896 | ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL |
| 897 | : GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
| 895 | lsocks, | 898 | lsocks, |
| 896 | loprefix, | 899 | loprefix, |
| 897 | quotedbinary, | 900 | quotedbinary, |
| @@ -905,16 +908,18 @@ start_process (struct ServiceList *sl, | |||
| 905 | else | 908 | else |
| 906 | { | 909 | { |
| 907 | if (NULL == sl->config) | 910 | if (NULL == sl->config) |
| 908 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control, | 911 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control |
| 909 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 912 | ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL |
| 913 | : GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
| 910 | lsocks, | 914 | lsocks, |
| 911 | loprefix, | 915 | loprefix, |
| 912 | quotedbinary, | 916 | quotedbinary, |
| 913 | options, | 917 | options, |
| 914 | NULL); | 918 | NULL); |
| 915 | else | 919 | else |
| 916 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control, | 920 | sl->proc = GNUNET_OS_start_process_s (sl->pipe_control |
| 917 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 921 | ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR | GNUNET_OS_USE_PIPE_CONTROL |
| 922 | : GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
| 918 | lsocks, | 923 | lsocks, |
| 919 | loprefix, | 924 | loprefix, |
| 920 | quotedbinary, | 925 | quotedbinary, |