#include "gnunet_os_lib.h"
#include "disk.h"
+#if WINDOWS
+#include "gnunet_signal_lib.h"
+
+extern GNUNET_SIGNAL_Handler w32_sigchld_handler;
+
+/**
+ * @brief Waits for a process to terminate and invokes the SIGCHLD handler
+ * @param h handle to the process
+ */
+static DWORD WINAPI
+ChildWaitThread (HANDLE h)
+{
+ WaitForSingleObject (h, INFINITE);
+
+ if (w32_sigchld_handler)
+ w32_sigchld_handler ();
+
+ CloseHandle (h);
+}
+#endif
+
/**
* Set process priority
*
#endif
char *fn;
int len;
+ char path[MAX_PATH + 1];
cmdlen = 0;
va_start (ap, filename);
start.hStdOutput = stdout_handle;
}
#endif
- len = strlen (filename);
- if (strnicmp (filename + len - 4, ".exe", 4) == 0)
- fn = filename;
- else
- GNUNET_asprintf (&fn, "%s.exe", filename);
+ if (FindExecutable(filename, NULL, path) <= 32)
+ {
+ SetErrnoFromWinError (GetLastError ());
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "FindExecutable", fn);
+ return -1;
+ }
if (!CreateProcess
- (fn, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
+ (path, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
&proc))
{
SetErrnoFromWinError (GetLastError ());
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", fn);
return -1;
}
+
+ CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+
if (fn != filename)
GNUNET_free (fn);
- CloseHandle (proc.hProcess);
CloseHandle (proc.hThread);
GNUNET_free (cmd);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork");
return -1;
}
- CloseHandle (proc.hProcess);
- CloseHandle (proc.hThread);
+ CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+
+ CloseHandle (proc.hThread);
GNUNET_free (cmd);
return proc.dwProcessId;