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

Modified builting.cpp to use env_get_string()

Browse Source
This commit is contained in:
Siteshwar Vashisht
2012-01-10 00:00:54 +05:30
parent a6b3f6b5d4
commit 7530057c6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin.cpp
View File

@@ -2007,7 +2007,7 @@ static int builtin_read( wchar_t **argv )
{
wchar_t *buff=0;
int i, argc = builtin_count_args( argv );
const wchar_t *ifs;
wcstring ifs;
int place = ENV_USER;
wchar_t *nxt;
const wchar_t *prompt = DEFAULT_READ_PROMPT;
@@ -2292,11 +2292,11 @@ static int builtin_read( wchar_t **argv )
wchar_t *state;
ifs = env_get( L"IFS" );
if( ifs == 0 )
ifs = env_get_string( L"IFS" );
if( ifs.empty() )
ifs = L"";
nxt = wcstok( buff, (i<argc-1)?ifs:L"", &state );
nxt = wcstok( buff, (i<argc-1)?ifs.c_str():L"", &state );
while( i<argc )
{
@@ -2304,7 +2304,7 @@ static int builtin_read( wchar_t **argv )
i++;
if( nxt != 0 )
nxt = wcstok( 0, (i<argc-1)?ifs:L"", &state);
nxt = wcstok( 0, (i<argc-1)?ifs.c_str():L"", &state);
}
}