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

* dtable.cc (handle_to_fn): Accomodate new argument order in call to

Browse Source 
sys_wcstombs.
	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Call sys_wcstombs
	instead of just wcstombs to accomodate OEM codepages.
	* miscfuncs.cc (sys_wcstombs): Split len argument in source and target
	length.  Always 0-terminate result in target string.
	* security.cc (lsa2wchar): Remove unused function.
	(lsa2str): Ditto.
	(get_lsa_srv_inf): Ditto.
	(get_logon_server): Accomodate new argument order in call to
	sys_wcstombs.
	(get_user_groups): Ditto.
	(get_user_local_groups): Ditto.
	(get_priv_list): Call sys_wcstombs directly instead of lsa2str.
	* uinfo.cc (cygheap_user::ontherange): Accomodate new argument order
	in call to sys_wcstombs.
	* winsup.h (sys_wcstombs): Change prototype to match new argument order.
This commit is contained in:
Corinna Vinschen
2006-02-07 15:49:08 +00:00
parent 3cb155a97f
commit 03a49a00ab
7 changed files with 42 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/miscfuncs.cc
View File

@@ -210,10 +210,18 @@ get_cp ()
return current_codepage == ansi_cp ? GetACP() : GetOEMCP();
}
/* tlen is always treated as the maximum buffer size, including the '\0'
character. sys_wcstombs will always return a 0-terminated result, no
matter what. */
int __stdcall
sys_wcstombs (char *tgt, const WCHAR *src, int len)
sys_wcstombs (char *tgt, int tlen, const WCHAR *src, int slen)
{
return WideCharToMultiByte (get_cp (), 0, src, -1, tgt, len, NULL, NULL);
int ret;
ret = WideCharToMultiByte (get_cp (), 0, src, slen, tgt, tlen, NULL, NULL);
if (ret)
tgt[ret < tlen ? ret : tlen - 1] = '\0';
return ret;
}
int __stdcall