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.

1 files changed, 7 insertions, 2 deletions

diff --git a/assuan/assuan-socket-server.c b/assuan/assuan-socket-server.c
index bfa9cfa7..8d23a6bd 100644
--- a/assuan/assuan-socket-server.c
+++ b/assuan/assuan-socket-server.c
@@ -98,7 +98,8 @@ deinit_socket_server (ASSUAN_CONTEXT ctx)
   finish_connection (ctx);
 }
 
-
+static struct assuan_io io = { _assuan_simple_read,
+			       _assuan_simple_write };
 
 /* Initialize a server for the socket LISTEN_FD which has already be
    put into listen mode */
@@ -125,6 +126,8 @@ assuan_init_socket_server (ASSUAN_CONTEXT *r_ctx, int listen_fd)
   ctx->accept_handler = accept_connection;
   ctx->finish_handler = finish_connection;
 
+  ctx->io = &io;
+
   rc = _assuan_register_std_commands (ctx);
   if (rc)
     xfree (ctx);
@@ -145,13 +148,15 @@ assuan_init_connected_socket_server (ASSUAN_CONTEXT *r_ctx, int fd)
   if (!ctx)
     return ASSUAN_Out_Of_Core;
   ctx->is_server = 1;
-  ctx->pipe_mode = 1; /* we wan't a second accept to indicate EOF */
+  ctx->pipe_mode = 1; /* we want a second accept to indicate EOF */
   ctx->input_fd = -1;
   ctx->output_fd = -1;
 
   ctx->inbound.fd = -1;
   ctx->outbound.fd = -1;
 
+  ctx->io = &io;
+
   ctx->listen_fd = -1;
   ctx->connected_fd = fd;
   ctx->deinit_handler = deinit_socket_server;