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

* fhandler_disk_file.cc (fhandler_disk_file::readdir_helper): Drop

Browse Source 
explicit transformation of special DOS chars.
	* strfuncs.cc (sys_wcstombs): Always transform UNICODE private use area
	back to ASCII.
This commit is contained in:
Corinna Vinschen
2008-05-14 10:21:22 +00:00
parent 39ce0b45e9
commit 455acb11a4
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/strfuncs.cc
View File

@@ -11,6 +11,7 @@ details. */
#include "winsup.h"
#include <stdlib.h>
#include <wchar.h>
#include <winnls.h>
#include <ntdll.h>
#include "cygerrno.h"
@@ -39,7 +40,18 @@ sys_wcstombs (char *tgt, int tlen, const PWCHAR src, int slen)
{
int ret;
ret = WideCharToMultiByte (get_cp (), 0, src, slen, tgt, tlen, NULL, NULL);
/* Convert UNICODE private use area. Reverse functionality (only for
path names) is transform_chars in path.cc. */
if (slen < 0)
slen = wcslen (src) + 1;
WCHAR sbuf[slen];
memcpy (sbuf, src, slen * sizeof (WCHAR));
const unsigned char *end = (unsigned char *) (sbuf + slen);
for (unsigned char *s = ((unsigned char *) sbuf) + 1; s < end;
s += sizeof (WCHAR))
if (*s == 0xf0)
*s = 0;
ret = WideCharToMultiByte (get_cp (), 0, sbuf, slen, tgt, tlen, NULL, NULL);
if (ret && tgt)
{
ret = (ret < tlen) ? ret : tlen - 1;