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

Modified exec.cpp to use env_get_string(); rolled back changes to expand.cpp in last commit, because pressing ^D results into an error with the changes

Browse Source
This commit is contained in:
Siteshwar Vashisht
2012-01-12 21:39:00 +05:30
parent 9b56b67c0e
commit ee687ee433
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exec.cpp
View File

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

5
expand.cpp
View File

@@ -176,7 +176,7 @@ int expand_is_clean( const wchar_t *in )
/**
Return the environment variable value for the string starting at \c in.
*/
static wchar_t *expand_var( wchar_t *in )
static const wchar_t* expand_var( wchar_t *in )
{
if( !in )
return 0;
@@ -958,7 +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;
wchar_t * var_val;
const wchar_t * var_val;
wchar_t * new_in;
int is_single = (c==VARIABLE_EXPAND_SINGLE);
int var_name_stop_pos;
@@ -990,7 +990,6 @@ 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 = expand_var( (wchar_t *)var_tmp->buff );
if( var_val )