diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-10-22 14:22:07 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-10-22 14:22:07 +0200 |
| commit | ef75017378c2b6ae62cb8bdb196a4d188302f930 (patch) | |
| tree | 4ae5fd93d238faf7bc2d8547a632df7592ddfe3d /winsup/cygwin/uinfo.cc | |
| parent | c0345822e502f45b412ab595e14c51dfdae5aaef (diff) | |
| download | cygnal-ef75017378c2b6ae62cb8bdb196a4d188302f930.tar.gz cygnal-ef75017378c2b6ae62cb8bdb196a4d188302f930.tar.bz2 cygnal-ef75017378c2b6ae62cb8bdb196a4d188302f930.zip | |
Fix length returned from sys_cp_wcstombs in case nwc > # of wchars
* strfuncs.cc (sys_cp_wcstombs): Always return number of multibytes
without trailing NUL as the documentation implies. Throughout Cygwin,
fix usage to align to this pattern.
* fhandler_process.cc (format_process_winexename): Drop trailing NUL
and LF from output.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/uinfo.cc')
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index da5809f64..df7d42f8e 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -56,7 +56,7 @@ cygheap_user::init () if (GetEnvironmentVariableW (L"USERNAME", user_name, user_name_len) || GetEnvironmentVariableW (L"USER", user_name, user_name_len)) { - char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name)]; + char mb_user_name[user_name_len = sys_wcstombs (NULL, 0, user_name) + 1]; sys_wcstombs (mb_user_name, user_name_len, user_name); set_name (mb_user_name); } |