mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fri Apr 23 21:02:32 1999 Norbert Warmuth <nwarmuth@privat.circular.de>

Browse Source 
* vfs/ftpfs.c (retrieve_dir): If we don't get any valid directory entry
(i.e. not even "." and "..") check whether the directory is empty
or not existend (instead of failing with "ftpfs: failed").
This commit is contained in:
Norbert Warmuth 1999-04-24 05:40:11 +00:00
parent 58dbdc168e
commit 52d700b4b0
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vfs/ChangeLog
View File

@ -1,3 +1,9 @@
Fri Apr 23 21:02:32 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* ftpfs.c (retrieve_dir): If we don't get any valid directory entry
(i.e. not even "." and "..") check whether the directory is empty
or not existend (instead of failing with "ftpfs: failed").
1999-04-23 Pavel Machek <pavel@artax.karlin.mff.cuni.cz> 1999-04-23 Pavel Machek <pavel@artax.karlin.mff.cuni.cz>
* vfs.c (vfs_parse_filemode): fix for solaris which uses 'l' * vfs.c (vfs_parse_filemode): fix for solaris which uses 'l'

33
vfs/ftpfs.c
View File

@ -1324,10 +1324,7 @@ retrieve_dir(struct connection *bucket, char *remote_path, int resolve_symlinks)
else else
print_vfs_message(_("ftpfs: Reading FTP directory %s..."), remote_path); print_vfs_message(_("ftpfs: Reading FTP directory %s..."), remote_path);
if (has_spaces || bucket->strict_rfc959_list_cmd || ftpfs_first_cd_then_ls) { if (has_spaces || bucket->strict_rfc959_list_cmd || ftpfs_first_cd_then_ls) {
char *p; if (ftpfs_chdir_internal (bucket, remote_path) != COMPLETE) {
p = translate_path (bucket, remote_path);
if (ftpfs_chdir_internal (bucket, p) != COMPLETE) {
my_errno = ENOENT; my_errno = ENOENT;
print_vfs_message(_("ftpfs: CWD failed.")); print_vfs_message(_("ftpfs: CWD failed."));
return NULL; return NULL;
@ -1448,6 +1445,7 @@ retrieve_dir(struct connection *bucket, char *remote_path, int resolve_symlinks)
(file_list->next == file_list)) (file_list->next == file_list))
goto fallback; goto fallback;
ok:
if (!dot_found) if (!dot_found)
insert_dots (file_list, bucket); insert_dots (file_list, bucket);
@ -1487,6 +1485,33 @@ fallback:
linklist_destroy(file_list, direntry_destructor); linklist_destroy(file_list, direntry_destructor);
return retrieve_dir (bucket, remote_path, resolve_symlinks); return retrieve_dir (bucket, remote_path, resolve_symlinks);
} }
/* Ok, maybe the directory exists but the remote server doesn't
list "." and "..".
Check whether the directory exists:
*/
if (has_spaces || bucket->strict_rfc959_list_cmd ||
ftpfs_first_cd_then_ls) /* CWD has been already performed, i.e.
we know that remote_path exists */
goto ok;
else {
if (bucket->remote_is_amiga) {
/* The Amiga ftp server needs extra processing because it
always gets relative pathes instead of absolute pathes
like anyone else */
char *p = ftpfs_get_current_directory (bucket);
if (ftpfs_chdir_internal (bucket, remote_path) == COMPLETE) {
ftpfs_chdir_internal (bucket, p);
g_free (p);
goto ok;
}
} else {
if (ftpfs_chdir_internal (bucket, remote_path) == COMPLETE)
goto ok;
}
}
my_errno = EACCES; my_errno = EACCES;
g_free(dcache->remote_path); g_free(dcache->remote_path);
g_free(dcache); g_free(dcache);