2009-10-20 Marcus Brinkmann <[email protected]>

	* configure.ac: Replace internal libassuan by external libassuan.
	* m4/libassuan.m4: New file.
	* Makefile.am (assuan): Remove variable.
	(SUBDIRS): Remove ${assuan}.
	* assuan/: Removed.

src/
2009-10-20  Marcus Brinkmann  <[email protected]>

	* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
	(gpgsm_components): Move engine-assuan.c to ...
	(assuan_components): ... this new variable.
	(main_sources): Add this new variable.
	(AM_CPPFLAGS): Remove $(assuan_cppflags).
	(AM_CFLAGS): Add @LIBASSUAN_CFLAGS@.
	(libgpgme_la_DEPENDENCIES, libgpgme_pth_la_DEPENDENCIES)
	(libgpgme_glib_la_DEPENDENCIES, libgpgme_qt_la_DEPENDENCIES)
	(libgpgme_pthread_la_DEPENDENCIES): Remove $(assuan_libobjs).
	(libgpgme_la_LIBADD, libgpgme_pth_la_LIBADD)
	(libgpgme_glib_la_LIBADD, libgpgme_qt_la_LIBADD))
	(libgpgme_pthread_la_LIBADD): Replace $(assuan_libobjs) by
	@LIBASSUAN_LIBS@.
	* priv-io.h [!HAVE_W32_SYSTEM]: Declare _gpgme_io_recvmsg,
	_gpgme_io_sendmsg, _gpgme_io_waitpid.
	* engine-backend.h: Define with [ENABLE_ASSUAN] instead
	of [ENABLE_GPGSM].
	* posix-io.c (_gpgme_io_waitpid): Make non-static.
	* util.h (ENABLE_ASSUAN): Declar _gpgme_assuan_system_hooks,
	_gpgme_assuan_malloc_hooks, _gpgme_assuan_log_cb.
	* engine-gpgsm.c: Don't map assuan error codes.  Use
	assuan_release instead of assuan_disconnect.
	(map_assuan_error): Remove function.
	(gpgsm_new): Use new assuan context interface.
	* engine-assuan.c: Use assuan_release instead of
	assuan_disconnect.
	(llass_new): Use new assuan context interface.

1 files changed, 0 insertions, 245 deletions

