From: Marcus Brinkmann <mb@g10code.com>
Date: Wed, 25 Nov 2009 17:57:05 +0000 (+0000)
Subject: 2009-11-25  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.3.0~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef640ca8efea293aa725f92fcc33a7b151b2627e;p=gpgme.git

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 1117bc4..48566fa 100644
--- 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 ccb2ae4..4ed16cc 100644
--- 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");