From d46834bc3f5f0205749153a82128704091e0f9a7 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Wed, 28 Oct 1998 16:23:03 +0000 Subject: [PATCH] Fix ftp with nowell server --- vfs/ChangeLog | 3 +++ vfs/ftpfs.c | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 1030c3017..74107cd96 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,5 +1,8 @@ Wed Oct 28 17:06:57 1998 Pavel Machek + * ftpfs.c: report which directory you are listing, fix behaviour + with servers that don't like LIST //. (Nowell) + * direntry.c (vfs_s_automake): insert newly generated entry * direntry.c (vfs_s_free_entry): Debugging printf() killed. diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c index 71be03b53..891679140 100644 --- a/vfs/ftpfs.c +++ b/vfs/ftpfs.c @@ -1125,9 +1125,9 @@ retrieve_dir(struct connection *bucket, char *remote_path, int resolve_symlinks) has_symlinks = 0; if (bucket->strict_rfc959_list_cmd) - print_vfs_message("ftpfs: Reading FTP directory... (don't use UNIX ls options)"); + print_vfs_message("ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", remote_path); else - print_vfs_message("ftpfs: Reading FTP directory..."); + print_vfs_message("ftpfs: Reading FTP directory %s...", remote_path); if (has_spaces || bucket->strict_rfc959_list_cmd) if (ftpfs_chdir_internal (bucket, remote_path) != COMPLETE) { my_errno = ENOENT; @@ -1238,11 +1238,7 @@ retrieve_dir(struct connection *bucket, char *remote_path, int resolve_symlinks) } close_this_sock(fp, sock); disable_interrupt_key(); - if (get_reply (qsock (bucket), NULL, 0) != COMPLETE) { - my_errno = EIO; - goto error_3; - } - if (file_list->next == file_list) { + if ( (get_reply (qsock (bucket), NULL, 0) != COMPLETE) || (file_list->next == file_list)) { if (bucket->__inode_counter == 0 && !bucket->strict_rfc959_list_cmd) { /* It's our first attempt to get a directory listing from this server (UNIX style LIST command) */