1 files changed, 139 insertions, 140 deletions

diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 826e5744c..4efbe91af 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file util/test_os_start_process.c
  * @brief testcase for os start process code
@@ -48,8 +48,7 @@ static struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
 
 static struct GNUNET_SCHEDULER_Task * die_task;
 
-struct read_context
-{
+struct read_context {
   char buf[16];
   int buf_offset;
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
@@ -60,126 +59,126 @@ static struct read_context rc;
 
 
 static void
-end_task (void *cls)
+end_task(void *cls)
 {
-  if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  }
-  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_destroy (proc);
+  if (0 != GNUNET_OS_process_kill(proc, GNUNET_TERM_SIG))
+    {
+      GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill");
+    }
+  GNUNET_assert(GNUNET_OK == GNUNET_OS_process_wait(proc));
+  GNUNET_OS_process_destroy(proc);
   proc = NULL;
-  GNUNET_DISK_pipe_close (hello_pipe_stdout);
-  GNUNET_DISK_pipe_close (hello_pipe_stdin);
+  GNUNET_DISK_pipe_close(hello_pipe_stdout);
+  GNUNET_DISK_pipe_close(hello_pipe_stdin);
 }
 
 
 static void
-read_call (void *cls)
+read_call(void *cls)
 {
   int bytes;
 
-  bytes = GNUNET_DISK_file_read (rc.stdout_read_handle,
-                                 &rc.buf[rc.buf_offset],
-                                 sizeof (rc.buf) - rc.buf_offset);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "bytes is %d\n",
-              bytes);
+  bytes = GNUNET_DISK_file_read(rc.stdout_read_handle,
+                                &rc.buf[rc.buf_offset],
+                                sizeof(rc.buf) - rc.buf_offset);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "bytes is %d\n",
+             bytes);
 
   if (bytes < 1)
-  {
-    GNUNET_break (0);
-    ok = 1;
-    GNUNET_SCHEDULER_cancel (die_task);
-    (void) GNUNET_SCHEDULER_add_now (&end_task, NULL);
-    return;
-  }
-
-  ok = strncmp (rc.buf, test_phrase, strlen (test_phrase));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "read %s\n",
-              &rc.buf[rc.buf_offset]);
+    {
+      GNUNET_break(0);
+      ok = 1;
+      GNUNET_SCHEDULER_cancel(die_task);
+      (void)GNUNET_SCHEDULER_add_now(&end_task, NULL);
+      return;
+    }
+
+  ok = strncmp(rc.buf, test_phrase, strlen(test_phrase));
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "read %s\n",
+             &rc.buf[rc.buf_offset]);
   rc.buf_offset += bytes;
 
   if (0 == ok)
-  {
-    GNUNET_SCHEDULER_cancel (die_task);
-    (void) GNUNET_SCHEDULER_add_now (&end_task, NULL);
-    return;
-  }
-
-  GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                  rc.stdout_read_handle,
-                                  &read_call,
-                                  NULL);
+    {
+      GNUNET_SCHEDULER_cancel(die_task);
+      (void)GNUNET_SCHEDULER_add_now(&end_task, NULL);
+      return;
+    }
+
+  GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                 rc.stdout_read_handle,
+                                 &read_call,
+                                 NULL);
 }
 
 
 static void
-run_task (void *cls)
+run_task(void *cls)
 {
   char *fn;
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
   const struct GNUNET_DISK_FileHandle *wh;
 
 #if !WINDOWS
-  GNUNET_asprintf (&fn, "cat");
+  GNUNET_asprintf(&fn, "cat");
 #else
-  GNUNET_asprintf (&fn, "w32cat");
+  GNUNET_asprintf(&fn, "w32cat");
 #endif
 
-  hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
-  hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  hello_pipe_stdin = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
+  hello_pipe_stdout = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
 
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
-  {
-    GNUNET_break (0);
-    ok = 1;
-    GNUNET_free (fn);
-    return;
-  }
+    {
+      GNUNET_break(0);
+      ok = 1;
+      GNUNET_free(fn);
+      return;
+    }
 
   proc =
-      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
-                               hello_pipe_stdin, hello_pipe_stdout, NULL,
-                               fn,
-                               "test_gnunet_echo_hello", "-", NULL);
-  GNUNET_free (fn);
+    GNUNET_OS_start_process(GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
+                            hello_pipe_stdin, hello_pipe_stdout, NULL,
+                            fn,
+                            "test_gnunet_echo_hello", "-", NULL);
+  GNUNET_free(fn);
 
   /* Close the write end of the read pipe */
-  GNUNET_DISK_pipe_close_end (hello_pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+  GNUNET_DISK_pipe_close_end(hello_pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
   /* Close the read end of the write pipe */
-  GNUNET_DISK_pipe_close_end (hello_pipe_stdin, GNUNET_DISK_PIPE_END_READ);
+  GNUNET_DISK_pipe_close_end(hello_pipe_stdin, GNUNET_DISK_PIPE_END_READ);
 
-  wh = GNUNET_DISK_pipe_handle (hello_pipe_stdin, GNUNET_DISK_PIPE_END_WRITE);
+  wh = GNUNET_DISK_pipe_handle(hello_pipe_stdin, GNUNET_DISK_PIPE_END_WRITE);
 
   /* Write the test_phrase to the cat process */
-  if (GNUNET_DISK_file_write (wh, test_phrase, strlen (test_phrase) + 1) !=
-      strlen (test_phrase) + 1)
-  {
-    GNUNET_break (0);
-    ok = 1;
-    return;
-  }
+  if (GNUNET_DISK_file_write(wh, test_phrase, strlen(test_phrase) + 1) !=
+      strlen(test_phrase) + 1)
+    {
+      GNUNET_break(0);
+      ok = 1;
+      return;
+    }
 
   /* Close the write end to end the cycle! */
-  GNUNET_DISK_pipe_close_end (hello_pipe_stdin, GNUNET_DISK_PIPE_END_WRITE);
+  GNUNET_DISK_pipe_close_end(hello_pipe_stdin, GNUNET_DISK_PIPE_END_WRITE);
 
   stdout_read_handle =
-      GNUNET_DISK_pipe_handle (hello_pipe_stdout, GNUNET_DISK_PIPE_END_READ);
+    GNUNET_DISK_pipe_handle(hello_pipe_stdout, GNUNET_DISK_PIPE_END_READ);
 
   die_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_MINUTES, 1),
-                                    &end_task,
-                                    NULL);
+    GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
+                                   (GNUNET_TIME_UNIT_MINUTES, 1),
+                                 &end_task,
+                                 NULL);
 
