From 4c15746236d2fe169d795eca57a8a73f0e8fd096 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 4 Jan 2006 03:43:55 +0000 Subject: [PATCH] * fhandler_process.cc (fhandler_process::readdir): Add missing argument to syscall_printf. * fhandler_console.cc (fhandler_console::need_invisible): Use made-up name for windows station rather than asking Windows to create one for us. * spawn.cc (spawn_guts): Don't mess with console if we're detaching. --- winsup/cygwin/ChangeLog | 11 +++++++++++ winsup/cygwin/fhandler_console.cc | 4 ++-- winsup/cygwin/fhandler_process.cc | 2 +- winsup/cygwin/spawn.cc | 3 ++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f388ca76f..a26345f70 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,14 @@ +2006-01-03 Christopher Faylor + + * fhandler_process.cc (fhandler_process::readdir): Add missing argument + to syscall_printf. + + * fhandler_console.cc (fhandler_console::need_invisible): Use made-up + name for windows station rather than asking Windows to create one for + us. + + * spawn.cc (spawn_guts): Don't mess with console if we're detaching. + 2006-01-03 Christopher Faylor * dir.cc (readdir_worker): Minor code cleanup. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 431886352..c10098b58 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -1856,8 +1856,8 @@ fhandler_console::need_invisible () h = horig = GetProcessWindowStation (); if (myself->ctty == -1) { - h = CreateWindowStation (NULL, 0, WINSTA_ALL_ACCESS, &sec_none_nih); - termios_printf ("CreateWindowStation %p, %E", h); + h = CreateWindowStation ("CygwinInvisible", 0, WINSTA_ALL_ACCESS, &sec_none_nih); + termios_printf ("CreateWindowStation(\"CygwinInvisible\", %p), %E", h); if (h) { b = SetProcessWindowStation (h); diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 253bd4dd9..cb7d9072d 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -229,7 +229,7 @@ fhandler_process::readdir (DIR *dir, dirent *de) strcpy (de->d_name, process_listing[dir->__d_position++]); res = 0; out: - syscall_printf ("%d = readdir (%p, %p) (%s)", dir, de, de->d_name); + syscall_printf ("%d = readdir (%p, %p) (%s)", res, dir, de, de->d_name); return res; } diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 23b0ca5d1..9f9659501 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -616,7 +616,8 @@ spawn_guts (const char * prog_arg, const char *const *argv, ProtectHandle (cygheap->pid_handle); else system_printf ("duplicate to pid_handle failed, %E"); - set_console_state_for_spawn (real_path.iscygexec ()); + if (mode != _P_DETACH) + set_console_state_for_spawn (real_path.iscygexec ()); } /* Some file types (currently only sockets) need extra effort in the parent