diff options
| author | Marcus Brinkmann <[email protected]> | 2003-08-18 19:17:08 +0000 | 
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-08-18 19:17:08 +0000 | 
| commit | c93237c3a4cb4ecc579033c31a56cf447c277be3 (patch) | |
| tree | 0dc8fcc413d8ffe64ed9f5ef44e825063b0878cd /assuan/assuan-pipe-server.c | |
| parent | 2003-08-15 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-c93237c3a4cb4ecc579033c31a56cf447c277be3.tar.gz gpgme-c93237c3a4cb4ecc579033c31a56cf447c277be3.zip | |
2003-08-18  Marcus Brinkmann  <[email protected]>
	* configure.ac: If building Assuan, check for funopen and
	fopencookie, and make isascii, putc_unlocked and memrchr
	replacement functions.
assuan/
Update to the latest assuan version.
gpgme/
2003-08-18  Marcus Brinkmann  <[email protected]>
	* funopen.c, putc_unlocked.c, isascii.c, memrchr.c: New files.
	* fopencookie.c: File removed.
Diffstat (limited to 'assuan/assuan-pipe-server.c')
| -rw-r--r-- | assuan/assuan-pipe-server.c | 11 | 
1 files changed, 8 insertions, 3 deletions
| diff --git a/assuan/assuan-pipe-server.c b/assuan/assuan-pipe-server.c index 82bb3228..ba269b04 100644 --- a/assuan/assuan-pipe-server.c +++ b/assuan/assuan-pipe-server.c @@ -21,6 +21,7 @@  #include <config.h>  #include <stdlib.h>  #include <stdio.h> +#include <unistd.h>  #include "assuan-defs.h" @@ -44,12 +45,15 @@ finish_connection (ASSUAN_CONTEXT ctx)    return 0;  } -  /* Create a new context.  Note that the handlers are set up for a pipe     server/client - this way we don't need extra dummy functions */  int  _assuan_new_context (ASSUAN_CONTEXT *r_ctx)  { +  static struct assuan_io io = { _assuan_simple_read, +				 _assuan_simple_write, +				 0, 0 }; +    ASSUAN_CONTEXT ctx;    int rc; @@ -62,10 +66,11 @@ _assuan_new_context (ASSUAN_CONTEXT *r_ctx)    ctx->inbound.fd = -1;    ctx->outbound.fd = -1; +  ctx->io = &io;    ctx->listen_fd = -1;    ctx->client_pid = (pid_t)-1; -  /* use the pipe server handler as a default */ +  /* Use the pipe server handler as a default.  */    ctx->deinit_handler = deinit_pipe_server;    ctx->accept_handler = accept_connection;    ctx->finish_handler = finish_connection; @@ -116,7 +121,7 @@ assuan_deinit_server (ASSUAN_CONTEXT ctx)    if (ctx)      {        /* We use this function pointer to avoid linking other server -         when not needed but still allow for a generic deinit function */ +         when not needed but still allow for a generic deinit function.  */        ctx->deinit_handler (ctx);        ctx->deinit_handler = NULL;        _assuan_release_context (ctx); | 
