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 "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
#include "disk.h"
#include <unistr.h>
char sig;
char *pipe_fd;
ssize_t ret;
-
+
LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__,
tc->reason);
if (0 != (tc->reason &
{
if (-1 == ret)
LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
- LOG (GNUNET_ERROR_TYPE_WARNING, "Closing control pipe\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Closing control pipe\n");
GNUNET_DISK_file_close (control_pipe);
control_pipe = NULL;
return;
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
control_pipe, &parent_control_handler,
control_pipe);
- raise ((int) sig);
+ GNUNET_SIGNAL_raise ((int) sig);
}
case SIGINT:
case SIGKILL:
case SIGTERM:
+#if (SIGTERM != GNUNET_TERM_SIG)
+ case GNUNET_TERM_SIG:
+#endif
#if defined(WINDOWS) && !defined(__CYGWIN__)
{
DWORD exitcode;
#else
LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via system call\n", sig, proc->pid);
return PLIBC_KILL (proc->pid, sig);
-#endif
+#endif
}
}
{
#ifndef MINGW
pid_t ret;
- char lpid[16];
char fds[16];
struct GNUNET_OS_Process *gnunet_proc;
struct GNUNET_DISK_FileHandle *childpipe_read;
if (0 != ret)
{
unsetenv (GNUNET_OS_CONTROL_PIPE);
- gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc = GNUNET_new (struct GNUNET_OS_Process);
gnunet_proc->pid = ret;
gnunet_proc->control_pipe = childpipe_write;
if (GNUNET_YES == pipe_control)
if (NULL != lscp)
{
/* read systemd documentation... */
- GNUNET_snprintf (lpid, sizeof (lpid), "%u", getpid ());
- setenv ("LISTEN_PID", lpid, 1);
i = 0;
tgt = 3;
while (-1 != lscp[i])
DWORD stdif, stdof, stdef;
BOOL bresult;
DWORD error_code;
+ DWORD create_no_window;
if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL))
return NULL; /* not executable */
-
+
/* Search in prefix dir (hopefully - the directory from which
* the current module was loaded), bindir and libdir, then in PATH
*/
else
SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, 0);
}
-
+
stdoh = GetStdHandle (STD_OUTPUT_HANDLE);
GetHandleInformation (stdoh, &stdof);
return NULL;
}
+ create_no_window = 0;
+ {
+ HANDLE console_input = CreateFile ("CONIN$", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+ if (INVALID_HANDLE_VALUE == console_input)
+ create_no_window = CREATE_NO_WINDOW;
+ else
+ CloseHandle (console_input);
+ }
+
bresult = CreateProcessW (wpath, wcmd, NULL, NULL, GNUNET_YES,
- DETACHED_PROCESS | CREATE_SUSPENDED, env_block, NULL, &start, &proc);
+ create_no_window | CREATE_SUSPENDED, env_block, NULL, &start, &proc);
error_code = GetLastError ();
if ((NULL == pipe_stdin) && (stdih))
SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, stdif);
-
+
if ((NULL == pipe_stdout) && (stdoh))
SetHandleInformation (stdoh, HANDLE_FLAG_INHERIT, stdof);
return NULL;
}
- gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ gnunet_proc = GNUNET_new (struct GNUNET_OS_Process);
gnunet_proc->pid = proc.dwProcessId;
gnunet_proc->handle = proc.hProcess;
gnunet_proc->control_pipe = childpipe_write;
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &count, sizeof (count));
if (sizeof (count) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to write %u count bytes to the child: %u\n",
sizeof (count), GetLastError ());
break;
/* Get a socket duplication info */
if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to duplicate an socket[%llu]: %u\n", i,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to duplicate an socket[%llu]: %u\n", i,
GetLastError ());
break;
}
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &size, sizeof (size));
if (sizeof (size) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to write %u size[%llu] bytes to the child: %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to write %u size[%llu] bytes to the child: %u\n",
sizeof (size), i, GetLastError ());
break;
}
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &pi, sizeof (pi));
if (sizeof (pi) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to write %u socket[%llu] bytes to the child: %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to write %u socket[%llu] bytes to the child: %u\n",
sizeof (pi), i, GetLastError ());
break;
}
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
- const char *filename,
+ const char *filename,
char *const argv[])
{
return start_process (pipe_control,
}
+/**
+ * Start a process. This function is similar to the GNUNET_OS_start_process_*
+ * except that the filename and arguments can have whole strings which contain
+ * the arguments. These arguments are to be separated by spaces and are parsed
+ * in the order they appear. Arguments containing spaces can be used by
+ * quoting them with @em ".
+ *
+ * @param pipe_control should a pipe be used to send signals to the child?
+ * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
+ * @param lsocks array of listen sockets to dup systemd-style (or NULL);
+ * must be NULL on platforms where dup is not supported
+ * @param filename name of the binary. It is valid to have the arguments
+ * in this string when they are separated by spaces.
+ * @param ... more arguments. Should be of type `char *`. It is valid
+ * to have the arguments in these strings when they are separated by
+ * spaces. The last argument MUST be NULL.
+ * @return pointer to process structure of the new process, NULL on error
+ */
+struct GNUNET_OS_Process *
+GNUNET_OS_start_process_s (int pipe_control,
+ unsigned int std_inheritance,
+ const SOCKTYPE * lsocks,
+ const char *filename, ...)
+{
+ va_list ap;
+ char **argv;
+ unsigned int argv_size;
+ const char *arg;
+ const char *rpos;
+ char *pos;
+ char *cp;
+ const char *last;
+ struct GNUNET_OS_Process *proc;
+ char *binary_path;
+ int quote_on;
+ unsigned int i;
+ size_t len;
+
+ argv_size = 1;
+ va_start (ap, filename);
+ arg = filename;
+ last = NULL;
+ do
+ {
+ rpos = arg;
+ quote_on = 0;
+ while ('\0' != *rpos)
+ {
+ if ('"' == *rpos)
+ {
+ if (1 == quote_on)
+ quote_on = 0;
+ else
+ quote_on = 1;
+ }
+ if ( (' ' == *rpos) && (0 == quote_on) )
+ {
+ if (NULL != last)
+ argv_size++;
+ last = NULL;
+ rpos++;
+ while (' ' == *rpos)
+ rpos++;
+ }
+ if ( (NULL == last) && ('\0' != *rpos) ) // FIXME: == or !=?
+ last = rpos;
+ if ('\0' != *rpos)
+ rpos++;
+ }
+ if (NULL != last)
+ argv_size++;
+ }
+ while (NULL != (arg = (va_arg (ap, const char*))));
+ va_end (ap);
+
+ argv = GNUNET_malloc (argv_size * sizeof (char *));
+ argv_size = 0;
+ va_start (ap, filename);
+ arg = filename;
+ last = NULL;
+ do
+ {
+ cp = GNUNET_strdup (arg);
+ quote_on = 0;
+ pos = cp;
+ while ('\0' != *pos)
+ {
+ if ('"' == *pos)
+ {
+ if (1 == quote_on)
+ quote_on = 0;
+ else
+ quote_on = 1;
+ }
+ if ( (' ' == *pos) && (0 == quote_on) )
+ {
+ *pos = '\0';
+ if (NULL != last)
+ argv[argv_size++] = GNUNET_strdup (last);
+ last = NULL;
+ pos++;
+ while (' ' == *pos)
+ pos++;
+ }
+ if ( (NULL == last) && ('\0' != *pos)) // FIXME: == or !=?
+ last = pos;
+ if ('\0' != *pos)
+ pos++;
+ }
+ if (NULL != last)
+ argv[argv_size++] = GNUNET_strdup (last);
+ last = NULL;
+ GNUNET_free (cp);
+ }
+ while (NULL != (arg = (va_arg (ap, const char*))));
+ va_end (ap);
+ argv[argv_size] = NULL;
+
+ for(i = 0; i < argv_size; i++)
+ {
+ len = strlen (argv[i]);
+ if ( (argv[i][0] == '"') && (argv[i][len-1] == '"'))
+ {
+ memmove (&argv[i][0], &argv[i][1], len - 2);
+ argv[i][len-2] = '\0';
+ }
+ }
+ binary_path = argv[0];
+ proc = GNUNET_OS_start_process_v (pipe_control, std_inheritance, lsocks,
+ binary_path, argv);
+ while (argv_size > 0)
+ GNUNET_free (argv[--argv_size]);
+ GNUNET_free (argv);
+ return proc;
+}
+
+
/**
* Retrieve the status of a process, waiting on him if dead.
* Nonblocking version.
- *
+ *
* @param proc process ID
* @param type status type
* @param code return code/signal number
while ( (pid != (ret = waitpid (pid, NULL, 0))) &&
(EINTR == errno) ) ;
- if (pid != ret)
+ if (pid != ret)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid");
return GNUNET_SYSERR;
return NULL;
}
GNUNET_DISK_pipe_close_end (opipe, GNUNET_DISK_PIPE_END_WRITE);
- cmd = GNUNET_malloc (sizeof (struct GNUNET_OS_CommandHandle));
+ cmd = GNUNET_new (struct GNUNET_OS_CommandHandle);
cmd->timeout = GNUNET_TIME_relative_to_absolute (timeout);
cmd->eip = eip;
cmd->opipe = opipe;