projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix #3870
[oweals/gnunet.git]
/
src
/
util
/
test_os_start_process.c
diff --git
a/src/util/test_os_start_process.c
b/src/util/test_os_start_process.c
index 90d8ae101ef50552cd2e0c04a5cee87477f0a0e6..c285c1ba65f53e32562099b8967cbfb0627c8867 100644
(file)
--- a/
src/util/test_os_start_process.c
+++ b/
src/util/test_os_start_process.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-46,7
+46,7
@@
static struct GNUNET_DISK_PipeHandle *hello_pipe_stdin;
*/
static struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
*/
static struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
-static
GNUNET_SCHEDULER_TaskIdentifier
die_task;
+static
struct GNUNET_SCHEDULER_Task *
die_task;
struct read_context
{
struct read_context
{
@@
-135,7
+135,8
@@
run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
proc =
GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
proc =
GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
- hello_pipe_stdin, hello_pipe_stdout, fn,
+ hello_pipe_stdin, hello_pipe_stdout, NULL,
+ fn,
"test_gnunet_echo_hello", "-", NULL);
GNUNET_free (fn);
"test_gnunet_echo_hello", "-", NULL);
GNUNET_free (fn);
@@
-203,7
+204,9
@@
check_kill ()
}
fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
proc =
}
fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
proc =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+ hello_pipe_stdin, hello_pipe_stdout, NULL,
+ fn,
"gnunet-service-resolver", "-", NULL);
sleep (1); /* give process time to start, so we actually use the pipe-kill mechanism! */
GNUNET_free (fn);
"gnunet-service-resolver", "-", NULL);
sleep (1); /* give process time to start, so we actually use the pipe-kill mechanism! */
GNUNET_free (fn);
@@
-234,7
+237,9
@@
check_instant_kill ()
}
fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
proc =
}
fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
proc =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+ hello_pipe_stdin, hello_pipe_stdout, NULL,
+ fn,
"gnunet-service-resolver", "-", NULL);
if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
{
"gnunet-service-resolver", "-", NULL);
if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
{