gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-12 00:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't try to copy file/group ownership

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36747 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-06-23 07:29:22 +00:00
parent d29e2005e9
commit a0875b7adb
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-06-23 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSFileManager.m: Don't attempt to set ownership of copied
file. The code was already doing this right for directories, but
not for other file types.
2013-06-21 Lubos Dolezel <lubos@dolezel.info> 2013-06-21 Lubos Dolezel <lubos@dolezel.info>
* Headers/GSBlocks.h: weakly import _Block_copy and _Block_release * Headers/GSBlocks.h: weakly import _Block_copy and _Block_release

27
Source/NSFileManager.m
View file

@ -1039,32 +1039,33 @@ static NSStringEncoding defaultEncoding;
return NO; return NO;
} }
fileType = [attrs fileType]; fileType = [attrs fileType];
/*
* Don't attempt to retain ownership of copy ... we want the copy
* to be owned by the current user.
*/
attrs = AUTORELEASE([attrs mutableCopy]);
[(NSMutableDictionary*)attrs removeObjectForKey: NSFileOwnerAccountID];
[(NSMutableDictionary*)attrs removeObjectForKey: NSFileGroupOwnerAccountID];
(NSMutableDictionary*)mattrs removeObjectForKey: NSFileGroupOwnerAccountName];
(NSMutableDictionary*)mattrs setObject: NSUserName()
forKey: NSFileOwnerAccountName];
if ([fileType isEqualToString: NSFileTypeDirectory] == YES) if ([fileType isEqualToString: NSFileTypeDirectory] == YES)
{ {
NSMutableDictionary *mattrs;
/* If destination directory is a descendant of source directory copying /* If destination directory is a descendant of source directory copying
isn't possible. */ isn't possible. */
if ([[destination stringByAppendingString: @"/"] if ([[destination stringByAppendingString: @"/"]
hasPrefix: [source stringByAppendingString: @"/"]]) hasPrefix: [source stringByAppendingString: @"/"]])
{ {
ASSIGN(_lastError, @"Could not copy - destination is a descendant of source"); ASSIGN(_lastError,
@"Could not copy - destination is a descendant of source");
return NO; return NO;
} }
[self _sendToHandler: handler willProcessPath: destination]; [self _sendToHandler: handler willProcessPath: destination];
/*
* Don't attempt to retain ownership of copy ... we want the copy
* to be owned by the current user.
*/
mattrs = [attrs mutableCopy];
[mattrs removeObjectForKey: NSFileOwnerAccountID];
[mattrs removeObjectForKey: NSFileGroupOwnerAccountID];
[mattrs removeObjectForKey: NSFileGroupOwnerAccountName];
[mattrs setObject: NSUserName() forKey: NSFileOwnerAccountName];
attrs = AUTORELEASE(mattrs);
if ([self createDirectoryAtPath: destination attributes: attrs] == NO) if ([self createDirectoryAtPath: destination attributes: attrs] == NO)
{ {
return [self _proceedAccordingToHandler: handler return [self _proceedAccordingToHandler: handler