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

Merge branch '2278_preserve_attrs_if_dest_exists'

Browse Source 
* 2278_preserve_attrs_if_dest_exists:
  code indentation
  Ticket #2278: Problem in the Copy operation
This commit is contained in:
Slava Zanko 2012-03-26 10:59:43 +03:00
commit 3907f19a04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filemanager/file.c
View File

@ -330,7 +330,7 @@ check_hardlinks (const vfs_path_t * src_vpath, const vfs_path_t * dst_vpath, str
lnk->dev = dev; lnk->dev = dev;
lnk->src_vpath = vfs_path_clone (src_vpath); lnk->src_vpath = vfs_path_clone (src_vpath);
lnk->dst_vpath = vfs_path_clone (dst_vpath); lnk->dst_vpath = vfs_path_clone (dst_vpath);
linklist = g_slist_prepend (linklist, lnk); linklist = g_slist_prepend (linklist, lnk);
} }
return FALSE; return FALSE;
@ -1867,7 +1867,7 @@ copy_file_file (FileOpTotalContext * tctx, FileOpContext * ctx,
break; break;
} }
} }
else else if (!dst_exists)
{ {
src_mode = umask (-1); src_mode = umask (-1);
umask (src_mode); umask (src_mode);