h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-01 21:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fixup wsetlocale to use wcstring

Browse Source
This commit is contained in:
ridiculousfish
2012-01-31 21:06:52 -08:00
parent eef1e3e77e
commit bb19fe703a
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common.cpp
View File

@@ -573,12 +573,11 @@ wchar_t *quote_end( const wchar_t *pos )
}
const wchar_t *wsetlocale(int category, const wchar_t *locale)
wcstring wsetlocale(int category, const wchar_t *locale)
{
char *lang = locale?wcs2str( locale ):0;
char * res = setlocale(category,lang);
free( lang );
/*
@@ -588,17 +587,9 @@ const wchar_t *wsetlocale(int category, const wchar_t *locale)
ellipsis_char = (strstr( ctype, ".UTF")||strstr( ctype, ".utf") )?L'\x2026':L'$';
if( !res )
return 0;
if( !setlocale_buff )
{
setlocale_buff = sb_halloc( global_context);
}
sb_clear( setlocale_buff );
sb_printf( setlocale_buff, L"%s", res );
return (wchar_t *)setlocale_buff->buff;
return wcstring();
else
return format_string(L"%s", res);
}
bool contains_internal( const wchar_t *a, ... )