diff options
| author | Marcus Brinkmann <[email protected]> | 2007-07-16 17:26:09 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-07-16 17:26:09 +0000 |
| commit | b3434696b380921d5d0be8ffdf1e19ca938fe572 (patch) | |
| tree | 7d071e655ac7a168a55729da7fd7b5cc93c10672 /assuan | |
| parent | 2007-07-13 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-b3434696b380921d5d0be8ffdf1e19ca938fe572.tar.gz gpgme-b3434696b380921d5d0be8ffdf1e19ca938fe572.zip | |
2007-07-16 Marcus Brinkmann <[email protected]>
* assuan/assuan-socket.c (_assuan_close): Always use close().
* assuan/assuan.h (_gpgme_io_close): New prototype.
(close): New macro, define as _gpgme_io_close.
gpgme/
2007-07-16 Marcus Brinkmann <[email protected]>
* w32-io.c (struct reader_context_s, struct writer_context_s): New
members REFCOUNT.
(create_reader, create_writer): Initialize C->refcount to 1.
(destroy_reader, destroy_writer): Only destroy if C->refcount
drops to 0.
(find_reader, find_writer, kill_reader, kill_writer): Beautify.
* priv-io.h (_gpgme_io_dup): New prototype.
* posix-io.c (_gpgme_io_dup): New function.
* w32-io.c (_gpgme_io_dup): Likewise.
* w32-glib-io.c (_gpgme_io_dup): Likewise.
* engine-gpgsm.c (start): Reverting to version 2007-07-10.
Diffstat (limited to 'assuan')
| -rw-r--r-- | assuan/README.1st | 3 | ||||
| -rw-r--r-- | assuan/assuan-socket.c | 6 | ||||
| -rw-r--r-- | assuan/assuan.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/assuan/README.1st b/assuan/README.1st index 8e805c39..46f1bb05 100644 --- a/assuan/README.1st +++ b/assuan/README.1st @@ -30,7 +30,8 @@ updating this directory, are: * assuan-io.c ** _assuan_simple_read() and _assuan_simple_write() must always use read()/write() (which actually translates to _gpgme_io_read() and - _gpgme_io_write()). + _gpgme_io_write()). _assuan_close must always() use close() (which + translates to _gpgme_io_close()). Copyright 2004, 2007 g10 Code GmbH diff --git a/assuan/assuan-socket.c b/assuan/assuan-socket.c index 196c4f6f..5566fdea 100644 --- a/assuan/assuan-socket.c +++ b/assuan/assuan-socket.c @@ -45,13 +45,13 @@ int _assuan_close (int fd) { -#ifndef HAVE_W32_SYSTEM - return close (fd); -#else +#if defined (HAVE_W32_SYSTEM) && !defined(_ASSUAN_IN_GPGME_BUILD_ASSUAN) int rc = closesocket (fd); if (rc && WSAGetLastError () == WSAENOTSOCK) rc = CloseHandle (fd); return rc; +#else + return close (fd); #endif } diff --git a/assuan/assuan.h b/assuan/assuan.h index 33f14cf0..fd807959 100644 --- a/assuan/assuan.h +++ b/assuan/assuan.h @@ -63,11 +63,13 @@ #ifdef _ASSUAN_IN_GPGME_BUILD_ASSUAN #include <ath.h> +int _gpgme_io_close (int fd); int _gpgme_io_read (int fd, void *buffer, size_t count); int _gpgme_io_write (int fd, const void *buffer, size_t count); int _gpgme_io_sendmsg (int sock, const struct msghdr *msg, int flags); int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags); +#define close _gpgme_io_close #define read _gpgme_io_read #define write _gpgme_io_write #define waitpid _gpgme_ath_waitpid |