/*
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
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.
*/
/**
#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.
* 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
+
+ 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);
}
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;
}
GNUNET_DISK_PIPE_END_READ),
&maint_child_death, NULL);
p = GNUNET_OS_start_process (GNUNET_NO, 0,
- NULL, NULL,
+ NULL, NULL, NULL,
program,
program,
args[0],
GNUNET_DISK_pipe_close (sigpipe);
sigpipe = NULL;
GNUNET_free ((void *) argv);
- return (GNUNET_OK == ret) ? 0 : 1;
+ return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1;
}
/* end of gnunet-uri.c */