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

Additional migration to STL data structures

Browse Source
This commit is contained in:
ridiculousfish
2012-01-10 12:51:09 -08:00
parent a6b3f6b5d4
commit c18d177b8c
5 changed files with 107 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
reader.cpp
View File

@@ -677,21 +677,18 @@ void reader_write_title()
*/
static void exec_prompt()
{
int i;
size_t i;
array_list_t prompt_list;
al_init( &prompt_list );
wcstring_list_t prompt_list;
if( data->prompt.size() )
{
proc_push_interactive( 0 );
if( exec_subshell( data->prompt.c_str(), &prompt_list ) == -1 )
if( exec_subshell2( data->prompt.c_str(), prompt_list ) == -1 )
{
/* If executing the prompt fails, make sure we at least don't print any junk */
al_foreach( &prompt_list, &free );
al_destroy( &prompt_list );
al_init( &prompt_list );
prompt_list.clear();
}
proc_pop_interactive();
}
@@ -700,15 +697,11 @@ static void exec_prompt()
data->prompt_buff.resize(0);
for( i = 0; i < al_get_count( &prompt_list ); i++ )
for( i = 0; i < prompt_list.size(); i++ )
{
if (i > 0) data->prompt_buff += L"\n";
data->prompt_buff += (wchar_t *)al_get( &prompt_list, i );
}
al_foreach( &prompt_list, &free );
al_destroy( &prompt_list );
if (i > 0) data->prompt_buff += L'\n';
data->prompt_buff += prompt_list.at(i);
}
}
void reader_init()