aboutsummaryrefslogtreecommitdiffstats
path: root/common/signal.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-12-21 10:03:00 +0000
committerWerner Koch <[email protected]>2004-12-21 10:03:00 +0000
commit878cf2076633742ad5f4e4008059b0fc8d776d37 (patch)
tree07e7c9d7bab4f56a69d5496cede7ab6a3f36397a /common/signal.c
parent* configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all (diff)
downloadgnupg-878cf2076633742ad5f4e4008059b0fc8d776d37.tar.gz
gnupg-878cf2076633742ad5f4e4008059b0fc8d776d37.zip
* gpg-agent.c (main): Use default_homedir().
* protect-tool.c (main): Ditto. * signal.c (got_fatal_signal, got_usr_signal) (got_fatal_signal) [DOSISH]: Don't build. * simple-gettext.c: Include sysutils.h * homedir.c: New. * Makefile.am (libcommon_a_SOURCES): Add it. (EXTRA_DIST): Removed mkerror and mkerrtok. * gpgv.c, g10.c (main): Use default_hoemdir (). * scdaemon.c (main): Use default_homedir(). * gpgsm.c (main): Use default_homedir().
Diffstat (limited to 'common/signal.c')
-rw-r--r--common/signal.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/common/signal.c b/common/signal.c
index dc026c10f..4e773c4c0 100644
--- a/common/signal.c
+++ b/common/signal.c
@@ -30,15 +30,17 @@
#include "util.h"
+#ifndef HAVE_DOSISH_SYSTEM
static volatile int caught_fatal_sig;
static volatile int caught_sigusr1;
+#endif
static void (*cleanup_fnc)(void);
+#ifndef HAVE_DOSISH_SYSTEM
static void
init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
{
-#ifndef HAVE_DOSISH_SYSTEM
# ifdef HAVE_SIGACTION
struct sigaction oact, nact;
@@ -64,9 +66,10 @@ init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign )
signal (sig, SIG_IGN);
}
# endif
-#endif /*!HAVE_DOSISH_SYSTEM*/
}
+#endif /*!HAVE_DOSISH_SYSTEM*/
+#ifndef HAVE_DOSISH_SYSTEM
static const char *
get_signal_name( int signum )
{
@@ -76,7 +79,9 @@ get_signal_name( int signum )
return "some signal";
#endif
}
+#endif /*!HAVE_DOSISH_SYSTEM*/
+#ifndef HAVE_DOSISH_SYSTEM
static RETSIGTYPE
got_fatal_signal (int sig)
{
@@ -106,14 +111,15 @@ got_fatal_signal (int sig)
#endif /* __riscos__ */
raise( sig );
}
+#endif /*!HAVE_DOSISH_SYSTEM*/
-
+#ifndef HAVE_DOSISH_SYSTEM
static RETSIGTYPE
got_usr_signal (int sig)
{
caught_sigusr1 = 1;
}
-
+#endif /*!HAVE_DOSISH_SYSTEM*/
void
gnupg_init_signals (int mode, void (*fast_cleanup)(void))