aboutsummaryrefslogtreecommitdiff
path: root/src/gns/gnunet-gns-import.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gns/gnunet-gns-import.c')
-rw-r--r--src/gns/gnunet-gns-import.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index 3c95e782d..78db28cab 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -87,8 +87,7 @@ static int ret;
87 87
88 88
89static int 89static int
90run_process_and_wait (int pipe_control, 90run_process_and_wait (enum GNUNET_OS_InheritStdioFlags std_inheritance,
91 enum GNUNET_OS_InheritStdioFlags std_inheritance,
92 struct GNUNET_DISK_PipeHandle *pipe_stdin, 91 struct GNUNET_DISK_PipeHandle *pipe_stdin,
93 struct GNUNET_DISK_PipeHandle *pipe_stdout, 92 struct GNUNET_DISK_PipeHandle *pipe_stdout,
94 enum GNUNET_OS_ProcessStatusType *st, 93 enum GNUNET_OS_ProcessStatusType *st,
@@ -120,7 +119,7 @@ run_process_and_wait (int pipe_control,
120 va_end (apc2); 119 va_end (apc2);
121 if (arglen > 0) 120 if (arglen > 0)
122 argp[-1] = '\0'; 121 argp[-1] = '\0';
123 p = GNUNET_OS_start_process_va (pipe_control, std_inheritance, 122 p = GNUNET_OS_start_process_va (std_inheritance,
124 pipe_stdin, 123 pipe_stdin,
125 pipe_stdout, 124 pipe_stdout,
126 NULL, 125 NULL,
@@ -222,7 +221,7 @@ zone_iteration_error (void *cls)
222 221
223 if (! found_private_rec) 222 if (! found_private_rec)
224 { 223 {
225 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 224 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
226 NULL, NULL, &st, &code, 225 NULL, NULL, &st, &code,
227 "gnunet-namestore", 226 "gnunet-namestore",
228 "gnunet-namestore", "-z", "master-zone", 227 "gnunet-namestore", "-z", "master-zone",
@@ -236,7 +235,7 @@ zone_iteration_error (void *cls)
236 } 235 }
237 if (! found_pin_rec) 236 if (! found_pin_rec)
238 { 237 {
239 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 238 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
240 NULL, NULL, &st, &code, 239 NULL, NULL, &st, &code,
241 "gnunet-namestore", 240 "gnunet-namestore",
242 "gnunet-namestore", "-z", "master-zone", 241 "gnunet-namestore", "-z", "master-zone",
@@ -385,7 +384,8 @@ run (void *cls, char *const *args, const char *cfgfile,
385 384
386 cfg = c; 385 cfg = c;
387 386
388 if (0 != run_process_and_wait (GNUNET_NO, 0, NULL, NULL, &st, &code, 387 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_NONE,
388 NULL, NULL, &st, &code,
389 "gnunet-arm", 389 "gnunet-arm",
390 "gnunet-arm", "-I", NULL)) 390 "gnunet-arm", "-I", NULL))
391 { 391 {
@@ -395,60 +395,60 @@ run (void *cls, char *const *args, const char *cfgfile,
395 return; 395 return;
396 } 396 }
397 397
398 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 398 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
399 NULL, NULL, &st, &code, 399 NULL, NULL, &st, &code,
400 "gnunet-identity", 400 "gnunet-identity",
401 "gnunet-identity", "-C", "master-zone", NULL)) 401 "gnunet-identity", "-C", "master-zone", NULL))
402 return; 402 return;
403 403
404 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 404 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
405 NULL, NULL, &st, &code, 405 NULL, NULL, &st, &code,
406 "gnunet-identity", 406 "gnunet-identity",
407 "gnunet-identity", "-C", "private-zone", NULL)) 407 "gnunet-identity", "-C", "private-zone", NULL))
408 return; 408 return;
409 409
410 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 410 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
411 NULL, NULL, &st, &code, 411 NULL, NULL, &st, &code,
412 "gnunet-identity", 412 "gnunet-identity",
413 "gnunet-identity", "-C", "sks-zone", NULL)) 413 "gnunet-identity", "-C", "sks-zone", NULL))
414 return; 414 return;
415 415
416 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 416 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
417 NULL, NULL, &st, &code, 417 NULL, NULL, &st, &code,
418 "gnunet-identity", 418 "gnunet-identity",
419 "gnunet-identity", "-e", "master-zone", "-s", 419 "gnunet-identity", "-e", "master-zone", "-s",
420 "gns-master", NULL)) 420 "gns-master", NULL))
421 return; 421 return;
422 422
423 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 423 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
424 NULL, NULL, &st, &code, 424 NULL, NULL, &st, &code,
425 "gnunet-identity", 425 "gnunet-identity",
426 "gnunet-identity", "-e", "master-zone", "-s", 426 "gnunet-identity", "-e", "master-zone", "-s",
427 "namestore", NULL)) 427 "namestore", NULL))
428 return; 428 return;
429 429
430 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 430 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
431 NULL, NULL, &st, &code, 431 NULL, NULL, &st, &code,
432 "gnunet-identity", 432 "gnunet-identity",
433 "gnunet-identity", "-e", "master-zone", "-s", 433 "gnunet-identity", "-e", "master-zone", "-s",
434 "gns-proxy", NULL)) 434 "gns-proxy", NULL))
435 return; 435 return;
436 436
437 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 437 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
438 NULL, NULL, &st, &code, 438 NULL, NULL, &st, &code,
439 "gnunet-identity", 439 "gnunet-identity",
440 "gnunet-identity", "-e", "master-zone", "-s", 440 "gnunet-identity", "-e", "master-zone", "-s",
441 "gns-intercept", NULL)) 441 "gns-intercept", NULL))
442 return; 442 return;
443 443
444 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 444 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
445 NULL, NULL, &st, &code, 445 NULL, NULL, &st, &code,
446 "gnunet-identity", 446 "gnunet-identity",
447 "gnunet-identity", "-e", "private-zone", "-s", 447 "gnunet-identity", "-e", "private-zone", "-s",
448 "gns-private", NULL)) 448 "gns-private", NULL))
449 return; 449 return;
450 450
451 if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 451 if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
452 NULL, NULL, &st, &code, 452 NULL, NULL, &st, &code,
453 "gnunet-identity", 453 "gnunet-identity",
454 "gnunet-identity", "-e", "sks-zone", "-s", 454 "gnunet-identity", "-e", "sks-zone", "-s",