Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix narrow/wide encoding issues found through new test suite additions

Browse source 
darcs-hash:20070923210007-75c98-9ffee3b8f1ce24e1d6f178baa1f2ef52d70ee38b.gz
This commit is contained in:
liljencrantz 2007-09-24 07:00:07 +10:00
parent 5e2e9e2b9b
commit 449a75756d
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
common.c
View file

@ -263,10 +263,22 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out )
{
res = mbrtowc( &out[out_pos], &in[in_pos], len-in_pos, &state );
switch( res )
if( ( out[out_pos] >= ENCODE_DIRECT_BASE) &&
( out[out_pos] < ENCODE_DIRECT_BASE+256) ||
out[out_pos] == INTERNAL_SEPARATOR )
{
case (size_t)(-2):
case (size_t)(-1):
out[out_pos] = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos];
in_pos++;
memset( &state, 0, sizeof(state) );
out_pos++;
}
else
{
switch( res )
{
case (size_t)(-2):
case (size_t)(-1):
{
out[out_pos] = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos];
in_pos++;
@ -274,18 +286,20 @@ wchar_t *str2wcs_internal( const char *in, wchar_t *out )
break;
}
case 0:
{
return out;
}
case 0:
{
return out;
}
default:
{
in_pos += res;
break;
default:
{
in_pos += res;
break;
}
}
out_pos++;
}
out_pos++;
}
out[out_pos] = 0;
@ -324,7 +338,7 @@ char *wcs2str_internal( const wchar_t *in, char *out )
{
}
else if( ( in[in_pos] >= ENCODE_DIRECT_BASE) &&
( in[in_pos] < ENCODE_DIRECT_BASE+256) )
( in[in_pos] < ENCODE_DIRECT_BASE+256) )
{
out[out_pos++] = in[in_pos]- ENCODE_DIRECT_BASE;
}