summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Bacher <sbacher@src.gnome.org>2008-04-21 21:55:03 +0000
committerSebastien Bacher <sbacher@src.gnome.org>2008-04-21 21:55:03 +0000
commitcc094a5183272c0e9228092784fd3dbf08113d79 (patch)
treefbe94339f209ad42c1480a657c2a2b6ea28a0b31
parent4a6d4e6c7503ceb98e8f7bf4703ff2bc41281435 (diff)
downloadgvfs-cc094a5183272c0e9228092784fd3dbf08113d79.tar.gz
remove trailing '\r', that workarounds a parser issue causing some
* daemon/gvfsbackendftp.c: (do_enumerate_directory): remove trailing '\r', that workarounds a parser issue causing some filenames to not be listed (#524880) svn path=/branches/gnome-2-22/; revision=1755
-rw-r--r--ChangeLog6
-rw-r--r--daemon/gvfsbackendftp.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 09580e92..3f17c834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21 Sebastien Bacher <seb128@ubuntu.com>
+
+ * daemon/gvfsbackendftp.c: (do_enumerate_directory):
+ remove trailing '\r', that workarounds a parser issue causing
+ some filenames to not be listed (#524880)
+
2008-04-21 Matthias Clasen <mclasen@redhat.com>
* client/gdaemonvfs.c:
diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 788c8ac4..ec55c73a 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -1782,6 +1782,8 @@ do_enumerate_directory (FtpConnection *conn)
if (got_boundary)
{
name[bytes_read - 1] = 0;
+ if (bytes_read >= 2 && name[bytes_read - 2] == '\r')
+ name[bytes_read - 2] = 0;
DEBUG ("--- %s\n", name);
list = g_list_prepend (list, g_strdup (name));
bytes_read = 0;