-  memset (&rc, 0, sizeof (rc));
+  memset(&rc, 0, sizeof(rc));
   rc.stdout_read_handle = stdout_read_handle;
-  GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                  stdout_read_handle,
-                                  &read_call,
-                                  NULL);
+  GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                 stdout_read_handle,
+                                 &read_call,
+                                 NULL);
 }
 
 
@@ -188,10 +187,10 @@ run_task (void *cls)
  * checks that "ok" is correct at the end.
  */
 static int
-check_run ()
+check_run()
 {
   ok = 1;
-  GNUNET_SCHEDULER_run (&run_task, &ok);
+  GNUNET_SCHEDULER_run(&run_task, &ok);
   return ok;
 }
 
@@ -200,40 +199,40 @@ check_run ()
  * Test killing via pipe.
  */
 static int
-check_kill ()
+check_kill()
 {
   char *fn;
 
-  hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
-  hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  hello_pipe_stdin = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
+  hello_pipe_stdout = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
-  {
-    return 1;
-  }
-  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
+    {
+      return 1;
+    }
+  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,
-                             NULL,
-                             fn,
-                             "gnunet-service-resolver", "-",
-                             NULL);
+    GNUNET_OS_start_process(GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+                            hello_pipe_stdin,
+                            hello_pipe_stdout,
+                            NULL,
+                            fn,
+                            "gnunet-service-resolver", "-",
+                            NULL);
   if (NULL == proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to launch gnunet-service-resolver. Is your system setup correct?\n");
-    return 77;
-  }
-  sleep (1); /* give process time to start, so we actually use the pipe-kill mechanism! */
-  GNUNET_free (fn);
-  if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_destroy (proc);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Failed to launch gnunet-service-resolver. Is your system setup correct?\n");
+      return 77;
+    }
+  sleep(1);  /* give process time to start, so we actually use the pipe-kill mechanism! */
+  GNUNET_free(fn);
+  if (0 != GNUNET_OS_process_kill(proc, GNUNET_TERM_SIG))
+    GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill");
+  GNUNET_assert(GNUNET_OK == GNUNET_OS_process_wait(proc));
+  GNUNET_OS_process_destroy(proc);
   proc = NULL;
-  GNUNET_DISK_pipe_close (hello_pipe_stdout);
-  GNUNET_DISK_pipe_close (hello_pipe_stdin);
+  GNUNET_DISK_pipe_close(hello_pipe_stdout);
+  GNUNET_DISK_pipe_close(hello_pipe_stdin);
   return 0;
 }
 
@@ -242,55 +241,55 @@ check_kill ()
  * Test killing via pipe.
  */
 static int
-check_instant_kill ()
+check_instant_kill()
 {
   char *fn;
 
-  hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
-  hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  hello_pipe_stdin = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
+  hello_pipe_stdout = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
-  {
-    return 1;
-  }
-  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
+    {
+      return 1;
+    }
+  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, NULL,
-                             fn,
-                             "gnunet-service-resolver", "-", NULL);
+    GNUNET_OS_start_process(GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+                            hello_pipe_stdin, hello_pipe_stdout, NULL,
+                            fn,
+                            "gnunet-service-resolver", "-", NULL);
   if (NULL == proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to launch gnunet-service-resolver. Is your system setup correct?\n");
-    return 77;
-  }
-  if (0 != GNUNET_OS_process_kill (proc,
-                                   GNUNET_TERM_SIG))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  }
-  GNUNET_free (fn);
-  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_destroy (proc);
+    {
+      GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+                 "Failed to launch gnunet-service-resolver. Is your system setup correct?\n");
+      return 77;
+    }
+  if (0 != GNUNET_OS_process_kill(proc,
+                                  GNUNET_TERM_SIG))
+    {
+      GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill");
+    }
+  GNUNET_free(fn);
+  GNUNET_assert(GNUNET_OK == GNUNET_OS_process_wait(proc));
+  GNUNET_OS_process_destroy(proc);
   proc = NULL;
-  GNUNET_DISK_pipe_close (hello_pipe_stdout);
-  GNUNET_DISK_pipe_close (hello_pipe_stdin);
+  GNUNET_DISK_pipe_close(hello_pipe_stdout);
+  GNUNET_DISK_pipe_close(hello_pipe_stdin);
   return 0;
 }
 
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup ("test-os-start-process",
-                    "WARNING",
-                    NULL);
+  GNUNET_log_setup("test-os-start-process",
+                   "WARNING",
+                   NULL);
   ret = 0;
-  ret |= check_run ();
-  ret |= check_kill ();
-  ret |= check_instant_kill ();
+  ret |= check_run();
+  ret |= check_kill();
+  ret |= check_instant_kill();
   return ret;
 }