diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/util/helper.c | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/util/helper.c')
-rw-r--r-- | src/util/helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util/helper.c b/src/util/helper.c index 7985f2eca..7360b7d4b 100644 --- a/src/util/helper.c +++ b/src/util/helper.c | |||
@@ -401,9 +401,9 @@ static void | |||
401 | start_helper (struct GNUNET_HELPER_Handle *h) | 401 | start_helper (struct GNUNET_HELPER_Handle *h) |
402 | { | 402 | { |
403 | h->helper_in = | 403 | h->helper_in = |
404 | GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO); | 404 | GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW); |
405 | h->helper_out = | 405 | h->helper_out = |
406 | GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES); | 406 | GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW); |
407 | if ((h->helper_in == NULL) || (h->helper_out == NULL)) | 407 | if ((h->helper_in == NULL) || (h->helper_out == NULL)) |
408 | { | 408 | { |
409 | /* out of file descriptors? try again later... */ | 409 | /* out of file descriptors? try again later... */ |
@@ -423,7 +423,8 @@ start_helper (struct GNUNET_HELPER_Handle *h) | |||
423 | h->fh_to_helper = | 423 | h->fh_to_helper = |
424 | GNUNET_DISK_pipe_handle (h->helper_in, GNUNET_DISK_PIPE_END_WRITE); | 424 | GNUNET_DISK_pipe_handle (h->helper_in, GNUNET_DISK_PIPE_END_WRITE); |
425 | h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe | 425 | h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe |
426 | ? GNUNET_OS_INHERIT_STD_ERR | GNUNET_OS_USE_PIPE_CONTROL | 426 | ? GNUNET_OS_INHERIT_STD_ERR |
427 | | GNUNET_OS_USE_PIPE_CONTROL | ||
427 | : GNUNET_OS_INHERIT_STD_ERR, | 428 | : GNUNET_OS_INHERIT_STD_ERR, |
428 | h->helper_in, | 429 | h->helper_in, |
429 | h->helper_out, | 430 | h->helper_out, |