github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Modified complete.cpp to use env_get_string(); Fixed env_get_string() return an empty wcstring instead of returning 0.

Browse Source
This commit is contained in:
Siteshwar Vashisht 2012-01-10 01:40:03 +05:30
parent 7b3377e78c
commit 7bde2b5cbf
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
complete.cpp
View File

@ -1080,15 +1080,16 @@ static void complete_cmd( const wchar_t *cmd,
int use_builtin, int use_builtin,
int use_command ) int use_command )
{ {
wchar_t *path; wcstring path;
wchar_t *path_cpy; wchar_t *path_cpy;
wchar_t *nxt_path; wchar_t *nxt_path;
wchar_t *state; wchar_t *state;
array_list_t possible_comp; array_list_t possible_comp;
wchar_t *nxt_completion; wchar_t *nxt_completion;
wchar_t *cdpath = env_get(L"CDPATH"); const wcstring cdpath = env_get_string(L"CDPATH");
wchar_t *cdpath_cpy = wcsdup( cdpath?cdpath:L"." ); // wchar_t *cdpath_cpy = wcsdup( cdpath?cdpath:L"." );
wchar_t *cdpath_cpy = wcsdup( !cdpath.empty()?cdpath.c_str():L"." );
if( (wcschr( cmd, L'/') != 0) || (cmd[0] == L'~' ) ) if( (wcschr( cmd, L'/') != 0) || (cmd[0] == L'~' ) )
{ {
@ -1110,11 +1111,11 @@ static void complete_cmd( const wchar_t *cmd,
if( use_command ) if( use_command )
{ {
path = env_get(L"PATH"); path = env_get_string(L"PATH");
if( path ) if( !path.empty() )
{ {
path_cpy = wcsdup( path ); path_cpy = wcsdup( path.c_str() );
for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state ); for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state );
nxt_path != 0; nxt_path != 0;
@ -1650,10 +1651,11 @@ static int complete_variable( const wchar_t *whole_var,
if( match || match_no_case ) if( match || match_no_case )
{ {
wchar_t *value_unescaped, *value; wcstring value_unescaped;
wchar_t *value;
value_unescaped = env_get( name ); value_unescaped = env_get_string( name );
if( value_unescaped ) if( !value_unescaped.empty() )
{ {
string_buffer_t desc; string_buffer_t desc;
string_buffer_t comp; string_buffer_t comp;
@ -1673,7 +1675,7 @@ static int complete_variable( const wchar_t *whole_var,
flags = COMPLETE_NO_CASE | COMPLETE_DONT_ESCAPE; flags = COMPLETE_NO_CASE | COMPLETE_DONT_ESCAPE;
} }
value = expand_escape_variable( value_unescaped ); value = expand_escape_variable( value_unescaped.c_str() );
sb_init( &desc ); sb_init( &desc );
sb_printf( &desc, COMPLETE_VAR_DESC_VAL, value ); sb_printf( &desc, COMPLETE_VAR_DESC_VAL, value );

4
env.cpp
View File

@ -1199,7 +1199,7 @@ wcstring env_get_string( const wchar_t *key )
{ {
if( wcscmp( res->val, ENV_NULL )==0) if( wcscmp( res->val, ENV_NULL )==0)
{ {
return 0; return wcstring(L"");
} }
else else
{ {
@ -1226,7 +1226,7 @@ wcstring env_get_string( const wchar_t *key )
if( !item || (wcscmp( item, ENV_NULL )==0)) if( !item || (wcscmp( item, ENV_NULL )==0))
{ {
return 0; return wcstring(L"");
} }
else else
{ {