Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make all error messages from options parsin in builtins redirectable

Browse source 
darcs-hash:20070121145527-ac50b-1375af219a5eba6167e99d3fe24b26dba60eba2a.gz
This commit is contained in:
axel 2007-01-22 00:55:27 +10:00
parent b3500bfbdc
commit 64f1024eb5
6 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
builtin.c
View file

@ -139,7 +139,6 @@ static hash_table_t *desc=0;
/** /**
Counts the number of non null pointers in the specified array Counts the number of non null pointers in the specified array
*/ */
static int builtin_count_args( wchar_t **argv ) static int builtin_count_args( wchar_t **argv )
{ {
int argc = 1; int argc = 1;
@ -237,7 +236,7 @@ wchar_t *builtin_help_get( const wchar_t *name )
} }
static void builtin_print_help( wchar_t *cmd, string_buffer_t *b ) static void builtin_print_help( const wchar_t *cmd, string_buffer_t *b )
{ {
const wchar_t *h; const wchar_t *h;
@ -342,6 +341,20 @@ static void builtin_print_help( wchar_t *cmd, string_buffer_t *b )
} }
} }
/**
Perform error reporting for encounter with unknown option
*/
static void builtin_unknown_option( const wchar_t *cmd, const wchar_t *opt )
{
sb_printf( sb_err,
BUILTIN_ERR_UNKNOWN,
cmd,
opt );
sb_append( sb_err,
parser_current_line() );
builtin_print_help( cmd, sb_err );
}
/* /*
Here follows the definition of all builtin commands. The function Here follows the definition of all builtin commands. The function
names are all on the form builtin_NAME where NAME is the name of the names are all on the form builtin_NAME where NAME is the name of the
@ -431,8 +444,7 @@ static int builtin_bind( wchar_t **argv )
return STATUS_BUILTIN_OK; return STATUS_BUILTIN_OK;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -533,8 +545,7 @@ static int builtin_block( wchar_t **argv )
break; break;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -666,8 +677,7 @@ static int builtin_builtin( wchar_t **argv )
break; break;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -752,8 +762,7 @@ static int builtin_generic( wchar_t **argv )
return STATUS_BUILTIN_OK; return STATUS_BUILTIN_OK;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -947,8 +956,7 @@ static int builtin_functions( wchar_t **argv )
break; break;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -1281,7 +1289,7 @@ static int builtin_function( wchar_t **argv )
return STATUS_BUILTIN_OK; return STATUS_BUILTIN_OK;
case '?': case '?':
builtin_unknown_option( argv[0], argv[woptind-1] );
res = 1; res = 1;
break; break;
@ -1434,8 +1442,7 @@ static int builtin_random( wchar_t **argv )
break; break;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -1619,8 +1626,7 @@ static int builtin_read( wchar_t **argv )
return STATUS_BUILTIN_OK; return STATUS_BUILTIN_OK;
case L'?': case L'?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -1925,8 +1931,7 @@ static int builtin_status( wchar_t **argv )
break; break;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return STATUS_BUILTIN_ERROR; return STATUS_BUILTIN_ERROR;
} }
@ -3137,6 +3142,8 @@ void builtin_init()
int i; int i;
wopterr = 0;
al_init( &io_stack ); al_init( &io_stack );
hash_init( &builtin, &hash_wcs_func, &hash_wcs_cmp ); hash_init( &builtin, &hash_wcs_func, &hash_wcs_cmp );

2
builtin_commandline.c
View file

@ -381,7 +381,7 @@ static int builtin_commandline( wchar_t **argv )
return 0; return 0;
case L'?': case L'?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return 1; return 1;
} }
} }

5
builtin_complete.c
View file

@ -474,10 +474,7 @@ static int builtin_complete( wchar_t **argv )
return 0; return 0;
case '?': case '?':
sb_append( sb_err, builtin_unknown_option( argv[0], argv[woptind-1] );
parser_current_line() );
builtin_print_help( argv[0], sb_err );
res = 1; res = 1;
break; break;

3
builtin_jobs.c
View file

@ -253,8 +253,7 @@ static int builtin_jobs( wchar_t **argv )
return 0; return 0;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return 1; return 1;
} }

2
builtin_set.c
View file

@ -539,7 +539,7 @@ static int builtin_set( wchar_t **argv )
return 0; return 0;
case '?': case '?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return 1; return 1;
default: default:

2
builtin_ulimit.c
View file

@ -419,7 +419,7 @@ static int builtin_ulimit( wchar_t ** argv )
return 0; return 0;
case L'?': case L'?':
builtin_print_help( argv[0], sb_err ); builtin_unknown_option( argv[0], argv[woptind-1] );
return 1; return 1;
} }
} }