From 1e45cc2fb3618cdfcb0b790d563201c6ecb16334 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 23 May 2002 09:07:12 +0000
Subject: * assuan-util.c (assuan_set_io_func): New. * assuan-buffer.c (writen,
 readline): Use the new functions instead of pth. * assuan-socket-server.c
 (accept_connection): Don't use the pth_accept - using the assuan included
 accept code would be a bad idea within Pth so we don't need a replacement
 function.

---
 src/assuan-buffer.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/assuan-buffer.c')

diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c
index 29f9479..da6b201 100644
--- a/src/assuan-buffer.c
+++ b/src/assuan-buffer.c
@@ -25,9 +25,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
-#ifdef USE_GNU_PTH
-# include <pth.h>
-#endif
 #include "assuan-defs.h"
 
 #ifdef HAVE_JNLIB_LOGGING
@@ -51,11 +48,9 @@ writen ( int fd, const char *buffer, size_t length )
 {
   while (length)
     {
-#ifdef USE_GNU_PTH
-      int nwritten = pth_write (fd, buffer, length);
-#else
-      int nwritten = write (fd, buffer, length);
-#endif
+      int nwritten = _assuan_write_wrapper?
+        _assuan_write_wrapper (fd, buffer, length):
+        write (fd, buffer, length);
       
       if (nwritten < 0)
         {
@@ -80,11 +75,10 @@ readline (int fd, char *buf, size_t buflen, int *r_nread, int *eof)
   *r_nread = 0;
   while (nleft > 0)
     {
-#ifdef USE_GNU_PTH
-      int n = pth_read (fd, buf, nleft);
-#else
-      int n = read (fd, buf, nleft);
-#endif
+      int n = _assuan_read_wrapper?
+        _assuan_read_wrapper (fd, buf, nleft):
+        read (fd, buf, nleft);
+
       if (n < 0)
         {
           if (errno == EINTR)
-- 
cgit v1.2.3