X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fdsi%2Fdsi_write.c;h=79d03caf9491175267e75cd6be1edd55869c9064;hb=e89e8c871c41e673cbca592de9f143fb15116e14;hp=0acad6c79e7c685c3873df3e71f0f3150d07194f;hpb=31843674b7bd32eabcce3a1ad6159b4f94921f79;p=netatalk.git

diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c
index 0acad6c7..79d03caf 100644
--- a/libatalk/dsi/dsi_write.c
+++ b/libatalk/dsi/dsi_write.c
@@ -1,17 +1,27 @@
 /*
+ * $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.
  *
  * 7 Oct 1997 added checks for 0 data.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 /* this streams writes */
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
 #include <string.h>
 
 #include <atalk/dsi.h>
@@ -19,14 +29,13 @@
 
 #ifndef MIN
 #define MIN(a,b)     ((a) < (b) ? (a) : (b))
-#endif
+#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)
+size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen _U_)
 {
-  const struct itimerval none = {{0, 0}, {0, 0}};
   size_t len, header;
 
   /* figure out how much data we have. do a couple checks for 0 
@@ -44,11 +53,6 @@ size_t dsi_writeinit(DSI *dsi, void *buf, const size_t buflen)
   } else
     len = 0;
 
-  /* deal with signals. i'm doing it this way to ensure that we don't
-   * get confused if a writeflush on zero remaining data is, for some
-   * reason, needed. */
-  sigprocmask(SIG_BLOCK, &dsi->sigblockset, NULL);
-  setitimer(ITIMER_REAL, &none, &dsi->savetimer);
   return len;
 }
 
@@ -64,9 +68,6 @@ size_t dsi_write(DSI *dsi, void *buf, const size_t buflen)
     dsi->datasize -= length;
     return length;
   }
-
-  setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
-  sigprocmask(SIG_UNBLOCK, &dsi->sigblockset, NULL);
   return 0;
 }
 
@@ -83,7 +84,4 @@ void dsi_writeflush(DSI *dsi)
     else
       break;
   }
-
-  setitimer(ITIMER_REAL, &dsi->savetimer, NULL);
-  sigprocmask(SIG_UNBLOCK, &dsi->sigblockset, NULL);
 }