aboutsummaryrefslogtreecommitdiff
path: root/src/arm
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-17 22:35:36 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-17 22:35:36 +0200
commit28ab2c446fba4980a8295d59fdf203a028a35dd6 (patch)
treeebd266d1e280e353e8857a7e3e35bbf609c0a888 /src/arm
parent931232d1141891232e46f5d6fd1432663e730e7a (diff)
downloadgnunet-28ab2c446fba4980a8295d59fdf203a028a35dd6.tar.gz
gnunet-28ab2c446fba4980a8295d59fdf203a028a35dd6.zip
avoid boolean flag in GNUNET_OS_start_process() API (fixes #6188)
Diffstat (limited to 'src/arm')
-rw-r--r--src/arm/arm_api.c12
-rw-r--r--src/arm/gnunet-service-arm.c25
2 files changed, 19 insertions, 18 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index cd5f44565..dea7a70be 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -729,8 +729,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
729 /* Means we are ONLY running locally */ 729 /* Means we are ONLY running locally */
730 /* we're clearly running a test, don't daemonize */ 730 /* we're clearly running a test, don't daemonize */
731 if (NULL == config) 731 if (NULL == config)
732 proc = GNUNET_OS_start_process_s (GNUNET_NO, 732 proc = GNUNET_OS_start_process_s (std_inheritance,
733 std_inheritance,
734 lsocks, 733 lsocks,
735 loprefix, 734 loprefix,
736 quotedbinary, 735 quotedbinary,
@@ -738,8 +737,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
738 lopostfix, 737 lopostfix,
739 NULL); 738 NULL);
740 else 739 else
741 proc = GNUNET_OS_start_process_s (GNUNET_NO, 740 proc = GNUNET_OS_start_process_s (std_inheritance,
742 std_inheritance,
743 lsocks, 741 lsocks,
744 loprefix, 742 loprefix,
745 quotedbinary, 743 quotedbinary,
@@ -752,8 +750,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
752 else 750 else
753 { 751 {
754 if (NULL == config) 752 if (NULL == config)
755 proc = GNUNET_OS_start_process_s (GNUNET_NO, 753 proc = GNUNET_OS_start_process_s (std_inheritance,
756 std_inheritance,
757 lsocks, 754 lsocks,
758 loprefix, 755 loprefix,
759 quotedbinary, 756 quotedbinary,
@@ -761,8 +758,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
761 lopostfix, 758 lopostfix,
762 NULL); 759 NULL);
763 else 760 else
764 proc = GNUNET_OS_start_process_s (GNUNET_NO, 761 proc = GNUNET_OS_start_process_s (std_inheritance,
765 std_inheritance,
766 lsocks, 762 lsocks,
767 loprefix, 763 loprefix,
768 quotedbinary, 764 quotedbinary,
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,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 09:10:11 +0000