# HG changeset patch
# User masneyb
# Date 1034043586 0
# Node ID bc9473ba9a90fd6567508b55908a4ca8b5e4c030
# Parent  9d73b3cf05a6e79a80ee1d41b26b3616951ee669
2002-10-07 Brian Masney <masneyb@gftp.org>

        * lib/local.c - fixed file uploads

        * lib/rfc959.c - fixed crash if you uploaded/downloaded a file that
        you didn't have permission to

        * src/gtk/transfer.c - display fixes for hostname

        * autogen.sh - pass -c to automake

diff -r 9d73b3cf05a6 -r bc9473ba9a90 ChangeLog
--- a/ChangeLog	Mon Oct 07 18:17:08 2002 +0000
+++ b/ChangeLog	Tue Oct 08 02:19:46 2002 +0000
@@ -1,3 +1,13 @@
+2002-10-07 Brian Masney <masneyb@gftp.org>
+	* lib/local.c - fixed file uploads
+
+	* lib/rfc959.c - fixed crash if you uploaded/downloaded a file that
+	you didn't have permission to
+
+	* src/gtk/transfer.c - display fixes for hostname
+
+	* autogen.sh - pass -c to automake
+
 2002-10-07 Brian Masney <masneyb@gftp.org>
         * docs/sample.gftp/gftp-mini-logo.xpm - added mini gFTP logo file
         from Debian. This can be used as a menu icon.
@@ -18,7 +28,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.15 2002/10/07 10:44:05 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.16 2002/10/08 02:19:45 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 9d73b3cf05a6 -r bc9473ba9a90 TODO
--- a/TODO	Mon Oct 07 18:17:08 2002 +0000
+++ b/TODO	Tue Oct 08 02:19:46 2002 +0000
@@ -2,7 +2,8 @@
 of gFTP. If there is something you feel should be included in a future
 version of gFTP, please email me about it.
 
-* Add large file support to configure.in
+* For bookmarks, be able to specify a local protocol, host, port, directory
+  to connect to
 * SSH login sequence could be improved
 * Show status information in title bar
 * -d command line, check if it's a file first, if so download. If not, grab directory
@@ -16,6 +17,7 @@
 * Add registered file extensions to options dialog
 * VMS directory listings
 * FTP: Send ABOR command when the users wants to stop the download
+* HTTP: Support CONNECT method in Squid proxy
 * FTP: Support rfc1639
 * Add support for SRP protocol (http://srp.stanford.edu/srp)
 * Add support for DAV protocol
diff -r 9d73b3cf05a6 -r bc9473ba9a90 autogen.sh
--- a/autogen.sh	Mon Oct 07 18:17:08 2002 +0000
+++ b/autogen.sh	Tue Oct 08 02:19:46 2002 +0000
@@ -78,7 +78,7 @@
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
-automake-1.4 -a $am_opt
+automake-1.4 -a -c $am_opt
 autoconf
 cd $ORIGDIR
 
diff -r 9d73b3cf05a6 -r bc9473ba9a90 lib/local.c
--- a/lib/local.c	Mon Oct 07 18:17:08 2002 +0000
+++ b/lib/local.c	Tue Oct 08 02:19:46 2002 +0000
@@ -225,7 +225,7 @@
           return (-2);
         }
 
-      if ((request->datafd = fdopen (sock, "rb+")) == NULL)
+      if ((request->datafd = fdopen (sock, "rb")) == NULL)
         {
           request->logging_function (gftp_logging_error, request->user_data,
                                      _("Cannot fdopen() socket for %s: %s\n"),
diff -r 9d73b3cf05a6 -r bc9473ba9a90 lib/rfc959.c
--- a/lib/rfc959.c	Mon Oct 07 18:17:08 2002 +0000
+++ b/lib/rfc959.c	Tue Oct 08 02:19:46 2002 +0000
@@ -337,8 +337,11 @@
 
   if (ret != '1')
     {
-      fclose (request->datafd);
-      request->datafd = NULL;
+      if (request->datafd != NULL)
+        {
+          fclose (request->datafd);
+          request->datafd = NULL;
+        }
       return (-2);
     }
 
@@ -408,8 +411,11 @@
   g_free (tempstr);
   if (ret != '1')
     {
-      fclose (request->datafd);
-      request->datafd = NULL;
+      if (request->datafd != NULL)
+        {
+          fclose (request->datafd);
+          request->datafd = NULL;
+        }
       return (-2);
     }
 
diff -r 9d73b3cf05a6 -r bc9473ba9a90 src/gtk/transfer.c
--- a/src/gtk/transfer.c	Mon Oct 07 18:17:08 2002 +0000
+++ b/src/gtk/transfer.c	Tue Oct 08 02:19:46 2002 +0000
@@ -2078,7 +2078,8 @@
           tdata->fromreq->logging_function (gftp_logging_error, 
                    tdata->fromreq->user_data,
                    _("Error: Remote site %s disconnected. Max retries reached...giving up\n"),
-                   GFTP_GET_HOSTNAME (tdata->fromreq));
+                   tdata->fromreq->hostname != NULL ? 
+                         tdata->fromreq->hostname : tdata->toreq->hostname);
           return (-1);
         }
       else
@@ -2086,7 +2087,9 @@
           tdata->fromreq->logging_function (gftp_logging_error, 
                      tdata->fromreq->user_data,
                      _("Error: Remote site %s disconnected. Will reconnect in %d seconds\n"),
-                     GFTP_GET_HOSTNAME (tdata->fromreq), tdata->fromreq->sleep_time);
+                     tdata->fromreq->hostname != NULL ? 
+                           tdata->fromreq->hostname : tdata->toreq->hostname, 
+                     tdata->fromreq->sleep_time);
         }
 
       while (tdata->fromreq->retries == 0 ||