2009-11-25 Marcus Brinkmann <marcus@g10code.de>

	* gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen
	on fds.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1117bc4c757675b534b585210a7c9ca6959ee8f4..48566fadb2cc7f810b3bdcb3e7f61e614821a4db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen
+       on fds.
+
 2009-11-13    <wk@g10code.com>
 
        * sign.c (_gpgme_sign_status_handler): Handle SIG_CREATED_SEEN.

diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index ccb2ae48f6a7dfeef5df5dec110380f4aa6ce624..4ed16cc2b46eb7b602286b4ccfd66e9e3ed48d78 100644 (file)
--- a/src/gpgme-tool.c
+++ b/src/gpgme-tool.c
@@ -2060,7 +2060,7 @@ void
 gpgme_server (gpgme_tool_t gt)
 {
   gpg_error_t err;
-  int filedes[2];
+  assuan_fd_t filedes[2];
   struct server server;
   static const char hello[] = ("GPGME-Tool " VERSION " ready");
 
@@ -2079,8 +2079,8 @@ gpgme_server (gpgme_tool_t gt)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FIELDES in this case. */
-  filedes[0] = 0;
-  filedes[1] = 1;
+  filedes[0] = assuan_fdopen (0);
+  filedes[1] = assuan_fdopen (1);
   err = assuan_new (&server.assuan_ctx);
   if (err)
     log_error (1, err, "can't create assuan context");