diff options
Diffstat (limited to 'src/include/gnunet_os_lib.h')
-rw-r--r-- | src/include/gnunet_os_lib.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index 12aeec7f0..749f766d2 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -100,7 +100,12 @@ enum GNUNET_OS_InheritStdioFlags | |||
100 | * Use this option to have all of the standard streams | 100 | * Use this option to have all of the standard streams |
101 | * (stdin, stdout and stderror) be inherited. | 101 | * (stdin, stdout and stderror) be inherited. |
102 | */ | 102 | */ |
103 | GNUNET_OS_INHERIT_STD_ALL = 7 | 103 | GNUNET_OS_INHERIT_STD_ALL = 7, |
104 | |||
105 | /** | ||
106 | * Should a pipe be used to send signals to the child? | ||
107 | */ | ||
108 | GNUNET_OS_USE_PIPE_CONTROL = 8 | ||
104 | }; | 109 | }; |
105 | 110 | ||
106 | 111 | ||
@@ -455,7 +460,6 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc); | |||
455 | /** | 460 | /** |
456 | * Start a process. | 461 | * Start a process. |
457 | * | 462 | * |
458 | * @param pipe_control should a pipe be used to send signals to the child? | ||
459 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags | 463 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags |
460 | * @param pipe_stdin pipe to use to send input to child process (or NULL) | 464 | * @param pipe_stdin pipe to use to send input to child process (or NULL) |
461 | * @param pipe_stdout pipe to use to get output from child process (or NULL) | 465 | * @param pipe_stdout pipe to use to get output from child process (or NULL) |
@@ -465,8 +469,7 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc); | |||
465 | * @return pointer to process structure of the new process, NULL on error | 469 | * @return pointer to process structure of the new process, NULL on error |
466 | */ | 470 | */ |
467 | struct GNUNET_OS_Process * | 471 | struct GNUNET_OS_Process * |
468 | GNUNET_OS_start_process_vap (int pipe_control, | 472 | GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance, |
469 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | ||
470 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 473 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
471 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 474 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
472 | struct GNUNET_DISK_PipeHandle *pipe_stderr, | 475 | struct GNUNET_DISK_PipeHandle *pipe_stderr, |
@@ -477,7 +480,6 @@ GNUNET_OS_start_process_vap (int pipe_control, | |||
477 | /** | 480 | /** |
478 | * Start a process. | 481 | * Start a process. |
479 | * | 482 | * |
480 | * @param pipe_control should a pipe be used to send signals to the child? | ||
481 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags | 483 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags |
482 | * @param pipe_stdin pipe to use to send input to child process (or NULL) | 484 | * @param pipe_stdin pipe to use to send input to child process (or NULL) |
483 | * @param pipe_stdout pipe to use to get output from child process (or NULL) | 485 | * @param pipe_stdout pipe to use to get output from child process (or NULL) |
@@ -487,8 +489,7 @@ GNUNET_OS_start_process_vap (int pipe_control, | |||
487 | * @return pointer to process structure of the new process, NULL on error | 489 | * @return pointer to process structure of the new process, NULL on error |
488 | */ | 490 | */ |
489 | struct GNUNET_OS_Process * | 491 | struct GNUNET_OS_Process * |
490 | GNUNET_OS_start_process (int pipe_control, | 492 | GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance, |
491 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | ||
492 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 493 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
493 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 494 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
494 | struct GNUNET_DISK_PipeHandle *pipe_stderr, | 495 | struct GNUNET_DISK_PipeHandle *pipe_stderr, |
@@ -498,7 +499,6 @@ GNUNET_OS_start_process (int pipe_control, | |||
498 | /** | 499 | /** |
499 | * Start a process. | 500 | * Start a process. |
500 | * | 501 | * |
501 | * @param pipe_control should a pipe be used to send signals to the child? | ||
502 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags | 502 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags |
503 | * @param pipe_stdin pipe to use to send input to child process (or NULL) | 503 | * @param pipe_stdin pipe to use to send input to child process (or NULL) |
504 | * @param pipe_stdout pipe to use to get output from child process (or NULL) | 504 | * @param pipe_stdout pipe to use to get output from child process (or NULL) |
@@ -508,8 +508,7 @@ GNUNET_OS_start_process (int pipe_control, | |||
508 | * @return pointer to process structure of the new process, NULL on error | 508 | * @return pointer to process structure of the new process, NULL on error |
509 | */ | 509 | */ |
510 | struct GNUNET_OS_Process * | 510 | struct GNUNET_OS_Process * |
511 | GNUNET_OS_start_process_va (int pipe_control, | 511 | GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance, |
512 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | ||
513 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 512 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
514 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 513 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
515 | struct GNUNET_DISK_PipeHandle *pipe_stderr, | 514 | struct GNUNET_DISK_PipeHandle *pipe_stderr, |
@@ -518,7 +517,6 @@ GNUNET_OS_start_process_va (int pipe_control, | |||
518 | /** | 517 | /** |
519 | * Start a process. | 518 | * Start a process. |
520 | * | 519 | * |
521 | * @param pipe_control should a pipe be used to send signals to the child? | ||
522 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags | 520 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags |
523 | * @param lsocks array of listen sockets to dup systemd-style (or NULL); | 521 | * @param lsocks array of listen sockets to dup systemd-style (or NULL); |
524 | * must be NULL on platforms where dup is not supported | 522 | * must be NULL on platforms where dup is not supported |
@@ -528,8 +526,7 @@ GNUNET_OS_start_process_va (int pipe_control, | |||
528 | * @return pointer to process structure of the new process, NULL on error | 526 | * @return pointer to process structure of the new process, NULL on error |
529 | */ | 527 | */ |
530 | struct GNUNET_OS_Process * | 528 | struct GNUNET_OS_Process * |
531 | GNUNET_OS_start_process_v (int pipe_control, | 529 | GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance, |
532 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | ||
533 | const int *lsocks, | 530 | const int *lsocks, |
534 | const char *filename, | 531 | const char *filename, |
535 | char *const argv[]); | 532 | char *const argv[]); |
@@ -542,7 +539,6 @@ GNUNET_OS_start_process_v (int pipe_control, | |||
542 | * in the order they appear. Arguments containing spaces can be used by | 539 | * in the order they appear. Arguments containing spaces can be used by |
543 | * quoting them with @em ". | 540 | * quoting them with @em ". |
544 | * | 541 | * |
545 | * @param pipe_control should a pipe be used to send signals to the child? | ||
546 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags | 542 | * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags |
547 | * @param lsocks array of listen sockets to dup systemd-style (or NULL); | 543 | * @param lsocks array of listen sockets to dup systemd-style (or NULL); |
548 | * must be NULL on platforms where dup is not supported | 544 | * must be NULL on platforms where dup is not supported |
@@ -554,8 +550,7 @@ GNUNET_OS_start_process_v (int pipe_control, | |||
554 | * @return pointer to process structure of the new process, NULL on error | 550 | * @return pointer to process structure of the new process, NULL on error |
555 | */ | 551 | */ |
556 | struct GNUNET_OS_Process * | 552 | struct GNUNET_OS_Process * |
557 | GNUNET_OS_start_process_s (int pipe_control, | 553 | GNUNET_OS_start_process_s (enum GNUNET_OS_InheritStdioFlags std_inheritance, |
558 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | ||
559 | const int *lsocks, | 554 | const int *lsocks, |
560 | const char *filename, ...); | 555 | const char *filename, ...); |
561 | 556 | ||