commit 5820a6d60cad1a01c23ad4f060aaaf843325f444 parent 477f8d08a4678c473fd055c1d9991733eff1e03a Author: Christian Grothoff <christian@grothoff.org> Date: Mon, 16 Mar 2026 23:37:41 +0100 adapt to revised GNUNET_process() API one more time Diffstat:
21 files changed, 270 insertions(+), 288 deletions(-)
diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c @@ -320,7 +320,7 @@ static enum GNUNET_GenericReturnValue parallel_benchmark (void) { enum GNUNET_GenericReturnValue result = GNUNET_OK; - struct GNUNET_OS_Process *wirewatch[GNUNET_NZL (start_wirewatch)]; + struct GNUNET_Process *wirewatch[GNUNET_NZL (start_wirewatch)]; memset (wirewatch, 0, @@ -328,28 +328,32 @@ parallel_benchmark (void) /* start exchange wirewatch */ for (unsigned int w = 0; w<start_wirewatch; w++) { - wirewatch[w] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-wirewatch", - "taler-exchange-wirewatch", - "-c", cfg_filename, - "-a", exchange_bank_section, - "-S", SHARD_SIZE, - (NULL != loglev) ? "-L" : NULL, - loglev, - NULL); - if (NULL == wirewatch[w]) + wirewatch[w] = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ALL); + if (GNUNET_OK != + GNUNET_process_run_command_va (wirewatch[w], + "taler-exchange-wirewatch", + "taler-exchange-wirewatch", + "-c", cfg_filename, + "-a", exchange_bank_section, + "-S", SHARD_SIZE, + (NULL != loglev) ? "-L" : NULL, + loglev, + NULL)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to launch wirewatch, aborting benchmark\n"); + GNUNET_process_destroy (wirewatch[w]); for (unsigned int x = 0; x<w; x++) { - GNUNET_break (0 == - GNUNET_OS_process_kill (wirewatch[x], - SIGTERM)); GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch[x])); - GNUNET_OS_process_destroy (wirewatch[x]); + GNUNET_process_kill (wirewatch[x], + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_process_wait (wirewatch[x], + true, + NULL, + NULL)); + GNUNET_process_destroy (wirewatch[x]); wirewatch[x] = NULL; } return GNUNET_SYSERR; @@ -360,57 +364,75 @@ parallel_benchmark (void) if (0 != start_wirewatch) { /* replace ONE of the wirewatchers with one that is in test-mode */ - GNUNET_break (0 == - GNUNET_OS_process_kill (wirewatch[0], - SIGTERM)); GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch[0])); - GNUNET_OS_process_destroy (wirewatch[0]); - wirewatch[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-wirewatch", - "taler-exchange-wirewatch", - "-c", cfg_filename, - "-a", exchange_bank_section, - "-S", SHARD_SIZE, - "-t", - (NULL != loglev) ? "-L" : NULL, - loglev, - NULL); - /* wait for it to finish! */ + GNUNET_process_kill (wirewatch[0], + SIGTERM)); GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch[0])); - GNUNET_OS_process_destroy (wirewatch[0]); + GNUNET_process_wait (wirewatch[0], + true, + NULL, + NULL)); + GNUNET_process_destroy (wirewatch[0]); + wirewatch[0] = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ALL); + if (GNUNET_OK == + GNUNET_process_run_command_va (wirewatch[0], + "taler-exchange-wirewatch", + "taler-exchange-wirewatch", + "-c", cfg_filename, + "-a", exchange_bank_section, + "-S", SHARD_SIZE, + "-t", + (NULL != loglev) ? "-L" : NULL, + loglev, + NULL)) + { + /* wait for it to finish! */ + GNUNET_break (GNUNET_OK == + GNUNET_process_wait (wirewatch[0], + true, + NULL, + NULL)); + } + GNUNET_process_destroy (wirewatch[0]); wirewatch[0] = NULL; /* Then stop the rest, which should basically also be finished */ for (unsigned int w = 1; w<start_wirewatch; w++) { - GNUNET_break (0 == - GNUNET_OS_process_kill (wirewatch[w], - SIGTERM)); GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch[w])); - GNUNET_OS_process_destroy (wirewatch[w]); + GNUNET_process_kill (wirewatch[w], + SIGTERM)); + GNUNET_break (GNUNET_OK == + GNUNET_process_wait (wirewatch[w], + true, + NULL, + NULL)); + GNUNET_process_destroy (wirewatch[w]); } /* But be extra sure we did finish all shards by doing one more */ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Shard check phase\n"); - wirewatch[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, - NULL, NULL, NULL, - "taler-exchange-wirewatch", - "taler-exchange-wirewatch", - "-c", cfg_filename, - "-a", exchange_bank_section, - "-S", SHARD_SIZE, - "-t", - (NULL != loglev) ? "-L" : NULL, - loglev, - NULL); - /* wait for it to finish! */ - GNUNET_break (GNUNET_OK == - GNUNET_OS_process_wait (wirewatch[0])); - GNUNET_OS_process_destroy (wirewatch[0]); + wirewatch[0] = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ALL); + if (GNUNET_OK == + GNUNET_process_run_command_va (wirewatch[0], + "taler-exchange-wirewatch", + "taler-exchange-wirewatch", + "-c", cfg_filename, + "-a", exchange_bank_section, + "-S", SHARD_SIZE, + "-t", + (NULL != loglev) ? "-L" : NULL, + loglev, + NULL)) + { + /* wait for it to finish! */ + GNUNET_break (GNUNET_OK == + GNUNET_process_wait (wirewatch[0], + true, + NULL, + NULL)); + } + GNUNET_process_destroy (wirewatch[0]); wirewatch[0] = NULL; } diff --git a/src/json/conversion.c b/src/json/conversion.c @@ -315,7 +315,7 @@ TALER_JSON_external_conversion_start (const json_t *input, GNUNET_assert (NULL != pipe_stdin); pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_WRITE); GNUNET_assert (NULL != pipe_stdout); - ec->helper = GNUNET_process_create (); + ec->helper = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); GNUNET_assert (GNUNET_OK == GNUNET_process_set_options ( ec->helper, @@ -323,12 +323,10 @@ TALER_JSON_external_conversion_start (const json_t *input, STDIN_FILENO), GNUNET_process_option_inherit_wpipe (pipe_stdout, STDOUT_FILENO))); - if ( (GNUNET_OK != - GNUNET_process_set_command_argv (ec->helper, - binary, - argv)) || - (GNUNET_OK != - GNUNET_process_start (ec->helper)) ) + if (GNUNET_OK != + GNUNET_process_run_command_argv (ec->helper, + binary, + argv)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to run conversion helper `%s'\n", diff --git a/src/kyclogic/kyclogic_sanctions.c b/src/kyclogic/kyclogic_sanctions.c @@ -464,7 +464,7 @@ TALER_KYCLOGIC_sanction_rater_start (const char *binary, GNUNET_assert (NULL != pipe_stdin); pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_WRITE); GNUNET_assert (NULL != pipe_stdout); - sr->helper = GNUNET_process_create (); + sr->helper = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); GNUNET_assert (GNUNET_OK == GNUNET_process_set_options ( sr->helper, @@ -472,12 +472,10 @@ TALER_KYCLOGIC_sanction_rater_start (const char *binary, STDIN_FILENO), GNUNET_process_option_inherit_wpipe (pipe_stdout, STDOUT_FILENO))); - if ( (GNUNET_OK != - GNUNET_process_set_command_argv (sr->helper, - binary, - (const char **) argv)) || - (GNUNET_OK != - GNUNET_process_start (sr->helper)) ) + if (GNUNET_OK != + GNUNET_process_run_command_argv (sr->helper, + binary, + (const char **) argv)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to run conversion helper `%s'\n", diff --git a/src/mhd/mhd_typst.c b/src/mhd/mhd_typst.c @@ -413,13 +413,11 @@ complete_response (void *cls) argv[tc->num_stages + 2] = "output"; argv[tc->num_stages + 3] = tc->output_file; argv[tc->num_stages + 4] = NULL; - tc->proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_argv (tc->proc, - argv[0], - argv)) || - (GNUNET_OK != - GNUNET_process_start (tc->proc)) ) + tc->proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_argv (tc->proc, + argv[0], + argv)) { GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork"); @@ -687,13 +685,11 @@ setup_stage (struct TypstStage *stage, argv[2] = input; argv[3] = NULL; } - stage->proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_argv (stage->proc, - "typst", - argv)) || - (GNUNET_OK != - GNUNET_process_start (stage->proc)) ) + stage->proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_argv (stage->proc, + "typst", + argv)) { GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork"); diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor.c b/src/testing/testing_api_cmd_auditor_exec_auditor.c @@ -65,16 +65,14 @@ auditor_run (void *cls, // FIXME: taler-auditor is no more, run the individual // helpers here instead, or re-introduce the taler-auditor // command to run all helpers! - ks->auditor_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (ks->auditor_proc, - "taler-auditor", - "taler-auditor", - "-c", ks->config_filename, - "-I", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->auditor_proc)) ) + ks->auditor_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (ks->auditor_proc, + "taler-auditor", + "taler-auditor", + "-c", ks->config_filename, + "-I", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->auditor_proc); diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c b/src/testing/testing_api_cmd_auditor_exec_auditor_dbinit.c @@ -62,16 +62,15 @@ auditor_dbinit_run (void *cls, struct AuditorDbinitState *ks = cls; (void) cmd; - ks->auditor_dbinit_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (ks->auditor_dbinit_proc, - "taler-auditor-dbinit", - "taler-auditor-dbinit", - "-c", ks->config_filename, - "-R", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->auditor_dbinit_proc)) ) + ks->auditor_dbinit_proc + = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (ks->auditor_dbinit_proc, + "taler-auditor-dbinit", + "taler-auditor-dbinit", + "-c", ks->config_filename, + "-R", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->auditor_dbinit_proc); diff --git a/src/testing/testing_api_cmd_exec_aggregator.c b/src/testing/testing_api_cmd_exec_aggregator.c @@ -66,20 +66,18 @@ aggregator_run (void *cls, struct AggregatorState *as = cls; (void) cmd; - as->aggregator_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (as->aggregator_proc, - "taler-exchange-aggregator", - "taler-exchange-aggregator", - "-c", as->config_filename, - "-L", "INFO", - "-t", /* exit when done */ - (as->kyc_on) + as->aggregator_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (as->aggregator_proc, + "taler-exchange-aggregator", + "taler-exchange-aggregator", + "-c", as->config_filename, + "-L", "INFO", + "-t", /* exit when done */ + (as->kyc_on) ? NULL : "-y", /* skip KYC */ - NULL)) || - (GNUNET_OK != - GNUNET_process_start (as->aggregator_proc)) ) + NULL)) { GNUNET_break (0); GNUNET_process_destroy (as->aggregator_proc); diff --git a/src/testing/testing_api_cmd_exec_auditor-offline.c b/src/testing/testing_api_cmd_exec_auditor-offline.c @@ -62,19 +62,17 @@ auditor_offline_run (void *cls, struct AuditorOfflineState *as = cls; (void) cmd; - as->auditor_offline_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (as->auditor_offline_proc, - "taler-auditor-offline", - "taler-auditor-offline", - "-c", as->config_filename, - "-L", "INFO", - "download", - "sign", - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (as->auditor_offline_proc)) ) + as->auditor_offline_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (as->auditor_offline_proc, + "taler-auditor-offline", + "taler-auditor-offline", + "-c", as->config_filename, + "-L", "INFO", + "download", + "sign", + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (as->auditor_offline_proc); diff --git a/src/testing/testing_api_cmd_exec_closer.c b/src/testing/testing_api_cmd_exec_closer.c @@ -102,16 +102,14 @@ closer_run (void *cls, } as->reserve_pub = *reserve_pubp; } - as->closer_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (as->closer_proc, - "taler-exchange-closer", - "taler-exchange-closer", - "-c", as->config_filename, - "-t", /* exit when done */ - NULL)) || - (GNUNET_OK != - GNUNET_process_start (as->closer_proc)) ) + as->closer_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (as->closer_proc, + "taler-exchange-closer", + "taler-exchange-closer", + "-c", as->config_filename, + "-t", /* exit when done */ + NULL)) { GNUNET_break (0); GNUNET_process_destroy (as->closer_proc); diff --git a/src/testing/testing_api_cmd_exec_expire.c b/src/testing/testing_api_cmd_exec_expire.c @@ -62,16 +62,14 @@ expire_run (void *cls, struct ExpireState *ws = cls; (void) cmd; - ws->expire_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (ws->expire_proc, - "taler-exchange-expire", - "taler-exchange-expire", - "-c", ws->config_filename, - "-t", /* exit when done */ - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ws->expire_proc)) ) + ws->expire_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (ws->expire_proc, + "taler-exchange-expire", + "taler-exchange-expire", + "-c", ws->config_filename, + "-t", /* exit when done */ + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ws->expire_proc); diff --git a/src/testing/testing_api_cmd_exec_router.c b/src/testing/testing_api_cmd_exec_router.c @@ -62,16 +62,14 @@ router_run (void *cls, struct RouterState *ws = cls; (void) cmd; - ws->router_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (ws->router_proc, - "taler-exchange-router", - "taler-exchange-router", - "-c", ws->config_filename, - "-t", /* exit when done */ - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ws->router_proc)) ) + ws->router_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (ws->router_proc, + "taler-exchange-router", + "taler-exchange-router", + "-c", ws->config_filename, + "-t", /* exit when done */ + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ws->router_proc); diff --git a/src/testing/testing_api_cmd_exec_transfer.c b/src/testing/testing_api_cmd_exec_transfer.c @@ -61,18 +61,16 @@ transfer_run (void *cls, struct TransferState *as = cls; (void) cmd; - as->transfer_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (as->transfer_proc, - "taler-exchange-transfer", - "taler-exchange-transfer", - "-c", as->config_filename, - "-S", "1", - "-w", "0", - "-t", /* exit when done */ - NULL)) || - (GNUNET_OK != - GNUNET_process_start (as->transfer_proc)) ) + as->transfer_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (as->transfer_proc, + "taler-exchange-transfer", + "taler-exchange-transfer", + "-c", as->config_filename, + "-S", "1", + "-w", "0", + "-t", /* exit when done */ + NULL)) { GNUNET_break (0); GNUNET_process_destroy (as->transfer_proc); diff --git a/src/testing/testing_api_cmd_exec_wget.c b/src/testing/testing_api_cmd_exec_wget.c @@ -60,15 +60,13 @@ wget_run (void *cls, struct WgetState *ws = cls; (void) cmd; - ws->wget_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va (ws->wget_proc, - "wget", - "wget", - ws->url, - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ws->wget_proc)) ) + ws->wget_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va (ws->wget_proc, + "wget", + "wget", + ws->url, + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ws->wget_proc); diff --git a/src/testing/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c @@ -66,24 +66,22 @@ wirewatch_run (void *cls, struct WirewatchState *ws = cls; (void) cmd; - ws->wirewatch_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - ws->wirewatch_proc, - "taler-exchange-wirewatch", - "taler-exchange-wirewatch", - "-c", ws->config_filename, - "-L", "INFO", - "-S", "1", - "-w", "0", - "-t", /* exit when done */ - (NULL == ws->account_section) + ws->wirewatch_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + ws->wirewatch_proc, + "taler-exchange-wirewatch", + "taler-exchange-wirewatch", + "-c", ws->config_filename, + "-L", "INFO", + "-S", "1", + "-w", "0", + "-t", /* exit when done */ + (NULL == ws->account_section) ? NULL : "-a", - ws->account_section, - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ws->wirewatch_proc)) ) + ws->account_section, + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ws->wirewatch_proc); diff --git a/src/testing/testing_api_cmd_offline_sign_extensions.c b/src/testing/testing_api_cmd_offline_sign_extensions.c @@ -62,20 +62,19 @@ extensionssign_run (void *cls, { struct ExtensionsSignState *ks = cls; - ks->extensionssign_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - ks->extensionssign_proc, - "taler-exchange-offline", - "taler-exchange-offline", - "-c", ks->config_filename, - "-L", "INFO", - "extensions", - "sign", - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->extensionssign_proc)) ) + ks->extensionssign_proc + = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + ks->extensionssign_proc, + "taler-exchange-offline", + "taler-exchange-offline", + "-c", ks->config_filename, + "-L", "INFO", + "extensions", + "sign", + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->extensionssign_proc); diff --git a/src/testing/testing_api_cmd_offline_sign_global_fees.c b/src/testing/testing_api_cmd_offline_sign_global_fees.c @@ -109,26 +109,24 @@ offlinesign_run (void *cls, "%s", GNUNET_TIME_relative2s (ks->purse_timeout, false)); - ks->offlinesign_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - ks->offlinesign_proc, - "taler-exchange-offline", - "taler-exchange-offline", - "-c", ks->config_filename, - "-L", "INFO", - "global-fee", - "now", - ks->history_fee_s, - ks->account_fee_s, - ks->purse_fee_s, - purse_timeout, - history_expiration, - num_purses, - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->offlinesign_proc)) ) + ks->offlinesign_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + ks->offlinesign_proc, + "taler-exchange-offline", + "taler-exchange-offline", + "-c", ks->config_filename, + "-L", "INFO", + "global-fee", + "now", + ks->history_fee_s, + ks->account_fee_s, + ks->purse_fee_s, + purse_timeout, + history_expiration, + num_purses, + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->offlinesign_proc); diff --git a/src/testing/testing_api_cmd_offline_sign_keys.c b/src/testing/testing_api_cmd_offline_sign_keys.c @@ -63,20 +63,18 @@ offlinesign_run (void *cls, { struct OfflineSignState *ks = cls; - ks->offlinesign_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - ks->offlinesign_proc, - "taler-exchange-offline", - "taler-exchange-offline", - "-c", ks->config_filename, - "-L", "INFO", - "download", - "sign", - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->offlinesign_proc)) ) + ks->offlinesign_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + ks->offlinesign_proc, + "taler-exchange-offline", + "taler-exchange-offline", + "-c", ks->config_filename, + "-L", "INFO", + "download", + "sign", + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->offlinesign_proc); diff --git a/src/testing/testing_api_cmd_offline_sign_wire_fees.c b/src/testing/testing_api_cmd_offline_sign_wire_fees.c @@ -73,23 +73,21 @@ offlinesign_run (void *cls, { struct OfflineSignState *ks = cls; - ks->offlinesign_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - ks->offlinesign_proc, - "taler-exchange-offline", - "taler-exchange-offline", - "-c", ks->config_filename, - "-L", "INFO", - "wire-fee", - "now", - "x-taler-bank", - ks->wire_fee_s, - ks->closing_fee_s, - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (ks->offlinesign_proc)) ) + ks->offlinesign_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + ks->offlinesign_proc, + "taler-exchange-offline", + "taler-exchange-offline", + "-c", ks->config_filename, + "-L", "INFO", + "wire-fee", + "now", + "x-taler-bank", + ks->wire_fee_s, + ks->closing_fee_s, + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (ks->offlinesign_proc); diff --git a/src/testing/testing_api_cmd_revoke.c b/src/testing/testing_api_cmd_revoke.c @@ -162,18 +162,16 @@ revoke_run (void *cls, rs->dhks = GNUNET_STRINGS_data_to_string_alloc ( &denom_pub->h_key, sizeof (struct GNUNET_HashCode)); - rs->revoke_proc = GNUNET_process_create (); - if ( (GNUNET_OK != - GNUNET_process_set_command_va ( - rs->revoke_proc, - "taler-exchange-offline", - "taler-exchange-offline", - "-c", rs->config_filename, - "revoke-denomination", rs->dhks, - "upload", - NULL)) || - (GNUNET_OK != - GNUNET_process_start (rs->revoke_proc)) ) + rs->revoke_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); + if (GNUNET_OK != + GNUNET_process_run_command_va ( + rs->revoke_proc, + "taler-exchange-offline", + "taler-exchange-offline", + "-c", rs->config_filename, + "revoke-denomination", rs->dhks, + "upload", + NULL)) { GNUNET_break (0); GNUNET_process_destroy (rs->revoke_proc); diff --git a/src/testing/testing_api_cmd_system_start.c b/src/testing/testing_api_cmd_system_start.c @@ -238,7 +238,7 @@ system_run (void *cls, GNUNET_assert (NULL != as->pipe_in); as->pipe_out = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE); GNUNET_assert (NULL != as->pipe_out); - as->system_proc = GNUNET_process_create (); + as->system_proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); GNUNET_assert (GNUNET_OK == GNUNET_process_set_options ( as->system_proc, @@ -246,12 +246,10 @@ system_run (void *cls, STDIN_FILENO), GNUNET_process_option_inherit_wpipe (as->pipe_out, STDOUT_FILENO))); - if ( (GNUNET_OK != - GNUNET_process_set_command_argv (as->system_proc, - "taler-unified-setup.sh", - (const char **) as->args)) || - (GNUNET_OK != - GNUNET_process_start (as->system_proc)) ) + if (GNUNET_OK != + GNUNET_process_run_command_argv (as->system_proc, + "taler-unified-setup.sh", + (const char **) as->args)) { GNUNET_break (0); GNUNET_process_destroy (as->system_proc); diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c @@ -171,16 +171,14 @@ start_process (const char *filename, struct GNUNET_Process *proc; va_list ap; - proc = GNUNET_process_create (); + proc = GNUNET_process_create (GNUNET_OS_INHERIT_STD_ERR); va_start (ap, filename); - if ( (GNUNET_OK != - GNUNET_process_set_command_ap ( - proc, - filename, - ap)) || - (GNUNET_OK != - GNUNET_process_start (proc)) ) + if (GNUNET_OK != + GNUNET_process_run_command_ap ( + proc, + filename, + ap)) { GNUNET_break (0); GNUNET_process_destroy (proc);