mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-12 21:18:53 +00:00
Tweaks to some source comments
darcs-hash:20060205131253-ac50b-c3ad91b280a73fc8ec318ca6c285de773ffecfc6.gz
This commit is contained in:
parent
58667673d9
commit
0fa3c15114
4 changed files with 15 additions and 8 deletions
3
exec.c
3
exec.c
|
@ -672,7 +672,8 @@ void exec( job_t *j )
|
||||||
signal_block();
|
signal_block();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
setup_child_process make sure signals are propelry set up
|
setup_child_process make sure signals are properly set
|
||||||
|
up. It will also call signal_unblock
|
||||||
*/
|
*/
|
||||||
if( !setup_child_process( j, 0 ) )
|
if( !setup_child_process( j, 0 ) )
|
||||||
{
|
{
|
||||||
|
|
11
reader.c
11
reader.c
|
@ -1612,6 +1612,11 @@ static void reader_interactive_init()
|
||||||
kill_init();
|
kill_init();
|
||||||
shell_pgid = getpgrp ();
|
shell_pgid = getpgrp ();
|
||||||
|
|
||||||
|
/*
|
||||||
|
This should enable job control on fish, even if our parent did
|
||||||
|
not enable it for us.
|
||||||
|
*/
|
||||||
|
|
||||||
/* Loop until we are in the foreground. */
|
/* Loop until we are in the foreground. */
|
||||||
while (tcgetpgrp( 0 ) != shell_pgid)
|
while (tcgetpgrp( 0 ) != shell_pgid)
|
||||||
{
|
{
|
||||||
|
@ -1644,7 +1649,6 @@ static void reader_interactive_init()
|
||||||
al_init( &prompt_list );
|
al_init( &prompt_list );
|
||||||
history_init();
|
history_init();
|
||||||
|
|
||||||
|
|
||||||
common_handle_winch(0);
|
common_handle_winch(0);
|
||||||
|
|
||||||
tcgetattr(0,&shell_modes); /* get the current terminal modes */
|
tcgetattr(0,&shell_modes); /* get the current terminal modes */
|
||||||
|
@ -1663,7 +1667,10 @@ static void reader_interactive_init()
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We need to know the parents pid so we'll know if we are a subshell */
|
/*
|
||||||
|
We need to know our own pid so we'll later know if we are a
|
||||||
|
fork
|
||||||
|
*/
|
||||||
original_pid = getpid();
|
original_pid = getpid();
|
||||||
|
|
||||||
if( atexit( &exit_func ) )
|
if( atexit( &exit_func ) )
|
||||||
|
|
7
signal.c
7
signal.c
|
@ -41,7 +41,6 @@ struct lookup_entry
|
||||||
Signal description
|
Signal description
|
||||||
*/
|
*/
|
||||||
const wchar_t *desc;
|
const wchar_t *desc;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -406,7 +405,7 @@ void signal_reset_handlers()
|
||||||
sigemptyset( & act.sa_mask );
|
sigemptyset( & act.sa_mask );
|
||||||
act.sa_flags=0;
|
act.sa_flags=0;
|
||||||
act.sa_handler=SIG_DFL;
|
act.sa_handler=SIG_DFL;
|
||||||
|
|
||||||
for( i=0; lookup[i].desc ; i++ )
|
for( i=0; lookup[i].desc ; i++ )
|
||||||
{
|
{
|
||||||
sigaction( lookup[i].signal, &act, 0);
|
sigaction( lookup[i].signal, &act, 0);
|
||||||
|
@ -434,7 +433,7 @@ void signal_set_handlers()
|
||||||
sigaction( SIGTTIN, &act, 0);
|
sigaction( SIGTTIN, &act, 0);
|
||||||
sigaction( SIGTTOU, &act, 0);
|
sigaction( SIGTTOU, &act, 0);
|
||||||
sigaction( SIGCHLD, &act, 0);
|
sigaction( SIGCHLD, &act, 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Ignore sigpipe, it is generated if fishd dies, but we can
|
Ignore sigpipe, it is generated if fishd dies, but we can
|
||||||
recover.
|
recover.
|
||||||
|
@ -449,7 +448,7 @@ void signal_set_handlers()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
act.sa_handler=SIG_IGN;
|
act.sa_handler=SIG_IGN;
|
||||||
|
|
||||||
sigaction( SIGINT, &act, 0);
|
sigaction( SIGINT, &act, 0);
|
||||||
sigaction( SIGQUIT, &act, 0);
|
sigaction( SIGQUIT, &act, 0);
|
||||||
sigaction( SIGTSTP, &act, 0);
|
sigaction( SIGTSTP, &act, 0);
|
||||||
|
|
2
util.h
2
util.h
|
@ -232,7 +232,7 @@ const void *hash_get_key( hash_table_t *h,
|
||||||
*/
|
*/
|
||||||
int hash_get_count( hash_table_t *h);
|
int hash_get_count( hash_table_t *h);
|
||||||
/**
|
/**
|
||||||
Remove the specified key from the hash table
|
Remove the specified key from the hash table if it exists. Do nothing if it does not exist.
|
||||||
|
|
||||||
\param h The hashtable
|
\param h The hashtable
|
||||||
\param key The key
|
\param key The key
|
||||||
|
|
Loading…
Reference in a new issue