# HG changeset patch
# User masneyb
# Date 1096335590 0
# Node ID b505daaccb9244983b3382466b630de5412bff40
# Parent  502a126418cd71b4789b746c0eb91cb24d8dd3dc
2004-9-27 Brian Masney <masneyb@gftp.org>

        * lib/rfc959.c (rfc959_connect) - return GFTP_EFATAL if the initial FTP
        response is not 2xx

        * docs/gftp-faq.sgml - removed sections that have not been relevant for
        a long time. Added section about changing the encoding of filenames

diff -r 502a126418cd -r b505daaccb92 ChangeLog
--- a/ChangeLog	Mon Sep 27 00:12:11 2004 +0000
+++ b/ChangeLog	Tue Sep 28 01:39:50 2004 +0000
@@ -1,3 +1,10 @@
+2004-9-27 Brian Masney <masneyb@gftp.org>
+	* lib/rfc959.c (rfc959_connect) - return GFTP_EFATAL if the initial FTP
+	response is not 2xx
+
+	* docs/gftp-faq.sgml - removed sections that have not been relevant for
+	a long time. Added section about changing the encoding of filenames
+
 2004-9-26 Brian Masney <masneyb@gftp.org>
 	* lib/protocols.c (gftp_put_file) - use g_filename_from_utf8() to
 	change the encoding of the filename (if needed)
@@ -2856,7 +2863,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.328 2004/09/27 00:12:10 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.329 2004/09/28 01:39:50 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 502a126418cd -r b505daaccb92 docs/gftp-faq.sgml
--- a/docs/gftp-faq.sgml	Mon Sep 27 00:12:11 2004 +0000
+++ b/docs/gftp-faq.sgml	Tue Sep 28 01:39:50 2004 +0000
@@ -6,7 +6,7 @@
 <book>
 
 <bookinfo>
-  <date>$Date: 2004/09/18 00:42:01 $</date>
+  <date>$Date: 2004/09/28 01:39:50 $</date>
   <title>gFTP FAQ</title>
   <authorgroup>
     <author>
@@ -279,13 +279,26 @@
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
+<title>Filenames are being stored in UTF8 instead of the current locale.</title>
+
+<para>
+Starting with gFTP 2.0.18, you can use the GLIB environment variable
+<emphasis>G_FILENAME_ENCODING</emphasis> to specify the encoding of the files
+on your system. For more information about this environment variable, see
+<ulink url="http://developer.gnome.org/doc/API/2.0/glib/glib-running.html#G_FILENAME_ENCODING">http://developer.gnome.org/doc/API/2.0/glib/glib-running.html#G_FILENAME_ENCODING</ulink>.
+</para>
+</sect1>
+
+<!-- ----------------------------------------------------------------- -->
+
+<sect1>
 <title>When using an external editor, gFTP does not detect changes that are being made to the file.</title>
 
 <para>
 Look at the man page for the editor you are using and see if there is a
 command line argument to have the editor run in the foreground (it won't
 fork to detact from the current terminal). If you are using one of the
-graphical VIM editors, you can add the --nofork argument.
+graphical VIM editors, you can add the <emphasis>--nofork</emphasis> argument.
 </para>
 
 </sect1>
@@ -356,6 +369,8 @@
 <title>gFTP will not log into the remote SSH server when using a non-English
 locale.</title>
 
+<para>Note: This answer only applies to versions of gFTP &gt;= 2.0.18</para>
+
 <para>
 You will need to download the source code to gFTP and edit the appropriate
 po/&lt;lang&gt;.po file. You will need to make sure the following strings
@@ -381,9 +396,11 @@
 
 <sect1>
 <title>I'm having problems getting SSH2 transfers to work. I keep getting the
-error: <emphasis>Error: Message size XXXXXXXX too big from server (only relevant for versions <= 2.0.17)</emphasis>
+error: <emphasis>Error: Message size XXXXXXXX too big from server</emphasis>
 </title>
 
+<para>Note: This answer only applies to versions of gFTP &lt;= 2.0.17</para>
+
 <para>What probably is the problem, sftp-server isn't in your path on the
 remote server. When you try to connect to the remote server, you'll see the
 command gFTP is trying to run, and it'll look something like:</para>
@@ -419,7 +436,9 @@
 <!-- ----------------------------------------------------------------- -->
 
 <sect1>
