# HG changeset patch
# User masneyb
# Date 1060306692 0
# Node ID 16a967a4d003aad1dc674197e002ece250f2f8dc
# Parent  f41650dc896c8074ca1e44b5180438b2857d1c98
2003-8-7 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c (gftp_fd_write) - use a signed variable to store the
        result from write(). Write errors were not being caught properly.

diff -r f41650dc896c -r 16a967a4d003 ChangeLog
--- a/ChangeLog	Wed Aug 06 20:31:34 2003 +0000
+++ b/ChangeLog	Fri Aug 08 01:38:12 2003 +0000
@@ -1,3 +1,7 @@
+2003-8-7 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c (gftp_fd_write) - use a signed variable to store the
+	result from write(). Write errors were not being caught properly.
+
 2003-8-6 Brian Masney <masneyb@gftp.org>
 	* lib/misc.c (gftp_build_path) - fixed initial path beginning with //.
 	(expand_path) - when the path is empty at the end, set it to /. This
@@ -1438,7 +1442,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.128 2003/08/06 20:31:30 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.129 2003/08/08 01:38:11 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r f41650dc896c -r 16a967a4d003 lib/protocols.c
--- a/lib/protocols.c	Wed Aug 06 20:31:34 2003 +0000
+++ b/lib/protocols.c	Fri Aug 08 01:38:12 2003 +0000
@@ -2164,8 +2164,9 @@
 {
   long network_timeout;
   struct timeval tv;
-  size_t ret, w_ret;
+  ssize_t w_ret;
   fd_set fset;
+  size_t ret;
 
   gftp_lookup_request_option (request, "network_timeout", &network_timeout);  
 
@@ -2197,7 +2198,8 @@
           return (GFTP_ERETRYABLE);
         }
 
-      if ((w_ret = write (fd, ptr, size)) < 0)
+      w_ret = write (fd, ptr, size);
+      if (w_ret < 0)
         {
           if (errno == EINTR)
             {