github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-01 10:57:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Modified expand.cpp and exec.cpp to use env_get_string()"

Browse Source 
This reverts commit 48655e882e.
This commit is contained in:
Siteshwar Vashisht 2012-01-12 04:21:11 +05:30
parent 48655e882e
commit 9b56b67c0e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exec.cpp
View File

@ -1740,7 +1740,7 @@ int exec_subshell( const wchar_t *cmd,
CHECK( cmd, -1 );
ifs = env_get_string(L"IFS").empty()?NULL:env_get_string(L"IFS").c_str();
ifs = env_get_string(L"IFS").empty()?NULL:env_get_string(L"IFS");
if( ifs && ifs[0] )
{

10
expand.cpp
View File

@ -176,11 +176,11 @@ int expand_is_clean( const wchar_t *in )
/**
Return the environment variable value for the string starting at \c in.
*/
static wcstring expand_var( wchar_t *in )
static wchar_t *expand_var( wchar_t *in )
{
if( !in )
return 0;
return env_get_string( in );
return env_get( in );
}
/**
@ -958,8 +958,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx )
int start_pos = i+1;
int stop_pos;
int var_len, new_len;
const wchar_t * var_val;
wcstring var_val_wstr;
wchar_t * var_val;
wchar_t * new_in;
int is_single = (c==VARIABLE_EXPAND_SINGLE);
int var_name_stop_pos;
@ -992,8 +991,7 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx )
sb_append_substring( var_tmp, &in[start_pos], var_len );
var_val_wstr = expand_var( (wchar_t *)var_tmp->buff );
var_val = var_val_wstr.empty()?NULL:var_val_wstr.c_str();
var_val = expand_var( (wchar_t *)var_tmp->buff );
if( var_val )
{