Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/WebKit/mac/Misc/WebKitNSStringExtras.m

    r243 r429  
    3636 
    3737#import <unicode/uchar.h> 
     38#import <sys/param.h> 
    3839 
    3940@implementation NSString (WebKitExtras) 
     
    341342} 
    342343 
     344+ (NSString *)_webkit_applicationCacheDirectoryWithBundleIdentifier:(NSString*)bundleIdentifier 
     345{ 
     346    NSString* cacheDir = nil; 
     347     
     348#ifdef BUILDING_ON_TIGER 
     349    cacheDir = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Caches"]; 
     350#else 
     351    char cacheDirectory[MAXPATHLEN]; 
     352    size_t cacheDirectoryLen = confstr(_CS_DARWIN_USER_CACHE_DIR, cacheDirectory, MAXPATHLEN); 
     353     
     354    if (cacheDirectoryLen) 
     355        cacheDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:cacheDirectory length:cacheDirectoryLen - 1]; 
     356#endif 
     357 
     358    return [cacheDir stringByAppendingPathComponent:bundleIdentifier]; 
     359} 
     360 
     361 
    343362@end