diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/signal.c | 22 |
2 files changed, 21 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 05423c26e..97c8b515a 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 13 10:51:29 CEST 1999 Werner Koch <[email protected]> + + + * signal.c (got_fatal_signal): Print message using write(2) and + only for development versions. + + Mon Sep 6 19:59:08 CEST 1999 Werner Koch <[email protected]> * tdbio.c (tdbio_set_dbname): Use mkdir macro diff --git a/g10/signal.c b/g10/signal.c index 728f4054f..6ed23e5a0 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -1,5 +1,5 @@ /* signal.c - signal handling - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -39,28 +39,34 @@ static volatile int caught_fatal_sig = 0; static volatile int caught_sigusr1 = 0; static const char * -signal_name( int signum ) +get_signal_name( int signum ) { #if defined(SYS_SIGLIST_DECLARED) && defined(NSIG) return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?"; #else - static char buf[20]; - sprintf(buf, "signal %d", signum ); - return buf; + return "some signal"; #endif } + static RETSIGTYPE got_fatal_signal( int sig ) { + const char *s; + if( caught_fatal_sig ) raise( sig ); caught_fatal_sig = 1; - fprintf( stderr, "\n%s: %s caught ... exiting\n", - log_get_name(), signal_name(sig) ); secmem_term(); - exit( 8 ); + #ifdef IS_DEVELOPMENT_VERSION + write(2, "\n", 1 ); + s = log_get_name(); if( s ) write(2, s, strlen(s) ); + write(2, ": ", 2 ); + s = get_signal_name(sig); write(2, s, strlen(s) ); + write(2, " caught ... exiting\n", 21 ); + #endif + exit(8); /* Hmmm, for some reasons rais2e does not work */ } |