gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 08:26:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug #35672

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35392 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-08-10 09:25:38 +00:00
parent 897390797f
commit 48ed95b668
2 changed files with 82 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-08-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSFileManager.m: ([-createDirectoryAtPath:attributes:])
OSX compatibility change to no longer create intermediate directories
(fixing bug #35672).
NB. Code depending on the original incorrect behavior should be
updated to use the new method:
-createDirectoryAtPath:withIntermediateDirectories:attributes:error:
2012-08-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSpellServer.m:

123
Source/NSFileManager.m
View file

@ -783,8 +783,8 @@ static NSStringEncoding defaultEncoding;
/**
* Creates a new directory, and sets its attributes as specified.<br />
* Creates other directories in the path as necessary.<br />
* Returns YES on success, NO on failure.
* Fails if directories in the path are missing.<br />
* Returns YES if the directory was created (or already exists), NO otherwise.
*/
- (BOOL) createDirectoryAtPath: (NSString*)path
attributes: (NSDictionary*)attributes
@ -821,22 +821,38 @@ static NSStringEncoding defaultEncoding;
if ([self fileExistsAtPath: completePath isDirectory: &isDir])
{
if (!isDir)
NSLog(@"WARNING: during creation of directory %@:"
@" sub path %@ exists, but is not a directory !",
path, completePath);
{
NSString *e;
e = [NSString stringWithFormat:
@"path %@ exists, but is not a directory", completePath];
ASSIGN(_lastError, e);
return NO;
}
}
else
{
const _CHAR *lpath;
if (nil == [paths nextObject])
{
const _CHAR *lpath;
lpath = [self fileSystemRepresentationWithPath: completePath];
if (CreateDirectoryW(lpath, 0) == FALSE)
{
return NO;
}
}
else
{
NSString *e;
lpath = [self fileSystemRepresentationWithPath: completePath];
if (CreateDirectoryW(lpath, 0) == FALSE)
{
return NO;
}
e = [NSString stringWithFormat:
@"path %@ is not accessible", completePath];
ASSIGN(_lastError, e);
return NO;
}
}
}
#else
/*
@ -885,46 +901,53 @@ static NSStringEncoding defaultEncoding;
}
// check if path from 0 to cur is valid
dirpath[cur] = '\0';
if (_STAT(dirpath, &statbuf) == 0)
if (_STAT(dirpath, &statbuf) != 0)
{
if (cur == len)
{
ASSIGN(_lastError,
@"Could not create directory - already exists");
return NO;
}
}
else
{
// make new directory
if (mkdir(dirpath, 0777) != 0)
{
NSString *s;
NSString *p;
s = [NSString stringWithFormat: @"Could not create '%s' - '%@'",
dirpath, [NSError _last]];
ASSIGN(_lastError, s);
return NO;
}
// if last directory and attributes then change
if (cur == len && attributes != nil)
{
if ([self changeFileAttributes: attributes
atPath: [self stringWithFileSystemRepresentation: dirpath
length: cur]] == NO)
return NO;
if (needChown != nil)
{
if ([self changeFileAttributes: needChown
atPath: [self stringWithFileSystemRepresentation: dirpath
length: cur]] == NO)
{
NSLog(@"Failed to change ownership of '%s' to '%@'",
dirpath, NSUserName());
}
}
return YES;
}
p = [self stringWithFileSystemRepresentation: dirpath length: cur];
if (cur != len)
{
NSString *e;
e = [NSString stringWithFormat: @"path %@ is not accessible", p];
ASSIGN(_lastError, e);
return NO;
}
else
{
// make new directory
if (mkdir(dirpath, 0777) != 0)
{
NSString *e;
e = [NSString stringWithFormat:
@"Could not create '%@' - '%@'",
p, [NSError _last]];
ASSIGN(_lastError, e);
return NO;
}
// if last directory and attributes then change
if (attributes != nil)
{
if ([self changeFileAttributes: attributes
atPath: p] == NO)
{
return NO;
}
if (needChown != nil)
{
if ([self changeFileAttributes: needChown
atPath: p] == NO)
{
NSLog(@"Failed to change ownership of '%p' to '%@'",
p, NSUserName());
}
}
return YES;
}
}
}
dirpath[cur] = '/';
cur++;