--- libeio/eio.c	2011/07/18 01:27:03	1.93
+++ libeio/eio.c	2011/07/19 05:20:36	1.96
@@ -73,6 +73,10 @@
 # define ELOOP EDOM
 #endif
 
+#if !defined(ENOTSOCK) && defined(WSAENOTSOCK)
+# define ENOTSOCK WSAENOTSOCK
+#endif
+
 static void eio_destroy (eio_req *req);
 
 #ifndef EIO_FINISH
@@ -105,7 +109,7 @@
 
   #ifdef EIO_STRUCT_STATI64
     #define stat(path,buf)       _stati64 (path,buf)
-    #define fstat(fd,buf)        _fstati64 (path,buf)
+    #define fstat(fd,buf)        _fstati64 (fd,buf)
   #endif
   #define lstat(path,buf)      stat (path,buf)
   #define fsync(fd)            (FlushFileBuffers ((HANDLE)EIO_FD_TO_WIN32_HANDLE (fd)) ? 0 : EIO_ERRNO (EBADF, -1))
@@ -162,7 +166,6 @@
   #include <sys/select.h>
   #include <sys/statvfs.h>
   #include <unistd.h>
-  #include <utime.h>
   #include <signal.h>
   #include <dirent.h>
 
@@ -196,6 +199,10 @@
 
 #endif
 
+#if HAVE_UTIMES
+# include <utime.h>
+#endif
+
 #if HAVE_SENDFILE
 # if __linux
 #  include <sys/sendfile.h>
@@ -235,13 +242,13 @@
 #define EIO_BUFSIZE 65536
 
 #define dBUF	 				\
-  char *eio_buf;				\
-  ETP_WORKER_LOCK (self);			\
-  self->dbuf = eio_buf = malloc (EIO_BUFSIZE);	\
-  ETP_WORKER_UNLOCK (self);			\
+  char *eio_buf = malloc (EIO_BUFSIZE);		\
   errno = ENOMEM;				\
   if (!eio_buf)					\
-    return -1;
+    return -1
+
+#define FUBd					\
+  free (eio_buf)
 
 #define EIO_TICKS ((1000000 + 1023) >> 10)
 
@@ -257,16 +264,6 @@
 static void eio_execute (struct etp_worker *self, eio_req *req);
 #define ETP_EXECUTE(wrk,req) eio_execute (wrk,req)
 
-#define ETP_WORKER_CLEAR(req)	\
-  if (wrk->dbuf)		\
-    {				\
-      free (wrk->dbuf);		\
-      wrk->dbuf = 0;		\
-    }
-
-#define ETP_WORKER_COMMON \
-  void *dbuf;
-
 /*****************************************************************************/
 
 #define ETP_NUM_PRI (ETP_PRI_MAX - ETP_PRI_MIN + 1)
@@ -317,7 +314,9 @@
   /* locked by reslock, reqlock or wrklock */
   ETP_REQ *req; /* currently processed request */
 
+#ifdef ETP_WORKER_COMMON
   ETP_WORKER_COMMON
+#endif
 } etp_worker;
 
 static etp_worker wrk_first; /* NOT etp */
@@ -330,7 +329,6 @@
 static void ecb_cold
 etp_worker_clear (etp_worker *wrk)
 {
-  ETP_WORKER_CLEAR (wrk);
 }
 
 static void ecb_cold
@@ -999,6 +997,8 @@
       todo   -= len;
     }
 
+  FUBd;
+
   errno = 0;
   return count;
 }
@@ -1007,7 +1007,7 @@
 
 /* sendfile always needs emulation */
 static eio_ssize_t
-eio__sendfile (int ofd, int ifd, off_t offset, size_t count, etp_worker *self)
+eio__sendfile (int ofd, int ifd, off_t offset, size_t count)
 {
   eio_ssize_t written = 0;
   eio_ssize_t res;
@@ -1153,6 +1153,8 @@
           res    += cnt;
           count  -= cnt;
         }
+
+      FUBd;
     }
 
   return res;
@@ -2027,7 +2029,7 @@
                                       : write     (req->int1, req->ptr2, req->size); break;
 
       case EIO_READAHEAD: req->result = readahead     (req->int1, req->offs, req->size); break;
-      case EIO_SENDFILE:  req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break;
+      case EIO_SENDFILE:  req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
 
       case EIO_STAT:      ALLOC (sizeof (EIO_STRUCT_STAT));
                           req->result = stat      (req->ptr1, (EIO_STRUCT_STAT *)req->ptr2); break;
@@ -2427,16 +2429,6 @@
 eio_ssize_t
 eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
 {
-  etp_worker wrk;
-  eio_ssize_t ret;
-
-  wrk.dbuf = 0;
-
-  ret = eio__sendfile (ofd, ifd, offset, count, &wrk);
-
-  if (wrk.dbuf)
-    free (wrk.dbuf);
-
-  return ret;
+  return eio__sendfile (ofd, ifd, offset, count);
 }