Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / util / gnunet-uri.c

diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 8cc813be51e3ab0292ff46fb741ef99927225e69..f69508f6728e19fe8436c52448fc3f9841527e25 100644 (file)
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -26,11 +26,10 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
-
 /**
- * Global return value.
+ * Handler exit code
  */
-static int ret = 1;
+static long unsigned int exit_code = 1;
 
 /**
  * Helper process we started.
@@ -48,21 +47,16 @@ static struct GNUNET_DISK_PipeHandle *sigpipe;
  * process died) or when user presses CTRL-C.
  *
  * @param cls closure, NULL
- * @param tc scheduler context
  */
 static void
-maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+maint_child_death (void *cls)
 {
   enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-
-  if ( (GNUNET_OK ==
-       GNUNET_OS_process_status (p, &type, &code)) &&
-       (type == GNUNET_OS_PROCESS_EXITED) &&
-       (0 == code) )
-    ret = 0;
-  else
-    GNUNET_break (0 == GNUNET_OS_process_kill (p, SIGTERM));
+
+  if ( (GNUNET_OK !=
+       GNUNET_OS_process_status (p, &type, &exit_code)) ||
+       (type != GNUNET_OS_PROCESS_EXITED) )
+    GNUNET_break (0 == GNUNET_OS_process_kill (p, GNUNET_TERM_SIG));
   GNUNET_OS_process_destroy (p);
 }
 
@@ -83,16 +77,18 @@ run (void *cls, char *const *args, const char *cfgfile,
   const char *slash;
   char *subsystem;
   char *program;
-  GNUNET_SCHEDULER_TaskIdentifier rt;
+  struct GNUNET_SCHEDULER_Task * rt;
 
   if (NULL == (uri = args[0]))
   {
-    fprintf (stderr, _("No URI specified on command line\n"));
+    fprintf (stderr,
+            _("No URI specified on command line\n"));
     return;
   }
   if (0 != strncasecmp ("gnunet://", uri, strlen ("gnunet://")))
   {
-    fprintf (stderr, _("Invalid URI: does not start with `%s'\n"),
+    fprintf (stderr,
+            _("Invalid URI: does not start with `%s'\n"),
             "gnunet://");
     return;
   }
@@ -117,12 +113,12 @@ run (void *cls, char *const *args, const char *cfgfile,
   rt = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
                                       GNUNET_DISK_pipe_handle (sigpipe,
                                                                GNUNET_DISK_PIPE_END_READ),
-                                      &maint_child_death, NULL);   
+                                      &maint_child_death, NULL);
   p = GNUNET_OS_start_process (GNUNET_NO, 0,
-                              NULL, NULL,
+                              NULL, NULL, NULL,
                               program,
                               program,
-                              args[0], 
+                              args[0],
                               NULL);
   GNUNET_free (program);
   if (NULL == p)
@@ -162,6 +158,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 +166,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;
+  sigpipe = NULL;
+  GNUNET_free ((void *) argv);
+  return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1;
 }
 
 /* end of gnunet-uri.c */