Merge from branch 2-1

[netatalk.git] / libatalk / dsi / dsi_read.c

diff --git a/libatalk/dsi/dsi_read.c b/libatalk/dsi/dsi_read.c
index 0f33c174b9f7dacd10cc9b90a00c4ed8ef89d414..fc86c0a1339944d011cecc7c10b8fbbbcc88ea44 100644 (file)
--- a/libatalk/dsi/dsi_read.c
+++ b/libatalk/dsi/dsi_read.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_read.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: dsi_read.c,v 1.7 2009-10-25 06:13:11 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -17,6 +17,9 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
 
 #include <atalk/dsi.h>
 
@@ -32,16 +35,14 @@
 ssize_t dsi_readinit(DSI *dsi, void *buf, const size_t buflen,
                    const size_t size, const int err)
 {
-  const struct itimerval none = {{0, 0}, {0, 0}};
 
-  dsi->noreply = 1; /* we will handle our own replies */
+  dsi->flags |= DSI_NOREPLY; /* we will handle our own replies */
   dsi->header.dsi_flags = DSIFL_REPLY;
   /*dsi->header.dsi_command = DSIFUNC_CMD;*/
   dsi->header.dsi_len = htonl(size);
   dsi->header.dsi_code = htonl(err);
 
-  sigprocmask(SIG_BLOCK, &dsi->sigblockset, NULL);
-  setitimer(ITIMER_REAL, &none, &dsi->savetimer);
+  dsi->in_write++;
   if (dsi_stream_send(dsi, buf, buflen)) {
     dsi->datasize = size - buflen;
     return min(dsi->datasize, buflen);
@@ -52,14 +53,15 @@ ssize_t dsi_readinit(DSI *dsi, void *buf, const size_t buflen,
 
 void dsi_readdone(DSI *dsi)
 {
-  setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
-  sigprocmask(SIG_UNBLOCK, &dsi->sigblockset, NULL);
+  dsi->in_write--;
 }
 
 /* send off the data */
 ssize_t dsi_read(DSI *dsi, void *buf, const size_t buflen)
 {
-  size_t len = dsi_stream_write(dsi, buf, buflen);
+  size_t len;
+  
+  len  = dsi_stream_write(dsi, buf, buflen, 0);
 
   if (len == buflen) {
     dsi->datasize -= len;