nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on non-Windows platforms

Browse Source
This commit is contained in:
Steven Murdoch 2011-07-23 14:32:39 +01:00
parent c5796a8fb2
commit 99baa7e45c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/util.c
View File

@ -3094,6 +3094,11 @@ tor_spawn_background(const char *const filename, const char **argv)
static int max_fd = -1; static int max_fd = -1;
// XXX
process_handle.pid = 0;
process_handle.stderr_pipe = 0;
process_handle.stdout_pipe = 0;
/* We do the strlen here because strlen() is not signal handler safe, /* We do the strlen here because strlen() is not signal handler safe,
and we are not allowed to use unsafe functions between fork and exec */ and we are not allowed to use unsafe functions between fork and exec */
error_message_length = strlen(error_message); error_message_length = strlen(error_message);
@ -3267,11 +3272,12 @@ tor_get_exit_code(const process_handle_t process_handle)
} }
#else #else
int stat_loc; int stat_loc;
int retval;
retval = waitpid(process_handle.pid, &stat_loc, 0); retval = waitpid(process_handle.pid, &stat_loc, 0);
if (retval != process_handle.pid) { if (retval != process_handle.pid) {
log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", process_handle.pid, log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", process_handle.pid,
sterror(errno)); strerror(errno));
return -1; return -1;
} }
@ -3457,7 +3463,9 @@ tor_check_port_forwarding(const char *filename, int dir_port, int or_port,
/* When fw-helper fails, how long do we wait until running it again */ /* When fw-helper fails, how long do we wait until running it again */
#define TIME_TO_EXEC_FWHELPER_FAIL 60 #define TIME_TO_EXEC_FWHELPER_FAIL 60
// XXX: remove
static int child_pid = -1; static int child_pid = -1;
static process_handle_t child_handle = {0, 0, 0, 0};
static FILE *stdout_read = NULL; static FILE *stdout_read = NULL;
static FILE *stderr_read = NULL; static FILE *stderr_read = NULL;
static time_t time_to_run_helper = 0; static time_t time_to_run_helper = 0;
@ -3491,7 +3499,7 @@ tor_check_port_forwarding(const char *filename, int dir_port, int or_port,
/* Assume tor-fw-helper will succeed, start it later*/ /* Assume tor-fw-helper will succeed, start it later*/
time_to_run_helper = now + TIME_TO_EXEC_FWHELPER_SUCCESS; time_to_run_helper = now + TIME_TO_EXEC_FWHELPER_SUCCESS;
child_pid = tor_spawn_background(filename, &fd_out, &fd_err, argv); child_handle = tor_spawn_background(filename, argv);
if (child_pid < 0) { if (child_pid < 0) {
log_warn(LD_GENERAL, "Failed to start port forwarding helper %s", log_warn(LD_GENERAL, "Failed to start port forwarding helper %s",
filename); filename);