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

Do not stop evaluation on wildcard error

Browse Source 
darcs-hash:20051209024116-ac50b-4053af9c2800565b752476a6cdb31d3a5c43b113.gz
This commit is contained in:
axel 2005-12-09 12:41:16 +10:00
parent e2ed5d0977
commit f6e194447d
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
parser.c
View File

@ -202,11 +202,14 @@ void parser_push_block( int type )
/*
New blocks should be skipped if the outer block is skipped,
except TOP ans SUBST block, which open up new environments
except TOP ans SUBST block, which open up new environments. Fake
blocks should always be skipped. Rather complicated... :-(
*/
new->skip=current_block?current_block->skip:0;
if( type == TOP || type == SUBST )
new->skip = 0;
if( type == FAKE )
new->skip = 1;
new->job = 0;
@ -658,7 +661,7 @@ wchar_t *get_filename( const wchar_t *cmd )
break;
default:
debug( 1,
L"Error while searching for command %d",
L"Error while searching for command %ls",
new_cmd );
wperror( L"access" );
}
@ -763,13 +766,6 @@ static void print_errors()
{
int tmp;
/*
Wildcard warnings are only printed in interactive mode
*/
if( ( error_code == WILDCARD_ERROR ) && !is_interactive )
return;
debug( 0, L"%ls", err_str );
tmp = current_tokenizer_pos;
@ -1268,11 +1264,21 @@ static void parse_job_main_loop( process_t *p,
{
if( unmatched_wildcard && !matched_wildcard )
{
error( WILDCARD_ERROR,
unmatched_pos,
WILDCARD_ERR_MSG,
unmatched );
j->wildcard_error = 1;
proc_set_last_status( 1 );
if( is_interactive && !is_block )
{
int tmp;
debug( 1, WILDCARD_ERR_MSG, unmatched );
tmp = current_tokenizer_pos;
current_tokenizer_pos = unmatched_pos;
fwprintf( stderr, L"%ls", parser_current_line() );
current_tokenizer_pos=tmp;
}
}
}
free( unmatched );
@ -1700,7 +1706,6 @@ static int parse_job( process_t *p,
*/
while( prev_block != current_block )
parser_pop_block();
}
al_destroy( &args );
@ -1719,9 +1724,10 @@ static int parse_job( process_t *p,
static void skipped_exec( job_t * j )
{
process_t *p;
for( p = j->first_process; p; p=p->next )
{
if( p->type )
if( p->type == INTERNAL_BUILTIN )
{
if(( wcscmp( p->argv[0], L"for" )==0) ||
( wcscmp( p->argv[0], L"switch" )==0) ||
@ -1850,6 +1856,7 @@ static void eval_job( tokenizer *tok )
}
skip |= current_block->skip;
skip |= j->wildcard_error;
if(!skip )
{

3
proc.h
View File

@ -134,6 +134,9 @@ typedef struct job
/** Should the exit status be negated? This flag can only be set by the not builtin. */
int negate;
/** This flag is set to one on wildcard expansion errors. It means that the current command should not be executed */
int wildcard_error;
/** Pointer to the next job */
struct job *next;
}