diff lib/sshv2.c @ 243:b42e7233533a

2003-7-31 Brian Masney <masneyb@gftp.org> * lib/sshv2.c - fix blocking problem reading the error message from the remote server when there was an error establishing a connection * lib/misc.c (copy_fdata) - copy utf8_file variable in gftp_file structure. (fix double free that was only in development version) * lib/misc.c - added --info argument to the command line. This will call gftp_info(), which will print out some information about how gftp was compiled. * lib/protocols.c lib/bookmarks.c lib/gftp.h src/gtk/bookmarks.c - added local_request parameter to gftp_parse_bookmark(). If this is not NULL, and this bookmark specifies a local directory, it will change to it. * configure.in - increment version to 2.0.15rc2
author masneyb
date Fri, 01 Aug 2003 01:47:54 +0000
parents b8d14c2c3097
children 41af60bc1f88
line wrap: on
line diff
--- a/lib/sshv2.c	Wed Jul 30 04:28:12 2003 +0000
+++ b/lib/sshv2.c	Fri Aug 01 01:47:54 2003 +0000
@@ -639,7 +639,10 @@
 
           request->logging_function (gftp_logging_error, request, "%s", buf);
 
-          while ((numread = gftp_fd_read (NULL, error_buffer, 
+          if (gftp_fd_set_sockblocking (request, fd, 0) == -1)
+            return (GFTP_EFATAL);
+
+          if ((numread = gftp_fd_read (NULL, error_buffer, 
                                           sizeof (error_buffer) - 1, 
                                           fd)) > 0)
             {