-<title>What is the difference between the SSH and SSH2 protocols? (only relevant for versions <= 2.0.15)</title>
+<title>What is the difference between the SSH and SSH2 protocols?</title>
+
+<para>Note: This answer only applies to versions of gFTP &lt;= 2.0.15</para>
 
 <para>The SSH protocol uses sftp >= 0.7 from 
 <ulink url="http://www.xbill.org/sftp">http://www.xbill.org/sftp</ulink>.
@@ -480,82 +499,6 @@
 
 </sect1>
 
-<!-- ----------------------------------------------------------------- -->
-
-<sect1>
-<title>I am trying to compile your program and I get some parse errors before
-GdkDragContext. What's wrong?</title>
-
-<para>You have an older version of gtk installed on your system. If you are
-using Red Hat or Debian Linux, simply remove the gtk and glib devel
-packages. You can still leave the gtk 1.0 libraries installed.</para>
-
-</sect1>
-
-<!-- ----------------------------------------------------------------- -->
-
-</chapter>
-
-<!-- ***************************************************************** -->
-
-<chapter>
-<title>Issues for older releases</title>
-
-<sect1>
-<title>I downloaded a binary off the internet and everytime I run gFTP I get an
-error saying: <emphasis>undefined symbol :__register_frame_info</emphasis></title>
-   
-<para>ObiTuarY &lt;obituary@freshmeat.net&gt; says:</para>
-
-<para>This happens when you compile a library with egcs. The library then has 
-the __register_frame_info symbol. If you link a program to it, it will
-require this symbol. Now if you have the exact same library compiled with
-gcc 2.7.2.3 it won't have this symbol. The thing about glibc 2.1 under Red
-Hat 6 is it was compiled with egcs and glibc 2.0.x under Red Hat 5.x was
-compiled with gcc 2.7.2.3, therefore it's not an incompatibility between
-glibc 2.0.x and 2.1.x. What some people do for that is they get the .o file
-of egcs with __register_frame_info in it and link into the program so it's
-always there, that way it works with libs compiled with egcs or gcc 2.7.2.3.
-(in /usr/lib/gcc-lib/i386-*-linux/egcs-*/ )"</para>
-
-<para>Another alternative, is to recompile gFTP on your machine, or you can
-download some RPMs off my website that were compiled against Red Hat
-5.2.</para>
-
-</sect1>
-
-<!-- ----------------------------------------------------------------- -->
-
-<sect1>
-<title>I upgraded to a newer version of gFTP and now I am getting some warnings
-about some config file lines not having enough arguments, and it cannot find
-html.xpm.</title>
-
-<para>This is from upgrading from a very old version of gFTP to a newer version.
-I removed some icons from the distribution (0.20 to 0.21). Edit your
-~/.gftp/gftprc file. At the bottom of the file, there are some ext= lines.
-Some of them have html.xpm, rpm.xpm and pdf.xpm. Remove these lines and gFTP
-will startup fine. Don't worry about fixing he warnings...they will go away
-themselves whenever you change an option in gFTP.</para>
-
-</sect1>
-
-<!-- ----------------------------------------------------------------- -->
-
-<sect1>
-<title>I have a libc 5 based machine and everytime I run gFTP it instantly
-crashes.  I get an error something like:
-<emphasis>Gdk-ERROR **: an x io error occurred</emphasis></title>
-
-<para>Your X libraries are not thread safe. They must be compiled with
--D_REENTRANT. You can either recompile your X libraries, or you can download
-some from my webpage at
-<ulink url="ftp://www.gftp.org/pub/gftp/libs/XFree86-libs-3.3-2_threading.i386.tgz">ftp://www.gftp.org/pub/gftp/libs/XFree86-libs-3.3-2_threading.i386.tgz</ulink></para>
-
-</sect1>
-
-<!-- ----------------------------------------------------------------- -->
-
 </chapter>
 
 </book>
diff -r 502a126418cd -r b505daaccb92 lib/rfc959.c
--- a/lib/rfc959.c	Mon Sep 27 00:12:11 2004 +0000
+++ b/lib/rfc959.c	Tue Sep 28 01:39:50 2004 +0000
@@ -470,7 +470,10 @@
   if ((ret = rfc959_read_response (request, 1)) != '2')
     {
       gftp_disconnect (request);
-      return (ret);
+      if (ret < 0)
+        return (ret);
+      else
+        return (GFTP_ERETRYABLE);
     }
 
   if (parms->auth_tls_start != NULL)