diff --git a/assuan/assuan-io.c b/assuan/assuan-io.c
deleted file mode 100644
index 8d4cbb8e..00000000
--- a/assuan/assuan-io.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* assuan-io.c - Wraps the read and write functions.
- * Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
- *
- * This file is part of Assuan.
- *
- * Assuan is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * Assuan 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#include <unistd.h>
-#include <errno.h>
-#ifdef HAVE_W32_SYSTEM
-# include <windows.h>
-#else
-# include <sys/wait.h>
-#endif
-
-#include "assuan-defs.h"
-
-
-#ifndef HAVE_W32_SYSTEM
-pid_t 
-_assuan_waitpid (pid_t pid, int *status, int options)
-{
-  return waitpid (pid, status, options);
-}
-#endif
-
-
-static ssize_t
-do_io_read (assuan_fd_t fd, void *buffer, size_t size)
-{
-#if defined(HAVE_W32_SYSTEM) && !defined(_ASSUAN_IN_GPGME_BUILD_ASSUAN)
-  /* Due to the peculiarities of the W32 API we can't use read for a
-     network socket and thus we try to use recv first and fallback to
-     read if recv detects that it is not a network socket.  */
-  int n;
-
-  n = recv (HANDLE2SOCKET(fd), buffer, size, 0);
-  if (n == -1)
-    {
-      switch (WSAGetLastError ())
-        {
-        case WSAENOTSOCK:
-          {
-            DWORD nread = 0;
-            
-            n = ReadFile (fd, buffer, size, &nread, NULL);
-            if (!n)
-              {
-                switch (GetLastError())
-                  {
-                  case ERROR_BROKEN_PIPE: errno = EPIPE; break;
-                  default: errno = EIO; 
-                  }
-                n = -1;
-              }
-            else
-              n = (int)nread;
-          }
-          break;
-          
-        case WSAEWOULDBLOCK: errno = EAGAIN; break;
-        case ERROR_BROKEN_PIPE: errno = EPIPE; break;
-        default: errno = EIO; break;
-        }
-    }
-  return n;
-#else /*!HAVE_W32_SYSTEM*/
-  return read (fd, buffer, size);
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-ssize_t
-_assuan_io_read (assuan_fd_t fd, void *buffer, size_t size)
-{
-  ssize_t retval;
-  
-  if (_assuan_io_hooks.read_hook
-      && _assuan_io_hooks.read_hook (NULL, fd, buffer, size, &retval) == 1)
-    return retval;
-
-  return do_io_read (fd, buffer, size);
-}
-
-ssize_t
-_assuan_simple_read (assuan_context_t ctx, void *buffer, size_t size)
-{
-  ssize_t retval;
-  
-  if (_assuan_io_hooks.read_hook
-      && _assuan_io_hooks.read_hook (ctx, ctx->inbound.fd, 
-                                     buffer, size, &retval) == 1)
-    return retval;
-
-  return do_io_read (ctx->inbound.fd, buffer, size);
-}
-
-
-
-static ssize_t
-do_io_write (assuan_fd_t fd, const void *buffer, size_t size)
-{
-#if defined(HAVE_W32_SYSTEM) && !defined(_ASSUAN_IN_GPGME_BUILD_ASSUAN)
-  /* Due to the peculiarities of the W32 API we can't use write for a
-     network socket and thus we try to use send first and fallback to
-     write if send detects that it is not a network socket.  */
-  int n;
-
-  n = send (HANDLE2SOCKET(fd), buffer, size, 0);
-  if (n == -1 && WSAGetLastError () == WSAENOTSOCK)
-    {
-      DWORD nwrite;
-
-      n = WriteFile (fd, buffer, size, &nwrite, NULL);
-      if (!n)
-        {
-          switch (GetLastError ())
-            {
-            case ERROR_BROKEN_PIPE: 
-            case ERROR_NO_DATA: errno = EPIPE; break;
-            default:            errno = EIO;   break;
-            }
-          n = -1;
-        }
-      else
-        n = (int)nwrite;
-    }
-  return n;
-#else /*!HAVE_W32_SYSTEM*/
-  return write (fd, buffer, size);
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-ssize_t
-_assuan_io_write (assuan_fd_t fd, const void *buffer, size_t size)
-{
-  ssize_t retval;
-  
-  if (_assuan_io_hooks.write_hook
-      && _assuan_io_hooks.write_hook (NULL, fd, buffer, size, &retval) == 1)
-    return retval;
-  return do_io_write (fd, buffer, size);
-}
-
-ssize_t
-_assuan_simple_write (assuan_context_t ctx, const void *buffer, size_t size)
-{
-  ssize_t retval;
-  
-  if (_assuan_io_hooks.write_hook
-      && _assuan_io_hooks.write_hook (ctx, ctx->outbound.fd, 
-                                      buffer, size, &retval) == 1)
-    return retval;
-
-  return do_io_write (ctx->outbound.fd, buffer, size);
-}
-
-
-#ifdef HAVE_W32_SYSTEM
-int
-_assuan_simple_sendmsg (assuan_context_t ctx, void *msg)
-#else
-ssize_t
-_assuan_simple_sendmsg (assuan_context_t ctx, struct msghdr *msg)
-#endif
-{
-#ifdef HAVE_W32_SYSTEM
-  return _assuan_error (ASSUAN_Not_Implemented);
-#else
-  int ret;
-  while ( (ret = sendmsg (ctx->outbound.fd, msg, 0)) == -1 && errno == EINTR)
-    ;
-  return ret;
-#endif
-}
-
-
-#ifdef HAVE_W32_SYSTEM
-int
-_assuan_simple_recvmsg (assuan_context_t ctx, void *msg)
-#else
-ssize_t
-_assuan_simple_recvmsg (assuan_context_t ctx, struct msghdr *msg)
-#endif
-{
-#ifdef HAVE_W32_SYSTEM
-  return _assuan_error (ASSUAN_Not_Implemented);
-#else
-  int ret;
-  while ( (ret = recvmsg (ctx->inbound.fd, msg, 0)) == -1 && errno == EINTR)
-    ;
-  return ret;
-#endif
-}
-
-
-void
-_assuan_usleep (unsigned int usec)
-{
-  if (usec)
-    {
-#ifdef HAVE_NANOSLEEP
-      struct timespec req;
-      struct timespec rem;
-      
-      req.tv_sec = 0;
-      req.tv_nsec = usec * 1000;
-      
-      while (nanosleep (&req, &rem) < 0 && errno == EINTR)
-        req = rem;
-
-#elif defined(HAVE_W32_SYSTEM)
-      Sleep (usec / 1000);
-#else
-      struct timeval tv;
-
-      tv.tv_sec  = usec / 1000000;
-      tv.tv_usec = usec % 1000000;
-      select (0, NULL, NULL, NULL, &tv);
-#endif
-    }
-}
-