mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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().
This commit is contained in:
parent
581f5ddb17
commit
878cf20766
18 changed files with 102 additions and 66 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue