mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-04 10:38:13 +00:00
Code Issues Releases Wiki Activity

(gtk) use signal, instead of sigaction, for portability

Browse source
This commit is contained in:
Charles Kerr 2008-02-28 17:51:54 +00:00
parent 12994b62b6
commit 288547ffb8
1 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
gtk/main.c
View file

@ -67,9 +67,6 @@
/* interval in milliseconds to check for stopped torrents and update display */ /* interval in milliseconds to check for stopped torrents and update display */
#define EXIT_CHECK_INTERVAL 500 #define EXIT_CHECK_INTERVAL 500
/* number of fatal signals required to cause an immediate exit */
#define SIGCOUNT_MAX 3
#if GTK_CHECK_VERSION(2,8,0) #if GTK_CHECK_VERSION(2,8,0)
#define SHOW_LICENSE #define SHOW_LICENSE
static const char * LICENSE = static const char * LICENSE =
@ -123,8 +120,6 @@ struct cbdata
static GtkUIManager * myUIManager = NULL; static GtkUIManager * myUIManager = NULL;
static sig_atomic_t global_sigcount = 0;
static gboolean static gboolean
sendremote( GList * files, gboolean sendquit ); sendremote( GList * files, gboolean sendquit );
static void static void
@ -155,11 +150,6 @@ prefschanged( TrCore * core, const char * key, gpointer data );
static gboolean static gboolean
updatemodel(gpointer gdata); updatemodel(gpointer gdata);
static void
setupsighandlers(void);
static void
fatalsig(int sig);
struct counts_data struct counts_data
{ {
int totalCount; int totalCount;
@ -234,6 +224,35 @@ windowStateChanged( GtkWidget * widget UNUSED, GdkEventWindowState * event, gpoi
} }
} }
static sig_atomic_t global_sigcount = 0;
static void
fatalsig( int sig )
{
static const int SIGCOUNT_MAX = 3; /* revert to default handler after this many */
if( ++global_sigcount >= SIGCOUNT_MAX )
{
signal( sig, SIG_DFL );
raise( sig );
}
}
static void
setupsighandlers( void )
{
#ifdef G_OS_WIN32
const int sigs[] = { SIGINT, SIGTERM };
#else
const int sigs[] = { SIGHUP, SIGINT, SIGQUIT, SIGTERM };
#endif
guint i;
for( i=0; i<G_N_ELEMENTS(sigs); ++i )
signal( sigs[i], fatalsig );
}
int int
main( int argc, char ** argv ) main( int argc, char ** argv )
{ {
@ -1133,28 +1152,3 @@ doAction ( const char * action_name, gpointer user_data )
if( changed ) if( changed )
updatemodel( data ); updatemodel( data );
} }
static void
setupsighandlers(void) {
int sigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM};
struct sigaction sa;
int ii;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = fatalsig;
for(ii = 0; ii < ALEN(sigs); ii++)
sigaction(sigs[ii], &sa, NULL);
}
static void
fatalsig(int sig) {
struct sigaction sa;
if(SIGCOUNT_MAX <= ++global_sigcount) {
memset(&sa, 0, sizeof(sa));
sa.sa_handler = SIG_DFL;
sigaction(sig, &sa, NULL);
raise(sig);
}
}