Merge 0.6.6 branch into main.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7188 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2000-08-07 22:06:04 +00:00
parent 0370b5e398
commit ceda7aa91c
28 changed files with 728 additions and 709 deletions

View file

@ -106,6 +106,7 @@
NSDebugLLog(@"NSFileWrapper", @"initWithPath: %@", path);
// Store the full path in filename, the specification is unclear in this point
[self setFilename: path];
[self setPreferredFilename: [path lastPathComponent]];
[self setFileAttributes: [fm fileAttributesAtPath: path traverseLink: NO]];
@ -178,18 +179,11 @@
updateFilenames: (BOOL)updateFilenamesFlag
{
NSFileManager *fm = [NSFileManager defaultManager];
BOOL pathExists = [fm fileExistsAtPath: path];
BOOL success = NO;
NSDebugLLog(@"NSFileWrapper",
@"writeToFile: %@ atomically: updateFilenames: ", path);
// don't overwrite existing paths
if (pathExists && atomicFlag)
return NO;
if (updateFilenamesFlag == YES)
[self setFilename: [path lastPathComponent]];
switch (_wrapperType)
{
case GSFileWrapperDirectoryType:
@ -207,18 +201,26 @@
atomically: atomicFlag
updateFilenames: updateFilenamesFlag];
}
return YES;
success = YES;
break;
}
case GSFileWrapperRegularFileType:
{
return [_wrapperData writeToFile: path atomically: atomicFlag];
if ([_wrapperData writeToFile: path atomically: atomicFlag])
success = [fm changeFileAttributes: _fileAttributes
atPath: path];
break;
}
case GSFileWrapperSymbolicLinkType:
{
return [fm createSymbolicLinkAtPath: path pathContent: _wrapperData];
success = [fm createSymbolicLinkAtPath: path pathContent: _wrapperData];
break;
}
}
return NO;
if (success && updateFilenamesFlag)
[self setFilename: path];
return success;
}
- (NSData*) serializedRepresentation