#include "platform.h"
#include "gnunet_common.h"
#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
return GNUNET_OK;
}
-
/**
* Start a process.
*
+ * @param pipe_stdin pipe to use to send input to child process (or NULL)
+ * @param pipe_stdout pipe to use to get output from child process (or NULL)
* @param filename name of the binary
* @param ... NULL-terminated list of arguments to the process
* @return process ID of the new process, -1 on error
*/
pid_t
-GNUNET_OS_start_process (const char *filename, ...)
+GNUNET_OS_start_process (struct GNUNET_DISK_PipeHandle *pipe_stdin,
+ struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ const char *filename, ...)
{
+ /* FIXME: Make this work on windows!!! */
va_list ap;
#ifndef MINGW
pid_t ret;
char **argv;
int argc;
+ int fd_stdout_write;
+ int fd_stdout_read;
+ int fd_stdin_read;
+ int fd_stdin_write;
+
+ argc = 0;
+ va_start (ap, filename);
+ while (NULL != va_arg (ap, char *))
+ argc++;
+ va_end (ap);
+ argv = GNUNET_malloc (sizeof (char *) * (argc + 1));
+ argc = 0;
+ va_start (ap, filename);
+ while (NULL != (argv[argc] = va_arg (ap, char *)))
+ argc++;
+ va_end (ap);
+ if (pipe_stdout != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE), &fd_stdout_write, sizeof (int));
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_READ), &fd_stdout_read, sizeof (int));
+ }
+ if (pipe_stdin != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_READ), &fd_stdin_read, sizeof (int));
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_WRITE), &fd_stdin_write, sizeof (int));
+ }
#if HAVE_WORKING_VFORK
ret = vfork ();
}
else
{
+
#if HAVE_WORKING_VFORK
/* let's hope vfork actually works; for some extreme cases (including
a testcase) we need 'execvp' to have run before we return, since
#else
/* let's give the child process a chance to run execvp, 1s should
be plenty in practice */
+ if (pipe_stdout != NULL)
+ GNUNET_DISK_pipe_close_end(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+ if (pipe_stdin != NULL)
+ GNUNET_DISK_pipe_close_end(pipe_stdin, GNUNET_DISK_PIPE_END_READ);
sleep (1);
#endif
}
+ GNUNET_free (argv);
return ret;
}
- argc = 0;
- va_start (ap, filename);
- while (NULL != va_arg (ap, char *))
- argc++;
- va_end (ap);
- argv = GNUNET_malloc (sizeof (char *) * (argc + 1));
- argc = 0;
- va_start (ap, filename);
- while (NULL != (argv[argc] = va_arg (ap, char *)))
- argc++;
- va_end (ap);
+
+ if (pipe_stdout != NULL)
+ {
+ dup2(fd_stdout_write, 1);
+ close (fd_stdout_write);
+ close (fd_stdout_read);
+ }
+
+ if (pipe_stdin != NULL)
+ {
+
+ dup2(fd_stdin_read, 0);
+ close (fd_stdin_read);
+ close (fd_stdin_write);
+ }
+
execvp (filename, argv);
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "execvp", filename);
_exit (1);
char *cmd, *idx;
STARTUPINFO start;
PROCESS_INFORMATION proc;
+#if NILS
+ HANDLE stdin_handle;
+ HANDLE stdout_handle;
+#endif
+ char *fn;
+ int len;
cmdlen = 0;
va_start (ap, filename);
memset (&start, 0, sizeof (start));
start.cb = sizeof (start);
+#if NILS
+ if ((pipe_stdin != NULL) || (pipe_stdout != NULL))
+ start.dwFlags |= STARTF_USESTDHANDLES;
+
+ if (pipe_stdin != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdin, GNUNET_DISK_PIPE_END_READ), &stdin_handle, sizeof (HANDLE));
+ start.hStdInput = stdin_handle;
+ }
+
+ if (pipe_stdout != NULL)
+ {
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE), &stdout_handle, sizeof (HANDLE));
+ 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 (!CreateProcess
- (filename, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
+ (fn, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &start,
&proc))
{
SetErrnoFromWinError (GetLastError ());
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", filename);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "CreateProcess", fn);
return -1;
}
- CloseHandle (proc.hProcess);
+
+ CreateThread (NULL, 64000, ChildWaitThread, proc.hProcess, 0, NULL);
+
+ if (fn != filename)
+ GNUNET_free (fn);
CloseHandle (proc.hThread);
GNUNET_free (cmd);
return proc.dwProcessId;
#endif
-}
+}
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;
*type = GNUNET_OS_PROCESS_SIGNALED;
*code = WSTOPSIG (status);
}
+#ifdef WIFCONTINUED
else if (WIFCONTINUED (status))
{
*type = GNUNET_OS_PROCESS_RUNNING;
*code = 0;
}
+#endif
else
{
*type = GNUNET_OS_PROCESS_UNKNOWN;