mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* file.c (copy_file_file): Rollback one hunk to eliminate infinitive loop.

This commit is contained in:
Andrew V. Samoilov 2002-03-06 07:37:14 +00:00
parent 0e0fdc3aa6
commit 5f2ae160c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/file.c
View File

@ -489,11 +489,12 @@ copy_file_file (FileOpContext *ctx, char *src_path, char *dst_path, int ask_over
mc_refresh (); mc_refresh ();
while (mc_stat (dst_path, &sb2) == 0){ retry_dst_stat:
if (mc_stat (dst_path, &sb2) == 0){
if (S_ISDIR (sb2.st_mode)){ if (S_ISDIR (sb2.st_mode)){
return_status = file_error (_(" Cannot overwrite directory \"%s\" \n %s "), dst_path); return_status = file_error (_(" Cannot overwrite directory \"%s\" \n %s "), dst_path);
if (return_status == FILE_RETRY) if (return_status == FILE_RETRY)
continue; goto retry_dst_stat;
return return_status; return return_status;
} }
dst_exists = 1; dst_exists = 1;
@ -501,10 +502,9 @@ copy_file_file (FileOpContext *ctx, char *src_path, char *dst_path, int ask_over
while ((* ctx->stat_func) (src_path, &sb)) { while ((* ctx->stat_func) (src_path, &sb)) {
return_status = file_error (_(" Cannot stat source file \"%s\" \n %s "), src_path); return_status = file_error (_(" Cannot stat source file \"%s\" \n %s "), src_path);
if (return_status == FILE_RETRY) if (return_status != FILE_RETRY)
continue; return return_status;
return return_status; }
}
if (dst_exists){ if (dst_exists){
/* .ado: For OS/2 or NT: no st_ino exists, it is better to just try to /* .ado: For OS/2 or NT: no st_ino exists, it is better to just try to