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

MacOS-X compatibility tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26345 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-03-18 13:55:46 +00:00
parent e1eae14cff
commit f1143aa518
6 changed files with 195 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Source/NSString.m
View file

@ -73,6 +73,7 @@
#include "Foundation/NSLock.h"
#include "Foundation/NSNotification.h"
#include "Foundation/NSUserDefaults.h"
#include "Foundation/FoundationErrors.h"
#include "Foundation/NSDebug.h"
// For private method _decodePropertyListForKey:
#include "Foundation/NSKeyedArchiver.h"
@ -777,6 +778,21 @@ handle_printf_atsign (FILE *stream,
return AUTORELEASE(obj);
}
/**
* Load contents of file at path into a new string using the
* -initWithContentsOfFile:usedEncoding:error: method.
*/
+ (id) stringWithContentsOfFile: (NSString *)path
usedEncoding: (NSStringEncoding*)enc
error: (NSError**)error
{
NSString *obj;
obj = [self allocWithZone: NSDefaultMallocZone()];
obj = [obj initWithContentsOfFile: path usedEncoding: enc error: error];
return AUTORELEASE(obj);
}
/**
* Load contents of given URL into a new string. Will interpret contents as
* containing direct unicode if it begins with the unicode byte order mark,
@ -1210,6 +1226,78 @@ handle_printf_atsign (FILE *stream,
return self;
}
/**
* <p>Initialises the receiver with the contents of the file at path.
* </p>
* <p>Invokes [NSData-initWithContentsOfFile:] to read the file, then
* examines the data to infer its encoding type, and converts the
* data to a string using -initWithData:encoding:
* </p>
* <p>The encoding to use is determined as follows ... if the data begins
* with the 16-bit unicode Byte Order Marker, then it is assumed to be
* unicode data in the appropriate ordering and converted as such.<br />
* If it begins with a UTF8 representation of the BOM, the UTF8 encoding
* is used.<br />
* Otherwise, the default C String encoding is used.
* </p>
* <p>Releases the receiver and returns nil if the file could not be read
* and converted to a string.
* </p>
*/
- (id) initWithContentsOfFile: (NSString*)path
usedEncoding: (NSStringEncoding*)enc
error: (NSError**)error
{
NSData *d;
unsigned int len;
const unsigned char *data_bytes;
d = [[NSDataClass alloc] initWithContentsOfFile: path];
if (d == nil)
{
RELEASE(self);
return nil;
}
*enc = _DefaultStringEncoding;
len = [d length];
if (len == 0)
{
RELEASE(d);
RELEASE(self);
return @"";
}
data_bytes = [d bytes];
if ((data_bytes != NULL) && (len >= 2))
{
const unichar *data_ucs2chars = (const unichar *) data_bytes;
if ((data_ucs2chars[0] == byteOrderMark)
|| (data_ucs2chars[0] == byteOrderMarkSwapped))
{
/* somebody set up us the BOM! */
*enc = NSUnicodeStringEncoding;
}
else if (len >= 3
&& data_bytes[0] == 0xEF
&& data_bytes[1] == 0xBB
&& data_bytes[2] == 0xBF)
{
*enc = NSUTF8StringEncoding;
}
}
self = [self initWithData: d encoding: *enc];
RELEASE(d);
if (self == nil)
{
if (error != 0)
{
*error = [NSError errorWithDomain: NSCocoaErrorDomain
code: NSFileReadCorruptFileError
userInfo: nil];
}
}
return self;
}
/**
* <p>Initialises the receiver with the contents of the given URL.
* </p>