@@ -1,3 +1,7 @@

+Thu Apr  1 11:37:25 BST 2004 (trog)

+-----------------------------------

+  * clamd: add writen() function for wrapping write()

+

 Wed Mar 31 22:00:05 BST 2004 (njh)

 ----------------------------------

   * clamav-milter:	Handle new location of config file parser

@@ -22,6 +26,7 @@ Tue Mar 30 23:18:49 CEST 2004 (tk)

 Tue Mar 30 08:40:10 BST 2004 (trog)

 -----------------------------------

   * clamav.conf, shared/cfgparser.c: recognise ReadTimeout option

+	remove ThreadTimeout option

 Mon Mar 29 18:11:08 CEST 2004 (tk)

 ----------------------------------

@@ -182,3 +182,30 @@ int is_fd_connected(int fd)

     return 1;

 #endif

 }

+

+/* Function: writen

+	Try hard to write the specified number of bytes

+*/

+int writen(int fd, void *buff, unsigned int count)

+{

+	int retval;

+	unsigned int todo;

+	unsigned char *current;

+ 

+    todo = count;

+    current = (unsigned char *) buff;

+ 

+    do {

+	retval = write(fd, current, todo);

+	if (retval < 0) {

+	    if (errno == EINTR) {

+		continue;

+	    }

+	    return -1;

+	}

+	todo -= retval;

+	current += retval;

+    } while (todo > 0);

+ 

+    return count;

+}

@@ -30,5 +30,6 @@

 int poll_fd(int fd, int timeout_sec);

 int is_fd_connected(int fd);

 void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt);

+int writen(int fd, void *buff, unsigned int count);

 #endif

@@ -295,7 +295,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 		return -1;

 	    }

-	    if(write(tmpd, buff, bread) < 0) {

+	    if(writen(tmpd, buff, bread) != bread) {

 		shutdown(sockfd, 2);

 		close(sockfd);

 		close(acceptd);