/*
This file is part of GNUnet
- (C) 2002, 2003, 2004, 2005, 2006, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2011 Christian Grothoff (and other contributing authors)
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.
*/
/**
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;
}
return 0;
#else
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via system call\n", sig, proc->pid);
+ 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
default:
if (NULL != proc->control_pipe)
GNUNET_DISK_file_close (proc->control_pipe);
#if defined (WINDOWS)
- if (proc->handle != NULL)
+ if (NULL != proc->handle)
CloseHandle (proc->handle);
#endif
GNUNET_free (proc);
* (when they are non-NULL).
* @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 pipe_stderr pipe to use for stderr for child process (or NULL)
* @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
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ struct GNUNET_DISK_PipeHandle *pipe_stderr,
const SOCKTYPE *lsocks,
const char *filename,
char *const argv[])
unsigned int ls;
int fd_stdout_write;
int fd_stdout_read;
+ int fd_stderr_write;
+ int fd_stderr_read;
int fd_stdin_read;
int fd_stdin_write;
childpipe_write = NULL;
childpipe_read_fd = -1;
}
+ if (NULL != pipe_stdin)
+ {
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
+ (pipe_stdin, GNUNET_DISK_PIPE_END_READ),
+ &fd_stdin_read, sizeof (int)));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
+ (pipe_stdin, GNUNET_DISK_PIPE_END_WRITE),
+ &fd_stdin_write, sizeof (int)));
+ }
if (NULL != pipe_stdout)
{
GNUNET_assert (GNUNET_OK ==
(pipe_stdout, GNUNET_DISK_PIPE_END_READ),
&fd_stdout_read, sizeof (int)));
}
- if (NULL != pipe_stdin)
+ if (NULL != pipe_stderr)
{
GNUNET_assert (GNUNET_OK ==
- 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_stderr,
+ GNUNET_DISK_PIPE_END_READ),
+ &fd_stderr_read, sizeof (int)));
GNUNET_assert (GNUNET_OK ==
- GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
- (pipe_stdin, GNUNET_DISK_PIPE_END_WRITE),
- &fd_stdin_write, sizeof (int)));
+ GNUNET_DISK_internal_file_handle_ (GNUNET_DISK_pipe_handle
+ (pipe_stderr,
+ GNUNET_DISK_PIPE_END_WRITE),
+ &fd_stderr_write, sizeof (int)));
}
lscp = NULL;
ls = 0;
GNUNET_break (0 == close (1));
open_dev_null (1, O_WRONLY);
}
- if (0 == (std_inheritance & GNUNET_OS_INHERIT_STD_ERR))
+ if (NULL != pipe_stderr)
+ {
+ GNUNET_break (0 == close (fd_stderr_read));
+ if (-1 == dup2 (fd_stderr_write, 2))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "dup2");
+ GNUNET_break (0 == close (fd_stderr_write));
+ }
+ else if (0 == (std_inheritance & GNUNET_OS_INHERIT_STD_ERR))
{
GNUNET_break (0 == close (2));
open_dev_null (2, O_WRONLY);
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 */
if (NULL == (wcmd = u8_to_u16 ((uint8_t *) cmd, 1 + strlen (cmd), NULL, &wcmd_len)))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to convert `%s' from UTF-8 to UTF-16: %d\n", cmd, errno);
+ "Failed to convert `%s' from UTF-8 to UTF-16: %d\n",
+ cmd,
+ errno);
GNUNET_free (env_block);
GNUNET_free (cmd);
free (wpath);
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,
- CREATE_NO_WINDOW | 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 (stdeh, HANDLE_FLAG_INHERIT, stdef);
if (!bresult)
- LOG (GNUNET_ERROR_TYPE_ERROR, "CreateProcess(%s, %s) failed: %lu\n", path, cmd, error_code);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "CreateProcess(%s, %s) failed: %lu\n",
+ path,
+ cmd,
+ error_code);
GNUNET_free (env_block);
GNUNET_free (cmd);
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;
}
-
-
/**
* Start a process.
*
* @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
* @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 pipe_stderr pipe to use to get output from child process (or NULL)
* @param filename name of the binary
* @param argv NULL-terminated array of arguments to the process
* @return pointer to process structure of the new process, NULL on error
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ struct GNUNET_DISK_PipeHandle *pipe_stderr,
const char *filename,
char *const argv[])
{
std_inheritance,
pipe_stdin,
pipe_stdout,
+ pipe_stderr,
NULL,
filename,
argv);
* @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
* @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 pipe_stderr pipe to use to get output from child process (or NULL)
* @param filename name of the binary
* @param va NULL-terminated list of arguments to the process
* @return pointer to process structure of the new process, NULL on error
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ struct GNUNET_DISK_PipeHandle *pipe_stderr,
const char *filename, va_list va)
{
struct GNUNET_OS_Process *ret;
std_inheritance,
pipe_stdin,
pipe_stdout,
+ pipe_stderr,
filename,
argv);
GNUNET_free (argv);
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
+ struct GNUNET_DISK_PipeHandle *pipe_stderr,
const char *filename, ...)
{
struct GNUNET_OS_Process *ret;
va_list ap;
va_start (ap, filename);
- ret = GNUNET_OS_start_process_va (pipe_control, std_inheritance, pipe_stdin,
- pipe_stdout, filename, ap);
+ ret = GNUNET_OS_start_process_va (pipe_control,
+ std_inheritance,
+ pipe_stdin,
+ pipe_stdout,
+ pipe_stderr,
+ filename,
+ ap);
va_end (ap);
return ret;
}
std_inheritance,
NULL,
NULL,
+ NULL,
lsocks,
filename,
argv);
}
+/**
+ * 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
- * @return GNUNET_OK on success, GNUNET_NO if the process is still running, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise
*/
int
GNUNET_OS_process_status (struct GNUNET_OS_Process *proc,
/**
- * Wait for a process
+ * Wait for a process to terminate. The return code is discarded.
+ * You must not use #GNUNET_OS_process_status() on the same process
+ * after calling this function! This function is blocking and should
+ * thus only be used if the child process is known to have terminated
+ * or to terminate very soon.
*
* @param proc pointer to process structure
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc)
(EINTR == errno) ) ;
if (pid != ret)
{
- LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "waitpid");
return GNUNET_SYSERR;
}
return GNUNET_OK;
h = proc->handle;
if (NULL == h)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Invalid process information {%d, %08X}\n",
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid process information {%d, %08X}\n",
proc->pid, h);
return GNUNET_SYSERR;
}
GNUNET_OS_LineProcessor proc;
/**
- * Closure for 'proc'.
+ * Closure for @e proc.
*/
void *proc_cls;
/**
* Task reading from pipe.
*/
- GNUNET_SCHEDULER_TaskIdentifier rtask;
+ struct GNUNET_SCHEDULER_Task *rtask;
/**
* When to time out.
{
if (NULL != cmd->proc)
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != cmd->rtask);
+ GNUNET_assert (NULL != cmd->rtask);
GNUNET_SCHEDULER_cancel (cmd->rtask);
}
(void) GNUNET_OS_process_kill (cmd->eip, SIGKILL);
char *end;
ssize_t ret;
- cmd->rtask = GNUNET_SCHEDULER_NO_TASK;
+ cmd->rtask = NULL;
if (GNUNET_YES != GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, cmd->r))
{
/* timeout, shutdown, etc. */
* for each line of the output.
*
* @param proc function to call for each line of the output
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
* @param timeout when to time out
* @param binary command to run
* @param ... arguments to command
* @return NULL on error
*/
struct GNUNET_OS_CommandHandle *
-GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc, void *proc_cls,
- struct GNUNET_TIME_Relative timeout, const char *binary,
+GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
+ void *proc_cls,
+ struct GNUNET_TIME_Relative timeout,
+ const char *binary,
...)
{
struct GNUNET_OS_CommandHandle *cmd;
return NULL;
va_start (ap, binary);
/* redirect stdout, don't inherit stderr/stdin */
- eip = GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, binary, ap);
+ eip = GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, NULL, binary, ap);
va_end (ap);
if (NULL == eip)
{
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;
projects / oweals / gnunet.git / blobdiff