summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fork.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2008-03-07 11:24:51 +0000
committerCorinna Vinschen <corinna@vinschen.de>2008-03-07 11:24:51 +0000
commit752b16ce359bb46948b8aa2bc88f7c32bf2cc95b (patch)
tree1ed3d9abb89e7e21ee47faf099632cf05b3a05be /winsup/cygwin/fork.cc
parentd8e218442b004997287aaf202af88d9f1f86074e (diff)
downloadcygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.tar.gz
cygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.tar.bz2
cygnal-752b16ce359bb46948b8aa2bc88f7c32bf2cc95b.zip
* Makefile.in (DLL_OFILES): Add tls_pbuf.o.
* autoload.cc (CreateDesktopW): Replace CreateDesktopA. (CreateWindowStationW): Replace CreateWindowStationA. (GetUserObjectInformationW): Replace GetUserObjectInformationA. * cygheap.h (cwdstuff::get): Assume default buffer size NT_MAX_PATH. * cygtls.cc (_cygtls::remove): Free temporary TLS path buffers. * cygtls.h (TP_NUM_C_BUFS): Define. (TP_NUM_W_BUFS): Define. (class tls_pathbuf): New class to store pointers to thread local temporary path buffers. (_local_storage::pathbufs): New member. * environ.cc (win_env::add_cache): Use temporary TLS path buffer instead of stack based buffer. (posify): Get temporary outenv buffer from calling function. (environ_init): Create temporary TLS path buffer for posify. (build_env): Create Windows environment block as WCHAR buffer. * environ.h (build_env): Change declaration accordingly. * external.cc (sync_winenv): Accommodate build_env change. * fhandler_console.cc (fhandler_console::need_invisible): Use GetUserObjectInformationW and CreateWindowStationW. * fhandler_process.cc (format_process_maps): Use temporary TLS path buffer instead of stack based buffer. * fork.cc (frok::parent): Convert to use CreateProcessW. * path.cc: Throughout use temporary TLS path buffers instead of stack based buffer. Replace checks for CYG_MAX_PATH by checks for NT_MAX_PATH. (getfileattr): New function to replace GetFileAttributesA. (normalize_win32_path): Remove Win32 and NT long path prefixes. (getwd): Assume PATH_MAX + 1 buffer per SUSv3. * path.h (class path_conv): Set path buffer to size NT_MAX_PATH. (iswdrive): Define. * pinfo.cc (commune_process): Use temporary TLS path buffer instead of stack based buffer. * registry.cc (get_registry_hive_path): Ditto. (load_registry_hive): Ditto. * spawn.cc (spawn_guts): Convert to use CreateProcessW and CreateProcessAsUserW. (av::fixup): Open/close file using NtOpenFile/NtClose. * syscalls.cc (mknod_worker): Allow PATH_MAX file name. (mknod32): Ditto. (getusershell): Ditto. * tls_pbuf.cc: New file implementing tls_pathbuf and tmp_pathbuf methods. * tls_pbuf.h: New header for files using tmp_pathbuf. * tlsoffsets.h: Regenerate. * winsup.h (NT_MAX_PATH): Define as 32767 to avoid USHORT overflow.
Diffstat (limited to 'winsup/cygwin/fork.cc')
-rw-r--r--winsup/cygwin/fork.cc36
1 files changed, 21 insertions, 15 deletions
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 730bc386c..923c1dccc 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -24,6 +24,7 @@ details. */
#include "cygheap.h"
#include "child_info.h"
#include "cygtls.h"
+#include "tls_pbuf.h"
#include "perprocess.h"
#include "dll_init.h"
#include "sync.h"
@@ -348,16 +349,21 @@ frok::parent (volatile char * volatile stack_here)
ch.stackbottom, ch.stacktop, ch.stacksize);
PROCESS_INFORMATION pi;
- STARTUPINFO si;
+ STARTUPINFOW si;
memset (&si, 0, sizeof (si));
- si.cb = sizeof (STARTUPINFO);
+ si.cb = sizeof si;
si.lpReserved2 = (LPBYTE) &ch;
si.cbReserved2 = sizeof (ch);
- syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %p, 0, 0, %p, %p)",
- myself->progname, myself->progname, c_flags, &si, &pi);
+ /* FIXME: myself->progname should be converted to WCHAR. */
+ tmp_pathbuf tp;
+ PWCHAR progname = tp.w_get ();
+ sys_mbstowcs (progname, NT_MAX_PATH, myself->progname);
+
+ syscall_printf ("CreateProcess (%W, %W, 0, 0, 1, %p, 0, 0, %p, %p)",
+ progname, progname, c_flags, &si, &pi);
bool locked = __malloc_lock ();
time_t start_time = time (NULL);
@@ -367,21 +373,21 @@ frok::parent (volatile char * volatile stack_here)
while (1)
{
- rc = CreateProcess (myself->progname, /* image to run */
- myself->progname, /* what we send in arg0 */
- &sec_none_nih,
- &sec_none_nih,
- TRUE, /* inherit handles from parent */
- c_flags,
- NULL, /* environment filled in later */
- 0, /* use current drive/directory */
- &si,
- &pi);
+ rc = CreateProcessW (progname, /* image to run */
+ progname, /* what we send in arg0 */
+ &sec_none_nih,
+ &sec_none_nih,
+ TRUE, /* inherit handles from parent */
+ c_flags,
+ NULL, /* environment filled in later */
+ 0, /* use current drive/directory */
+ &si,
+ &pi);
if (!rc)
{
this_errno = geterrno_from_win_error ();
- error = "CreateProcessA failed";
+ error = "CreateProcessW failed";
memset (&pi, 0, sizeof (pi));
goto cleanup;
}