mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

* file.c (copy_file_file): Reuse message.

Browse Source 
(copy_dir_dir): Eliminate one more goto.
This commit is contained in:
Andrew V. Samoilov 2002-10-23 08:22:53 +00:00
parent 05b4cca7cd
commit cde108f585
2 changed files with 9 additions and 6 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-10-23 Andrew V. Samoilov <sav@bcs.zp.ua>
* file.c (copy_file_file): Reuse message.
(copy_dir_dir): Eliminate one more goto.
2002-10-22 Pavel Roskin <proski@gnu.org>
* man2hlp.c (main): Remove unnecessary spaces in the table of

10
src/file.c
View File

@ -519,7 +519,7 @@ copy_file_file (FileOpContext *ctx, char *src_path, char *dst_path,
/* Destination already exists */
if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) {
message_3s (1, MSG_ERROR,
_(" `%s' and `%s' are the same file. "), src_path,
_(" `%s' and `%s' are the same file "), src_path,
dst_path);
do_refresh ();
return FILE_SKIP;
@ -995,12 +995,10 @@ copy_dir_dir (FileOpContext *ctx, char *s, char *d, int toplevel,
#ifndef NATIVE_WIN32
if (ctx->preserve_uidgid){
retry_dst_chown:
if (mc_chown (dest_dir, cbuf.st_uid, cbuf.st_gid)){
while (mc_chown (dest_dir, cbuf.st_uid, cbuf.st_gid)){
return_status = file_error (_(" Cannot chown target directory \"%s\" \n %s "), dest_dir);
if (return_status == FILE_RETRY)
goto retry_dst_chown;
goto ret;
if (return_status != FILE_RETRY)
goto ret;
}
}
#endif /* !NATIVE_WIN32 */