From 0e443305d04f09a42d8ad0a9196d841bab4955a8 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 10 Nov 2009 09:04:50 +0000 Subject: 2009-11-10 Marcus Brinkmann * assuan-defs.h (struct assuan_context_s): Rename CTX->process_done to CTX->process_complete for clarity. Remove buffer variables from UDS. * assuan-pipe-connect.c (socketpair_connect): Allow FD_CHILD_LIST to be NULL. * assuan-handler.c: Rename CTX->process_done to CTX->process_complete for clarity. (process_request, process_next): Handle EOF. * assuan-uds.c (uds_reader): Remove buffering, which breaks the pending line algorithm in assuan-buffer.c. (_assuan_init_uds_io, _assuan_uds_deinit): Remove buffering. * assuan-buffer.c (_assuan_read_line): Add comment. --- src/assuan-defs.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/assuan-defs.h') diff --git a/src/assuan-defs.h b/src/assuan-defs.h index 8ce5f99..00a3652 100644 --- a/src/assuan-defs.h +++ b/src/assuan-defs.h @@ -127,7 +127,7 @@ struct assuan_context_s int is_server; /* Set if this is context belongs to a server */ int in_inquire; int in_process_next; - int process_done; + int process_complete; int in_command; /* The following members are used by assuan_inquire_ext. */ @@ -176,15 +176,8 @@ struct assuan_context_s struct sockaddr_un myaddr; struct sockaddr_un serveraddr; - /* Structure used for unix domain socket buffering. FIXME: We don't - use datagrams anymore thus we could get away with a simpler - buffering approach. */ + /* Structure used for unix domain sockets. */ struct { - void *buffer; /* Malloced buffer. */ - int bufferallocated; /* Memory allocated. */ - int bufferoffset; /* Offset of start of buffer. */ - int buffersize; /* Bytes buffered. */ - assuan_fd_t pendingfds[5]; /* Array to save received descriptors. */ int pendingfdscount; /* Number of received descriptors. */ } uds; -- cgit v1.2.1