X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fdsi%2Fdsi_write.c;h=fd8fe2c52da48c2c5f1a71db6cf75acc1c54237d;hp=3e96489e4fd4b8deea3fe6843c9ea6ccceeb2274;hb=42a0a094b72577aee3fee7f186da52dc83db001d;hpb=313b5f94348618d65523c1d8bde1fba9988f040a

diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c
index 3e96489e..fd8fe2c5 100644
--- a/libatalk/dsi/dsi_write.c
+++ b/libatalk/dsi/dsi_write.c
@@ -1,5 +1,4 @@
 /*
- * $Id: dsi_write.c,v 1.5 2009-10-20 04:31:41 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -21,36 +20,30 @@
 #include <string.h>
 
 #include <atalk/dsi.h>
+#include <atalk/util.h>
+#include <atalk/logger.h>
 
-#ifndef MIN
-#define MIN(a,b)     ((a) < (b) ? (a) : (b))
-#endif /* ! MIN */
-
-/* initialize relevant things for dsi_write. this returns the amount
- * of data in the data buffer. the interface has been reworked to allow
- * for arbitrary buffers. */
 size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
 {
-  size_t len, header;
+    size_t bytes = 0;
+    dsi->datasize = ntohl(dsi->header.dsi_len) - dsi->header.dsi_data.dsi_doff;
+
+    if (dsi->eof > dsi->start) {
+        /* We have data in the buffer */
+        bytes = MIN(dsi->eof - dsi->start, dsi->datasize);
+        memmove(buf, dsi->start, bytes);
+        dsi->start += bytes;
+        dsi->datasize -= bytes;
+        if (dsi->start >= dsi->eof)
+            dsi->start = dsi->eof = dsi->buffer;
+    }
 
-  /* figure out how much data we have. do a couple checks for 0 
-   * data */
-  header = ntohl(dsi->header.dsi_code);
-  dsi->datasize = header ? ntohl(dsi->header.dsi_len) - header : 0;
-  if (dsi->datasize > 0) {
-    len = MIN(sizeof(dsi->commands) - header, dsi->datasize);
-    
-    /* write last part of command buffer into buf */
-    memcpy(buf, dsi->commands + header, len);
-    
-    /* recalculate remaining data */
-    dsi->datasize -= len;
-  } else
-    len = 0;
+    LOG(log_maxdebug, logtype_dsi, "dsi_writeinit: remaining DSI datasize: %jd", (intmax_t)dsi->datasize);
 
-  return len;
+    return bytes;
 }
 
+
 /* fill up buf and then return. this should be called repeatedly
  * until all the data has been read. i block alarm processing 
  * during the transfer to avoid sending unnecessary tickles. */
@@ -58,10 +51,14 @@ size_t dsi_write(DSI *dsi, void *buf, const size_t buflen)
 {
   size_t length;
 
-  if (((length = MIN(buflen, dsi->datasize)) > 0) &&
-      ((length = dsi_stream_read(dsi, buf, length)) > 0)) {
-    dsi->datasize -= length;
-    return length;
+  LOG(log_maxdebug, logtype_dsi, "dsi_write: remaining DSI datasize: %jd", (intmax_t)dsi->datasize);
+
+  if ((length = MIN(buflen, dsi->datasize)) > 0) {
+      if ((length = dsi_stream_read(dsi, buf, length)) > 0) {
+          LOG(log_maxdebug, logtype_dsi, "dsi_write: received: %ju", (intmax_t)length);
+          dsi->datasize -= length;
+          return length;
+      }
   }
   return 0;
 }