mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 10:04:32 +03:00
Merge branch '2278_preserve_attrs_if_dest_exists'
* 2278_preserve_attrs_if_dest_exists: code indentation Ticket #2278: Problem in the Copy operation
This commit is contained in:
commit
3907f19a04
@ -330,7 +330,7 @@ check_hardlinks (const vfs_path_t * src_vpath, const vfs_path_t * dst_vpath, str
|
||||
lnk->dev = dev;
|
||||
lnk->src_vpath = vfs_path_clone (src_vpath);
|
||||
lnk->dst_vpath = vfs_path_clone (dst_vpath);
|
||||
linklist = g_slist_prepend (linklist, lnk);
|
||||
linklist = g_slist_prepend (linklist, lnk);
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
@ -1867,7 +1867,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx,
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
else if (!dst_exists)
|
||||
{
|
||||
src_mode = umask (-1);
|
||||
umask (src_mode);
|
||||
|
Loading…
Reference in New Issue
Block a user