11 files changed, 62 insertions, 59 deletions

diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 78c93c3b8..e1aa94a5c 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -170,14 +170,15 @@ main (int argc, char *const *argv)
       1, &GNUNET_GETOPT_set_string, &value },
     GNUNET_GETOPT_OPTION_END
   };
-
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-config [OPTIONS]",
-                              gettext_noop ("Manipulate GNUnet configuration files"),
-                              options, &run, NULL)) ? 0 : ret;
+  ret = (GNUNET_OK ==
+         GNUNET_PROGRAM_run (argc, argv, "gnunet-config [OPTIONS]",
+                             gettext_noop ("Manipulate GNUnet configuration files"),
+                             options, &run, NULL)) ? 0 : ret;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-config.c */
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index f966763a8..ad6b68a95 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -233,14 +233,17 @@ main (int argc, char *const *argv)
       0, &GNUNET_GETOPT_set_one, &weak_random },
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-ecc [OPTIONS] keyfile",
-                              gettext_noop ("Manipulate GNUnet private ECC key files"),
-                              options, &run, NULL)) ? 0 : 1;
+  ret = (GNUNET_OK ==
+         GNUNET_PROGRAM_run (argc, argv, "gnunet-ecc [OPTIONS] keyfile",
+                             gettext_noop ("Manipulate GNUnet private ECC key files"),
+                             options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-ecc.c */
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index 559637748..6cb6ac564 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -149,14 +149,17 @@ main (int argc, char *const *argv)
       0, &GNUNET_GETOPT_set_one, &reverse },
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
-                              gettext_noop ("Use build-in GNUnet stub resolver"),
-                              options, &run, NULL)) ? 0 : 1;
+  ret = (GNUNET_OK ==
+         GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]",
+                             gettext_noop ("Use build-in GNUnet stub resolver"),
+                             options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-resolver.c */
diff --git a/src/util/gnunet-rsa.c b/src/util/gnunet-rsa.c
index d509bde67..597093ab1 100644
--- a/src/util/gnunet-rsa.c
+++ b/src/util/gnunet-rsa.c
@@ -222,7 +222,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  * @return 0 ok, 1 on error
  */
 int
-main (int argc, char *const *argv)
+main (int argc, char *const*argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     { 'g', "generate-keys", "COUNT",
@@ -242,14 +242,17 @@ main (int argc, char *const *argv)
       0, &GNUNET_GETOPT_set_one, &weak_random },
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-rsa [OPTIONS] keyfile",
-                              gettext_noop ("Manipulate GNUnet private RSA key files"),
-                              options, &run, NULL)) ? 0 : 1;
+  ret = (GNUNET_OK ==
+         GNUNET_PROGRAM_run (argc, argv, "gnunet-rsa [OPTIONS] keyfile",
+                             gettext_noop ("Manipulate GNUnet private RSA key files"),
+                             options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of gnunet-rsa.c */
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 8cc813be5..5ca1f4efc 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -162,6 +162,7 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_END
   };
   struct GNUNET_SIGNAL_Context *shc_chld;
+  int ret;
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
@@ -169,16 +170,15 @@ main (int argc, char *const *argv)
   GNUNET_assert (sigpipe != NULL);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv, "gnunet-uri URI",
-                          gettext_noop ("Perform default-actions for GNUnet URIs"),
-                          options, &run, NULL)) 
-    return 1;
+  ret = GNUNET_PROGRAM_run (argc, argv, "gnunet-uri URI",
+                            gettext_noop ("Perform default-actions for GNUnet URIs"),
+                            options, &run, NULL);
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
   sigpipe = NULL; 
