GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include <unistr.h> /* for u16_to_u8 */
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
#if DARWIN
#include <mach-o/ldsyms.h>
#include <mach-o/dyld.h>
c = _dyld_image_count ();
for (i = 0; i < c; i++)
{
- if (_dyld_get_image_header (i) != &_mh_dylib_header)
+ if (((const void *) _dyld_get_image_header (i)) != (const void *)&_mh_dylib_header)
continue;
path = _dyld_get_image_name (i);
if ( (NULL == path) || (0 == strlen (path)) )
if (DIR_SEPARATOR == progname[0])
return GNUNET_strdup (progname);
+ if (GNUNET_YES == GNUNET_STRINGS_path_is_absolute (progname, GNUNET_NO, NULL, NULL))
+ return GNUNET_strdup (progname);
libexecdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBEXECDIR);
if (NULL == libexecdir)
return GNUNET_strdup (progname);
* GNUNET_SYSERR on error (no such binary or not executable)
*/
int
-GNUNET_OS_check_helper_binary (const char *binary, const boolean check_suid, const char *params)
+GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char *params)
{
struct stat statbuf;
char *p;
char parameters[512];
PROCESS_INFORMATION proc;
DWORD exit_value;
-
- GNUNET_snprintf (¶meters, 512, "-d %s", params);
+
+ GNUNET_snprintf (parameters,
+ sizeof (parameters),
+ "-d %s", params);
memset (&start, 0, sizeof (start));
start.cb = sizeof (start);
memset (&proc, 0, sizeof (proc));
-
- // Start the child process.
+
+ // Start the child process.
if ( ! (CreateProcess( p, // current windows (2k3 and up can handle / instead of \ in paths))
parameters, // execute dryrun/priviliege checking mode
NULL, // Process handle not inheritable
FALSE, // Set handle inheritance to FALSE
CREATE_DEFAULT_ERROR_MODE, // No creation flags
NULL, // Use parent's environment block
- NULL, // Use parent's starting directory
+ NULL, // Use parent's starting directory
&start, // Pointer to STARTUPINFO structure
&proc ) // Pointer to PROCESS_INFORMATION structure
- ))
+ ))
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
+ LOG (GNUNET_ERROR_TYPE_ERROR,
_("CreateProcess failed for binary %s (%d).\n"),
p, GetLastError());
return GNUNET_SYSERR;
// Wait until child process exits.
WaitForSingleObject( proc.hProcess, INFINITE );
-
+
if ( ! GetExitCodeProcess (proc.hProcess, &exit_value)){
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("GetExitCodeProcess failed for binary %s (%d).\n"),
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("GetExitCodeProcess failed for binary %s (%d).\n"),
p, GetLastError() );
return GNUNET_SYSERR;
}
- // Close process and thread handles.
+ // Close process and thread handles.
CloseHandle( proc.hProcess );
CloseHandle( proc.hThread );
-
+
if (!exit_value)
return GNUNET_YES;
#endif