diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2008-02-25 21:32:23 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2008-02-25 21:32:23 +0300 |
commit | 5ab0b5cf529c3f069264b469db4aacbcb95ce760 (patch) | |
tree | 0800401dfb684fc09dbafeb0b74319e970bd4fa0 /winsup/cygwin/dcrt0.cc | |
parent | ff42f5b1e35d7c605288680b6f7de02d675143b7 (diff) |
* dcrt0.cc (initial_env): Only use local buffer "buf" if DEBUGGING is
enabled. Replace calls to GetEnvironmentVariable by calls to
GetEnvironmentVariableA for clarity. Call GetEnvironmentVariableA
with NULL buffer.
(cygbench): Ditto, drop local buffer.
* environ.cc (getearly): Call GetEnvironmentVariableA.
(environ_init): Retrieve unicode environment and convert to current
codepage locally.
(getwinenveq): Ditto.
* exceptions.cc (try_to_debug): Accommodate new sys_mbstowcs calling
convention.
* fhandler_clipboard.cc (set_clipboard): Call sys_mbstowcs to retrieve
required buffer length.
* fork.cc (frok::child): Call GetEnvironmentVariableA.
* miscfuncs.cc: Accommodate changed arguments in calls to sys_mbstowcs.
* sec_auth.cc: Ditto.
* strfuncs.cc (sys_wcstombs_alloc): Fix formatting.
(sys_mbstowcs): Change arguments to allow specifying a source string
length.
(sys_mbstowcs_alloc): Ditto.
* uinfo.cc (cygheap_user::ontherange): Accommodate changed arguments in
calls to sys_mbstowcs.
* winsup.h (sys_mbstowcs): Adjust declaration.
(sys_mbstowcs_alloc): Ditto.
Diffstat (limited to 'winsup/cygwin/dcrt0.cc')
-rw-r--r-- | winsup/cygwin/dcrt0.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index eb4da06c1..7468fe04b 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -532,14 +532,14 @@ break_here () static void initial_env () { - char buf[NT_MAX_PATH]; - if (GetEnvironmentVariable ("CYGWIN_TESTING", buf, sizeof (buf) - 1)) + if (GetEnvironmentVariableA ("CYGWIN_TESTING", NULL, 0)) _cygwin_testing = 1; #ifdef DEBUGGING + char buf[NT_MAX_PATH]; DWORD len; - if (GetEnvironmentVariable ("CYGWIN_SLEEP", buf, sizeof (buf) - 1)) + if (GetEnvironmentVariableA ("CYGWIN_SLEEP", buf, sizeof (buf) - 1)) { DWORD ms = atoi (buf); console_printf ("Sleeping %d, pid %u %P\n", ms, GetCurrentProcessId ()); @@ -547,7 +547,7 @@ initial_env () if (!strace.active () && !dynamically_loaded) strace.hello (); } - if (GetEnvironmentVariable ("CYGWIN_DEBUG", buf, sizeof (buf) - 1)) + if (GetEnvironmentVariableA ("CYGWIN_DEBUG", buf, sizeof (buf) - 1)) { char buf1[NT_MAX_PATH]; len = GetModuleFileName (NULL, buf1, NT_MAX_PATH); @@ -1141,8 +1141,7 @@ multiple_cygwin_problem (const char *what, unsigned magic_version, unsigned vers return; } - char buf[1024]; - if (GetEnvironmentVariable ("CYGWIN_MISMATCH_OK", buf, sizeof (buf))) + if (GetEnvironmentVariableA ("CYGWIN_MISMATCH_OK", NULL, 0)) return; if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version) @@ -1162,8 +1161,7 @@ are unable to find another cygwin DLL.", void __stdcall cygbench (const char *s) { - char buf[1024]; - if (GetEnvironmentVariable ("CYGWIN_BENCH", buf, sizeof (buf))) + if (GetEnvironmentVariableA ("CYGWIN_BENCH", NULL, 0)) small_printf ("%05d ***** %s : %10d\n", GetCurrentProcessId (), s, strace.microseconds ()); } #endif |