-  return ret;
+  GNUNET_free ((void *) argv);
+  return (GNUNET_OK == ret) ? 0 : 1;
 }
 
 /* end of gnunet-uri.c */
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 3e0efa0bf..ef3eda2ff 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -65,7 +65,7 @@ get_path_from_proc_maps ()
   while (NULL != fgets (line, sizeof (line), f))
   {
     if ((1 ==
-         SSCANF (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s", dir)) &&
+         SSCANF (line, "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%1023s", dir)) &&
         (NULL != (lgu = strstr (dir, "libgnunetutil"))))
     {
       lgu[0] = '\0';
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 4c6ae0039..7be48d0f9 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -42,6 +42,8 @@ static struct GNUNET_DISK_PipeHandle *pipe_stdout;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+static GNUNET_SCHEDULER_TaskIdentifier read_task;
+
 static void
 runone (void);
 
@@ -60,6 +62,11 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_OS_process_destroy (proc);
     proc = NULL;
   }
+  if (GNUNET_SCHEDULER_NO_TASK != read_task)
+  {
+    GNUNET_SCHEDULER_cancel (read_task);
+    read_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   GNUNET_DISK_pipe_close (pipe_stdout);
   if (ok == 1)
   {
@@ -167,6 +174,7 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   long delays[8];
   int rd;
 
+  read_task = GNUNET_SCHEDULER_NO_TASK;
   rd = GNUNET_DISK_file_read (stdout_read_handle, buf_ptr,
                               sizeof (buf) - bytes);
   if (rd > 0)
@@ -176,9 +184,9 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if VERBOSE
     FPRINTF (stderr, "got %d bytes, reading more\n", rd);
 #endif
-    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    stdout_read_handle, &read_call,
-                                    (void *) stdout_read_handle);
+    read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                stdout_read_handle, &read_call,
+                                                stdout_read_handle);
     return;
   }
 
@@ -343,9 +351,9 @@ runone ()
   buf_ptr = buf;
   memset (&buf, 0, sizeof (buf));
 
-  GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                  stdout_read_handle, &read_call,
-                                  (void *) stdout_read_handle);
+  read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                              stdout_read_handle, &read_call,
+                                              stdout_read_handle);
 }
 
 static void
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index f732fbbdf..599451898 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -204,6 +204,7 @@ check_kill ()
     GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
                              "gnunet-service-resolver", "-", NULL); 
   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, SIGTERM))
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
@@ -241,6 +242,7 @@ check_instant_kill ()
   {
     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;
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index 122d5f480..f2abfa77d 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -35,6 +35,7 @@ test_cb (void *cls, const char *libname, void *lib_ret)
   ret = GNUNET_PLUGIN_unload (libname, "out");
   GNUNET_assert (NULL != ret);
   GNUNET_assert (0 == strcmp (ret, "World"));
+  GNUNET_free (ret);
 }
 
 
diff --git a/src/util/test_resolver_api_data.conf b/src/util/test_resolver_api_data.conf
index 745cb7bbe..3e264ebb7 100644
--- a/src/util/test_resolver_api_data.conf
+++ b/src/util/test_resolver_api_data.conf
@@ -4,5 +4,4 @@ SERVICEHOME = /tmp/test-gnunetd-statistics/
 [resolver]
 PORT = 22354
 HOSTNAME = localhost
-DEBUG = YES
 
diff --git a/src/util/test_server_mst_interrupt.c b/src/util/test_server_mst_interrupt.c
index fd34bd00a..8fd7a2b54 100644
--- a/src/util/test_server_mst_interrupt.c
+++ b/src/util/test_server_mst_interrupt.c
@@ -30,7 +30,7 @@
 #include "gnunet_time_lib.h"
 
 static struct GNUNET_SERVER_MessageStreamTokenizer * mst;
-static int ret;
+
 
 /* Callback destroying mst with data in buffer */
 static int
@@ -42,40 +42,23 @@ mst_cb (void *cls, void *client,
   return GNUNET_SYSERR;
 }
 
-/**
- * Main method
- */
-static int
-check ()
-{
 
+int
+main (int argc, char *argv[])
+{
   struct GNUNET_PeerIdentity id;
   struct GNUNET_MessageHeader msg[2];
 
-  /* Prepare */
-  memset (&id, sizeof (id), '\0');
+  GNUNET_log_setup ("test_server_mst_interrupt", "WARNING", NULL);
+  memset (&id, 0, sizeof (id));
   msg[0].size = htons (sizeof (msg));
   msg[0].type = htons (sizeof (GNUNET_MESSAGE_TYPE_DUMMY));
-
   mst = GNUNET_SERVER_mst_create(mst_cb, NULL);
-
-  GNUNET_SERVER_mst_receive(mst, &id,  (const char *) &msg, 2 * sizeof (msg), GNUNET_NO, GNUNET_NO);
-
+  GNUNET_SERVER_mst_receive (mst, &id,  
+                             (const char *) &msg, 2 * sizeof (msg), 
+                             GNUNET_NO, GNUNET_NO);
   /* If we reach this line, it did not crash */
-  ret = 0;
-
-  return ret;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ret = 1;
-
-  GNUNET_log_setup ("test_server", "WARNING", NULL);
-  check ();
-
-  return ret;
+  return 0;
 }
 
 /* end of test_server_mst_interrupt.c */