aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2009-11-25 17:57:05 +0000
committerMarcus Brinkmann <[email protected]>2009-11-25 17:57:05 +0000
commitef640ca8efea293aa725f92fcc33a7b151b2627e (patch)
treeedee92ffaa4086835ab5d7515a6ee9353a47458e
parentFixes for the UI server engine . (diff)
downloadgpgme-ef640ca8efea293aa725f92fcc33a7b151b2627e.tar.gz
gpgme-ef640ca8efea293aa725f92fcc33a7b151b2627e.zip
2009-11-25 Marcus Brinkmann <[email protected]>
* gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen on fds.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gpgme-tool.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1117bc4c..48566fad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25 Marcus Brinkmann <[email protected]>
+
+ * gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen
+ on fds.
+
2009-11-13 <[email protected]>
* sign.c (_gpgme_sign_status_handler): Handle SIG_CREATED_SEEN.
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c
index ccb2ae48..4ed16cc2 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");