github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-03 23:41:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor edits

Browse Source 
darcs-hash:20061028164448-ac50b-c53d5f235d01db3a11b01996b77411a213dc5303.gz
This commit is contained in:
axel 2006-10-29 02:44:48 +10:00
parent c5eaefc8b5
commit a6c00ca0d2
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin.c
View File

@ -2875,15 +2875,15 @@ static int builtin_case( wchar_t **argv )
const static builtin_data_t builtin_data[]=
{
{
L"exit", &builtin_exit, N_( L"Exit the shell" )
L"exit", &builtin_exit, N_( L"Exit the shell" )
}
,
{
L"block", &builtin_block, N_( L"Temporarily block delivery of events" )
L"block", &builtin_block, N_( L"Temporarily block delivery of events" )
}
,
{
L"builtin", &builtin_builtin, N_( L"Run a builtin command instead of a function" )
L"builtin", &builtin_builtin, N_( L"Run a builtin command instead of a function" )
}
,
{
@ -3085,6 +3085,8 @@ int builtin_exists( wchar_t *cmd )
*/
static int internal_help( wchar_t *cmd )
{
CHECK( cmd, 0 );
if( wcscmp( cmd, L"for" ) == 0 ||
wcscmp( cmd, L"while" ) == 0 ||
wcscmp( cmd, L"function" ) == 0 ||

8
common.h
View File

@ -78,9 +78,9 @@ extern wchar_t *program_name;
if( !(arg) ) \
{ \
debug( 1, \
L"function %s called with null value for argument %s. " \
L"This is a bug. " \
L"If you can reproduce it, please send a bug report to %s.", \
_( L"function %s called with null value for argument %s. " \
L"This is a bug. " \
L"If you can reproduce it, please send a bug report to %s." ), \
__func__, \
#arg, \
PACKAGE_BUGREPORT ); \
@ -96,7 +96,7 @@ extern wchar_t *program_name;
fwprintf( stderr, L"fish: Out of memory on line %d of file %s, shutting down fish\n", __LINE__, __FILE__ ); \
exit(1); \
} \
/**
Shorthand for wgettext call
*/

10
parser.c
View File

@ -1321,10 +1321,10 @@ int parser_is_help( wchar_t *s, int min_match )
\param tok the tokenizer to read options from
\param args the argument list to insert options into
*/
static void parse_job_main_loop( process_t *p,
job_t *j,
tokenizer *tok,
array_list_t *args )
static void parse_job_argument_list( process_t *p,
job_t *j,
tokenizer *tok,
array_list_t *args )
{
int is_finished=0;
@ -2193,7 +2193,7 @@ static int parse_job( process_t *p,
}
else
{
parse_job_main_loop( p, j, tok, args );
parse_job_argument_list( p, j, tok, args );
}
}