Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

CLeanup the io_stack in builtin.cpp, other changes to migrate away from al_list

Browse source
This commit is contained in:
ridiculousfish 2012-02-07 23:53:34 -08:00
parent 5f686ebb47
commit 3f8621e566
2 changed files with 23 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
builtin.cpp
View file

@ -34,6 +34,7 @@
#include <wctype.h> #include <wctype.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <stack>
#include "fallback.h" #include "fallback.h"
#include "util.h" #include "util.h"
@ -125,7 +126,12 @@ string_buffer_t *sb_out=0, *sb_err=0;
/** /**
Stack containing builtin I/O for recursive builtin calls. Stack containing builtin I/O for recursive builtin calls.
*/ */
static array_list_t io_stack; struct io_stack_elem_t {
int in;
string_buffer_t *out;
string_buffer_t *err;
};
static std::stack<io_stack_elem_t> io_stack;
/** /**
The file from which builtin functions should attempt to read, use The file from which builtin functions should attempt to read, use
@ -3623,8 +3629,6 @@ void builtin_init()
{ {
wopterr = 0; wopterr = 0;
al_init( &io_stack );
for( size_t i=0; i < BUILTIN_COUNT; i++ ) for( size_t i=0; i < BUILTIN_COUNT; i++ )
{ {
intern_static( builtin_datas[i].name ); intern_static( builtin_datas[i].name );
@ -3633,7 +3637,6 @@ void builtin_init()
void builtin_destroy() void builtin_destroy()
{ {
al_destroy( &io_stack );
} }
int builtin_exists( const wcstring &cmd ) int builtin_exists( const wcstring &cmd )
@ -3714,11 +3717,11 @@ const wchar_t *builtin_get_desc( const wchar_t *name )
void builtin_push_io( parser_t &parser, int in ) void builtin_push_io( parser_t &parser, int in )
{ {
ASSERT_IS_MAIN_THREAD();
if( builtin_stdin != -1 ) if( builtin_stdin != -1 )
{ {
al_push_long( &io_stack, (long)builtin_stdin ); struct io_stack_elem_t elem = {builtin_stdin, sb_out, sb_err};
al_push( &io_stack, sb_out ); io_stack.push(elem);
al_push( &io_stack, sb_err );
} }
builtin_stdin = in; builtin_stdin = in;
sb_out = (string_buffer_t *)malloc(sizeof(string_buffer_t)); sb_out = (string_buffer_t *)malloc(sizeof(string_buffer_t));
@ -3729,17 +3732,20 @@ void builtin_push_io( parser_t &parser, int in )
void builtin_pop_io(parser_t &parser) void builtin_pop_io(parser_t &parser)
{ {
ASSERT_IS_MAIN_THREAD();
builtin_stdin = 0; builtin_stdin = 0;
sb_destroy( sb_out ); sb_destroy( sb_out );
sb_destroy( sb_err ); sb_destroy( sb_err );
free( sb_out); free( sb_out);
free(sb_err); free(sb_err);
if( al_get_count( &io_stack ) >0 ) if( ! io_stack.empty() )
{ {
sb_err = (string_buffer_t *)al_pop( &io_stack ); struct io_stack_elem_t &elem = io_stack.top();
sb_out = (string_buffer_t *)al_pop( &io_stack ); sb_err = elem.err;
builtin_stdin = (int)al_pop_long( &io_stack ); sb_out = elem.out;
builtin_stdin = elem.in;
io_stack.pop();
} }
else else
{ {

140
builtin_set.cpp
View file

@ -56,125 +56,7 @@ static int is_path_variable( const wchar_t *env )
Call env_set. If this is a path variable, e.g. PATH, validate the Call env_set. If this is a path variable, e.g. PATH, validate the
elements. On error, print a description of the problem to stderr. elements. On error, print a description of the problem to stderr.
*/ */
static int my_env_set( const wchar_t *key, array_list_t *val, int scope ) static int my_env_set( const wchar_t *key, wcstring_list_t &val, int scope )
{
string_buffer_t sb;
int i;
int retcode = 0;
wchar_t *val_str=0;
if( is_path_variable( key ) )
{
int error = 0;
for( i=0; i<al_get_count( val ); i++ )
{
int show_perror = 0;
int show_hint = 0;
struct stat buff;
const wchar_t *dir = (wchar_t *)al_get( val, i );
if( wstat( dir, &buff ) )
{
error = 1;
show_perror = 1;
}
if( !( S_ISDIR(buff.st_mode) ) )
{
error = 1;
}
if( error )
{
const wchar_t *colon;
sb_printf( sb_err,
_(BUILTIN_SET_PATH_ERROR),
L"set",
dir,
key );
colon = wcschr( dir, L':' );
if( colon && *(colon+1) )
{
show_hint = 1;
}
}
if( show_perror )
{
builtin_wperror( L"set" );
}
if( show_hint )
{
sb_printf( sb_err,
_(BUILTIN_SET_PATH_HINT),
L"set",
key,
key,
wcschr( dir, L':' )+1);
}
if( error )
{
break;
}
}
if( error )
{
return 1;
}
}
sb_init( &sb );
if( al_get_count( val ) )
{
for( i=0; i<al_get_count( val ); i++ )
{
wchar_t *next =(wchar_t *)al_get( val, i );
sb_append( &sb, next?next:L"" );
if( i<al_get_count( val )-1 )
{
sb_append( &sb, ARRAY_SEP_STR );
}
}
val_str = (wchar_t *)sb.buff;
}
switch( env_set( key, val_str, scope | ENV_USER ) )
{
case ENV_PERM:
{
sb_printf( sb_err, _(L"%ls: Tried to change the read-only variable '%ls'\n"), L"set", key );
retcode=1;
break;
}
case ENV_INVALID:
{
sb_printf( sb_err, _(L"%ls: Unknown error"), L"set" );
retcode=1;
break;
}
}
sb_destroy( &sb );
return retcode;
}
static int my_env_set2( const wchar_t *key, wcstring_list_t &val, int scope )
{ {
string_buffer_t sb; string_buffer_t sb;
size_t i; size_t i;
@ -864,7 +746,7 @@ static int builtin_set( parser_t &parser, wchar_t **argv )
if( erase ) if( erase )
{ {
erase_values(result, indexes); erase_values(result, indexes);
my_env_set2( dest, result, scope); my_env_set( dest, result, scope);
} }
else else
{ {
@ -885,9 +767,7 @@ static int builtin_set( parser_t &parser, wchar_t **argv )
sb_append( sb_err, L"\n" ); sb_append( sb_err, L"\n" );
} }
my_env_set2(dest, my_env_set(dest, result, scope);
result,
scope);
// al_destroy( &value ); // al_destroy( &value );
@ -925,18 +805,10 @@ static int builtin_set( parser_t &parser, wchar_t **argv )
} }
else else
{ {
array_list_t val; wcstring_list_t val;
al_init( &val );
for( i=woptind; i<argc; i++ ) for( i=woptind; i<argc; i++ )
{ val.push_back(argv[i]);
al_push( &val, argv[i] ); retcode = my_env_set( dest, val, scope );
}
retcode = my_env_set( dest, &val, scope );
al_destroy( &val );
} }
} }