From dfeff1e1c0fc366a6d7c6c8e85cf8621a0eaa181 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Tue, 16 Feb 2010 12:19:23 +0000 Subject: [PATCH] add args for GNUNET_OS_start_process's --- src/arm/arm_api.c | 2 +- src/core/test_core_api_start_only.c | 2 +- src/datastore/perf_datastore_api.c | 2 +- src/datastore/test_datastore_api.c | 2 +- src/datastore/test_datastore_api_management.c | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_list_indexed.c | 2 +- src/fs/test_fs_namespace.c | 2 +- src/fs/test_fs_publish.c | 2 +- src/fs/test_fs_search.c | 2 +- src/fs/test_fs_start_stop.c | 2 +- src/fs/test_fs_unindex.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist.c | 2 +- src/peerinfo/test_peerinfo_api.c | 2 +- src/statistics/test_statistics_api.c | 4 ++-- src/testing/testing.c | 10 +++++----- src/testing/testing_group.c | 4 ++-- src/transport/test_transport_api.c | 2 +- src/util/crypto_ksk.c | 2 +- src/util/test_resolver_api.c | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index a29ec0da6..847d838cd 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -213,7 +213,7 @@ arm_service_report (void *cls, GNUNET_free (pos); return; } - pid = GNUNET_OS_start_process (binary, binary, "-d", "-c", config, + pid = GNUNET_OS_start_process (NULL, NULL, binary, binary, "-d", "-c", config, #if DEBUG_ARM "-L", "DEBUG", #endif diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 8994b31a7..e8bfdd4e5 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -156,7 +156,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 34adf0c7d..93e875c8c 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -351,7 +351,7 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - pid = GNUNET_OS_start_process ("gnunet-service-arm", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 5d4443cbe..74c2ae206 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -558,7 +558,7 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - pid = GNUNET_OS_start_process ("gnunet-service-arm", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index a889f7c1c..62d1e5d26 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -330,7 +330,7 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - pid = GNUNET_OS_start_process ("gnunet-service-arm", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 3968068e4..af1fbfa50 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -238,7 +238,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 60dca2ec4..ce704f500 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -199,7 +199,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index d0db8dfcf..5c60b9437 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -60,7 +60,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index b51fb1cba..6ea074807 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -188,7 +188,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 973018b04..4320f965f 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -190,7 +190,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index a6f902962..e11684b70 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -57,7 +57,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index b8fac3b12..2690fc0e1 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -196,7 +196,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index f9d2e9169..eca93a624 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -138,7 +138,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE "-L", "DEBUG", diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 0bea99b01..973838006 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -175,7 +175,7 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - pid = GNUNET_OS_start_process ("gnunet-service-peerinfo", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo", "gnunet-service-peerinfo", #if DEBUG_PEERINFO "-L", "DEBUG", diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index e8c673eae..8a4a5e911 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -129,7 +129,7 @@ check () struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - pid = GNUNET_OS_start_process ("gnunet-service-statistics", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics", "gnunet-service-statistics", #if DEBUG_STATISTICS "-L", "DEBUG", @@ -147,7 +147,7 @@ check () return ok; ok = 1; /* restart to check persistence! */ - pid = GNUNET_OS_start_process ("gnunet-service-statistics", + pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics", "gnunet-service-statistics", #if DEBUG_STATISTICS "-L", "DEBUG", diff --git a/src/testing/testing.c b/src/testing/testing.c index c9597cd2e..ed1541873 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -168,7 +168,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /* start GNUnet on remote host */ if (NULL == d->hostname) { - d->pid = GNUNET_OS_start_process ("gnunet-service-arm", + d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", "-c", d->cfgfile, #if DEBUG_TESTING @@ -182,7 +182,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_asprintf (&dst, "%s@%s", d->username, d->hostname); else dst = GNUNET_strdup (d->hostname); - d->pid = GNUNET_OS_start_process ("ssh", + d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", dst, "gnunet-service-arm", @@ -428,7 +428,7 @@ GNUNET_TESTING_daemon_start (struct GNUNET_SCHEDULER_Handle *sched, GNUNET_asprintf (&arg, "%s@%s:%s", username, hostname, ret->cfgfile); else GNUNET_asprintf (&arg, "%s:%s", hostname, ret->cfgfile); - ret->pid = GNUNET_OS_start_process ("scp", + ret->pid = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", ret->cfgfile, arg, NULL); GNUNET_free (arg); if (-1 == ret->pid) @@ -520,7 +520,7 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, GNUNET_asprintf (&dst, "%s@%s", d->username, d->hostname); else dst = GNUNET_strdup (d->hostname); - d->pid = GNUNET_OS_start_process ("ssh", + d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", dst, "rm", d->cfgfile, NULL); GNUNET_free (dst); if (-1 == d->pid) @@ -606,7 +606,7 @@ GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d, GNUNET_asprintf (&arg, "%s@%s:%s", d->username, d->hostname, d->cfgfile); else GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile); - d->pid = GNUNET_OS_start_process ("scp", "scp", d->cfgfile, arg, NULL); + d->pid = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", d->cfgfile, arg, NULL); GNUNET_free (arg); if (-1 == d->pid) { diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 467fab053..744e505ce 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c @@ -792,7 +792,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) if (pg->peers[pg_iter].daemon->hostname == NULL) /* Local, just copy the file */ { GNUNET_asprintf (&arg, "%s/friends", temp_service_path); - pid = GNUNET_OS_start_process ("mv", + pid = GNUNET_OS_start_process (NULL, NULL, "mv", "mv", mytemp, arg, NULL); #if VERBOSE_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -806,7 +806,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) GNUNET_asprintf (&arg, "%s@%s:%s/friends", pg->peers[pg_iter].daemon->username, pg->peers[pg_iter].daemon->hostname, temp_service_path); else GNUNET_asprintf (&arg, "%s:%s/friends", pg->peers[pg_iter].daemon->hostname, temp_service_path); - pid = GNUNET_OS_start_process ("scp", + pid = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg, NULL); #if VERBOSE_TESTING GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index bc9971877..b7e34f810 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -169,7 +169,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm", + p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", #if VERBOSE_ARM "-L", "DEBUG", diff --git a/src/util/crypto_ksk.c b/src/util/crypto_ksk.c index 96f8140ad..5a7069d74 100644 --- a/src/util/crypto_ksk.c +++ b/src/util/crypto_ksk.c @@ -811,7 +811,7 @@ entropy_generator (void *cls, } GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"), "find"); - genproc = GNUNET_OS_start_process ("sh", + genproc = GNUNET_OS_start_process (NULL, NULL, "sh", "sh", "-c", "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null", diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 7cef33e60..194ed2f8f 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -177,7 +177,7 @@ check () pfx, DIR_SEPARATOR); GNUNET_free (pfx); - pid = GNUNET_OS_start_process (fn, + pid = GNUNET_OS_start_process (NULL, NULL, fn, "gnunet-service-resolver", #if VERBOSE "-L", "DEBUG", -- 2.25.1