JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.h (cwdstuff): Convert to class. Make posix and dir private.

Browse Source 
(cwdstuff::get_posix): New method.
	(cwdstuff::reset_posix): New method.
	* dcrt0.cc (dll_crt0_1): Call setlocale rather than _setlocale_r.
	* environ.cc (environ_init): Ditto.  Prefer "C" locale over current
	codepage default locale.
	* path.cc (chdir): Use cwdstuff::get_posix method instead of accessing
	cwdstuff::posix directly.
	(cwdstuff::set): Defer creating posix path to first usage.
	(cwdstuff::get_posix): Create posix path if it's empty, and return it.
	(cwdstuff::get): Create posix path if it's empty.
	* strfuncs.cc (sys_cp_wcstombs): Use UTF-8 conversion in the "C"
	locale.
	(sys_cp_mbstowcs): Ditto.
	* syscalls.cc (gen_full_path_at): Fetch CWD posix path locked.
	(setlocale): Implement here.  Reset CWD posix path.
This commit is contained in:
Corinna Vinschen
2009-05-13 15:00:06 +00:00
parent 136033a852
commit b6c6ea43f3
7 changed files with 75 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
winsup/cygwin/path.cc
View File

@ -2599,7 +2599,7 @@ chdir (const char *in_dir)
/* Note that we're accessing cwd.posix without a lock here. I didn't think
it was worth locking just for strace. */
syscall_printf ("%d = chdir() cygheap->cwd.posix '%s' native '%S'", res,
cygheap->cwd.posix, path.get_nt_native_path ());
cygheap->cwd.get_posix (), path.get_nt_native_path ());
MALLOC_CHECK;
return res;
}
@ -3230,8 +3230,8 @@ cwdstuff::set (PUNICODE_STRING nat_cwd, const char *posix_cwd, bool doit)
posix_cwd = (const char *) tp.c_get ();
mount_table->conv_to_posix_path (win32.Buffer, (char *) posix_cwd, 0);
}
posix = (char *) crealloc_abort (posix, strlen (posix_cwd) + 1);
stpcpy (posix, posix_cwd);
if (posix)
posix[0] = '\0';
}
out:
@ -3240,6 +3240,21 @@ out:
}
/* Copy the value for either the posix or the win32 cwd into a buffer. */
char *
cwdstuff::get_posix ()
{
if (!posix || !*posix)
{
tmp_pathbuf tp;
char *tocopy = tp.c_get ();
mount_table->conv_to_posix_path (win32.Buffer, tocopy, 0);
posix = (char *) crealloc_abort (posix, strlen (tocopy) + 1);
stpcpy (posix, tocopy);
}
return posix;
}
char *
cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
{
@ -3265,6 +3280,13 @@ cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
sys_wcstombs (tocopy, NT_MAX_PATH, win32.Buffer,
win32.Length / sizeof (WCHAR));
}
else if (!posix || !*posix)
{
tocopy = tp.c_get ();
mount_table->conv_to_posix_path (win32.Buffer, tocopy, 0);
posix = (char *) crealloc_abort (posix, strlen (tocopy) + 1);
stpcpy (posix, tocopy);
}
else
tocopy = posix;