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

Modified env_get_string() to accept wcstring instead of wchar_t*.

Browse Source
This commit is contained in:
Siteshwar Vashisht
2012-02-24 00:55:46 +05:30
parent 2ae56564ef
commit 8232857d07
9 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
env.cpp
View File

@@ -1076,12 +1076,11 @@ const wchar_t *env_var_t::c_str(void) const {
return wcstring::c_str();
}
env_var_t env_get_string( const wchar_t *key )
env_var_t env_get_string( const wcstring &key )
{
scoped_lock lock(env_lock);
CHECK( key, 0 );
if( wcscmp( key, L"history" ) == 0 )
if( key == L"history" )
{
wcstring result;
const wchar_t *current;
@@ -1113,19 +1112,19 @@ env_var_t env_get_string( const wchar_t *key )
return result;
}
else if( wcscmp( key, L"COLUMNS" )==0 )
else if( key == L"COLUMNS" )
{
return format_val((long)common_get_width());
}
else if( wcscmp( key, L"LINES" )==0 )
else if( key == L"LINES" )
{
return format_val((long)common_get_width());
}
else if( wcscmp( key, L"status" )==0 )
else if( key == L"status" )
{
return format_val((long)proc_get_last_status());
}
else if( wcscmp( key, L"umask" )==0 )
else if( key == L"umask" )
{
return format_string(L"0%0.3o", get_umask() );
}