aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/main.h1
-rw-r--r--g10/signal.c26
3 files changed, 5 insertions, 27 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 87b62a04a..6def55468 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-26 Werner Koch <[email protected]>
+
+ * signal.c (pause_on_sigusr): Remove. It was used in ancient gpg
+ version with shared memory IPC. Last caller removed on 2006-04-18.
+
2010-03-24 Werner Koch <[email protected]>
* openfile.c (CMP_FILENAME): Depend on HAVE_DOSISH_SYSTEM instead
diff --git a/g10/main.h b/g10/main.h
index 8ce422f2c..781a49f38 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -331,7 +331,6 @@ PKT_plaintext *setup_plaintext_name(const char *filename,IOBUF iobuf);
/*-- signal.c --*/
void init_signals(void);
-void pause_on_sigusr( int which );
void block_all_signals(void);
void unblock_all_signals(void);
diff --git a/g10/signal.c b/g10/signal.c
index c9e683f72..11ebc5208 100644
--- a/g10/signal.c
+++ b/g10/signal.c
@@ -36,7 +36,6 @@
#ifdef HAVE_DOSISH_SYSTEM
void init_signals(void) {}
-void pause_on_sigusr(int which) {}
#else
static volatile int caught_fatal_sig = 0;
static volatile int caught_sigusr1 = 0;
@@ -133,31 +132,6 @@ init_signals()
}
-void
-pause_on_sigusr( int which )
-{
-#if defined(HAVE_SIGPROCMASK) && defined(HAVE_SIGSET_T)
- sigset_t mask, oldmask;
-
- assert( which == 1 );
- sigemptyset( &mask );
- sigaddset( &mask, SIGUSR1 );
-
- sigprocmask( SIG_BLOCK, &mask, &oldmask );
- while( !caught_sigusr1 )
- sigsuspend( &oldmask );
- caught_sigusr1 = 0;
- sigprocmask( SIG_UNBLOCK, &mask, NULL );
-#else
- assert (which == 1);
- sighold (SIGUSR1);
- while (!caught_sigusr1)
- sigpause(SIGUSR1);
- caught_sigusr1 = 0;
- sigrelse(SIGUSR1);
-#endif /*! HAVE_SIGPROCMASK && HAVE_SIGSET_T */
-}
-
/* Disabled - see comment in tdbio.c:tdbio_begin_transaction() */
#if 0
static void