From 4f89cfe836e82f9445b98d733d6eb54b86e609d2 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Fri, 14 May 2010 19:35:54 +0000 Subject: [Author: dmaclach] There are still a couple of errors occurring, but this fixes up the majority of stuff. I figured I'd send it out to you now to take a look at in the morning, and then we can clean up the last couple of issues. Not quite sure what to do about the naming of data files so that we can encompass ranges of system version (e.g. this file applies to 10.5 and 10.6 but not 10.4 or 10.7. R=thomasvl DELTA=10598 (10211 added, 70 deleted, 317 changed) --- Foundation/GTMNSString+FindFolder.m | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'Foundation/GTMNSString+FindFolder.m') diff --git a/Foundation/GTMNSString+FindFolder.m b/Foundation/GTMNSString+FindFolder.m index 3a44174..2e847e3 100644 --- a/Foundation/GTMNSString+FindFolder.m +++ b/Foundation/GTMNSString+FindFolder.m @@ -62,12 +62,30 @@ // it already exists resultPath = subdirPath; } else if (doCreate) { - + parentFolderPath = [parentFolderPath stringByResolvingSymlinksInPath]; + NSDictionary* attrs = nil; + BOOL createdSubDir = NO; // create the subdirectory with the parent folder's attributes - NSDictionary* attrs = [fileMgr fileAttributesAtPath:parentFolderPath - traverseLink:YES]; - if ([fileMgr createDirectoryAtPath:subdirPath - attributes:attrs]) { +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + NSError *error = nil; + attrs = [fileMgr attributesOfItemAtPath:parentFolderPath error:&error]; + if (error) { + _GTMDevLog(@"Error %@ getting attributes of %@", + error, parentFolderPath); + } + createdSubDir = [fileMgr createDirectoryAtPath:subdirPath + withIntermediateDirectories:YES + attributes:attrs + error:&error]; + if (error) { + _GTMDevLog(@"Error %@ creating directory at %@", error, subdirPath); + } +#else + attrs = [fileMgr fileAttributesAtPath:parentFolderPath traverseLink:YES]; + createdSubDir = [fileMgr createDirectoryAtPath:subdirPath + attributes:attrs]; +#endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + if (createdSubDir) { resultPath = subdirPath; } } -- cgit v1.2.3