github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-04-01 17:35:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make string conversion in wutil.c handle special 'broken encoding' sequences

Browse Source 
darcs-hash:20060203004028-ac50b-01fbe7b22aece08a7a4d1afe84affd80ce944d40.gz
This commit is contained in:
axel 2006-02-03 10:40:28 +10:00
parent 847b6daa34
commit 294da72d11
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
wutil.c
View File

@ -68,9 +68,16 @@ void wutil_destroy()
*/
static char *wutil_wcs2str( const wchar_t *in )
{
size_t res=0;
int in_pos=0;
int out_pos = 0;
mbstate_t state;
size_t new_sz;
wutil_calls++;
memset( &state, 0, sizeof(state) );
size_t new_sz =MAX_UTF8_BYTES*wcslen(in)+1;
new_sz =MAX_UTF8_BYTES*wcslen(in)+1;
if( tmp_len < new_sz )
{
new_sz = maxi( new_sz, TMP_LEN_MIN );
@ -82,8 +89,37 @@ static char *wutil_wcs2str( const wchar_t *in )
tmp_len = new_sz;
}
wcstombs( tmp, in, tmp_len );
return tmp;
while( in[in_pos] )
{
if( ( in[in_pos] >= ENCODE_DIRECT_BASE) &&
( in[in_pos] < ENCODE_DIRECT_BASE+256) )
{
tmp[out_pos++] = in[in_pos]- ENCODE_DIRECT_BASE;
}
else
{
res = wcrtomb( &tmp[out_pos], in[in_pos], &state );
switch( res )
{
case (size_t)(-1):
{
debug( 1, L"Wide character has no narrow representation" );
memset( &state, 0, sizeof(state) );
break;
}
default:
{
out_pos += res;
break;
}
}
}
in_pos++;
}
tmp[out_pos] = 0;
return tmp;
}
wchar_t *wgetcwd( wchar_t *buff, size_t sz )
@ -259,7 +295,7 @@ wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path)
wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path)
{
char *tmp =wutil_wcs2str(name);
char *tmp =wutil_wcs2str(pathname);
char narrow[PATH_MAX];
char *narrow_res = realpath( tmp, narrow );
wchar_t *res;