diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-11-28 21:58:48 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-11-28 21:58:48 +0400 |
| commit | c1af7c27eb9be58b7c43b4af927579b0514908dc (patch) | |
| tree | d4089b6e43d3c886c8406633ea56611c8c71834f | |
| parent | 8ae61a8d6cf38aafd951399f884a3c9d4a15e5f7 (diff) | |
* locale.cc (print_locale_with_codeset): Fetch Windows path as UNICODE
path and convert that to POSIX.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/locale.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index b56af5aee..fdcf07800 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,10 @@ 2011-11-28 Corinna Vinschen <corinna@vinschen.de> + * locale.cc (print_locale_with_codeset): Fetch Windows path as UNICODE + path and convert that to POSIX. + +2011-11-28 Corinna Vinschen <corinna@vinschen.de> + * ps.cc: Remove all Win 9x considerations. Use psapi functions directly. Drop support for older Cygwin DLLs. Just use progname_long as is since it's already a POSIX path now. Rename "tty" to "pty" as in diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc index 8ce7a5253..572ed4bcf 100644 --- a/winsup/utils/locale.cc +++ b/winsup/utils/locale.cc @@ -154,10 +154,10 @@ print_locale_with_codeset (int verbose, loc_t *locale, bool utf8, return; if (!sysroot) { - char sysbuf[PATH_MAX]; + WCHAR sysbuf[PATH_MAX]; HMODULE k32 = GetModuleHandleW (L"kernel32.dll"); - if (GetModuleFileName (k32, sysbuf, PATH_MAX)) - sysroot = (const char *) cygwin_create_path (CCP_WIN_A_TO_POSIX, + if (GetModuleFileNameW (k32, sysbuf, PATH_MAX)) + sysroot = (const char *) cygwin_create_path (CCP_WIN_W_TO_POSIX, sysbuf); if (!sysroot) sysroot = "kernel32.dll"; |