mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

* file.c (copy_file_file): Chmod destination only if

Browse Source 
ctx->preserve is on.  Eliminate gotos.
This commit is contained in:
Andrew V. Samoilov 2002-03-04 13:52:39 +00:00
parent d05ff778ff
commit 8ce8833c37
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2002-03-04 Andrew V. Samoilov <kai@cmail.ru>
* file.c (copy_file_file): Chmod destination only if
ctx->preserve is on. Eliminate gotos.
2002-03-01 Andrew V. Samoilov <kai@cmail.ru>
* Makefile.am (mc.hlp.ru): New rule to compile translated

24
src/file.c
View File

@ -489,12 +489,11 @@ copy_file_file (FileOpContext *ctx, char *src_path, char *dst_path, int ask_over
mc_refresh ();
retry_dst_stat:
if (mc_stat (dst_path, &sb2) == 0){
while (mc_stat (dst_path, &sb2) == 0){
if (S_ISDIR (sb2.st_mode)){
return_status = file_error (_(" Cannot overwrite directory \"%s\" \n %s "), dst_path);
if (return_status == FILE_RETRY)
goto retry_dst_stat;
continue;
return return_status;
}
dst_exists = 1;
@ -791,16 +790,17 @@ copy_file_file (FileOpContext *ctx, char *src_path, char *dst_path, int ask_over
* .ado: according to the XPG4 standard, the file must be closed before
* chmod can be invoked
*/
retry_dst_chmod:
if (!appending && mc_chmod (dst_path, src_mode & ctx->umask_kill)){
temp_status = file_error (_(" Cannot chmod target file \"%s\" \n %s "), dst_path);
if (temp_status == FILE_RETRY)
goto retry_dst_chmod;
return_status = temp_status;
}
if (!appending && ctx->preserve)
if (!appending && ctx->preserve){
while (mc_chmod (dst_path, src_mode & ctx->umask_kill)){
temp_status = file_error (
_(" Cannot chmod target file \"%s\" \n %s "), dst_path);
if (temp_status != FILE_RETRY){
return_status = temp_status;
break;
}
}
mc_utime (dst_path, &utb);
}
}
if (return_status == FILE_CONT)