* no-pth.c, Makefile.am: Removed.

* call-scd.c: Seirialized all scdaeom access when using Pth.

* cache.c: Made the cache Pth-thread-safe.
(agent_unlock_cache_entry): New.
* findkey.c (unprotect): Unlock the returned cache value.
* command.c (cmd_get_passphrase): Ditto.

* gpg-agent.c (main): Register pth_read/write with Assuan.

3 files changed, 4 insertions, 55 deletions

diff --git a/common/ChangeLog b/common/ChangeLog
index 7e273d837..c9c435cff 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-23  Werner Koch  <[email protected]>
+
+	* no-pth.c, Makefile.am: Removed.
+
 2002-05-22  Werner Koch  <[email protected]>
 
 	* mkdtemp.c: Replaced byte by unsigned char because it is no longer
diff --git a/common/Makefile.am b/common/Makefile.am
index 85dcfe285..d118e047d 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -32,7 +32,6 @@ libcommon_a_SOURCES = \
 	errors.c errors.h \
 	maperror.c \
 	sysutils.c sysutils.h \
-	no-pth.c \
 	cryptmiss.c \
 	gettime.c 
 
diff --git a/common/no-pth.c b/common/no-pth.c
deleted file mode 100644
index 5eaaa3f91..000000000
--- a/common/no-pth.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* no-pth.c - stubs to avoid linking against PTH
- * Copyright (C) 2002 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <config.h>
-#ifdef USE_GNU_PTH /*we need the stubs only in this case */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pth.h>
-
-#if PTH_SYSCALL_SOFT
-# error this file cannot be used with PTH syscall divertion 
-#endif
-
-
-ssize_t  
-pth_read (int a, void *b , size_t c)
-{
-  return read (a, b, c);
-}
-
-ssize_t
-pth_write (int a, const void *b, size_t c)
-{
-  return write (a, b, c);
-}
-
-int
-pth_accept (int a, struct sockaddr *b, socklen_t *c) 
-{
-  return accept (a, b, c);
-}
-
-
-
-#endif /*USE_GNU_PTH*/