My improvements

CSCommandLineParser.m

@@ -27,27 +27,27 @@
 
 
 
-static NSString *NamesKey=@"NamesKey";
-static NSString *AllowedValuesKey=@"AllowedValuesKey";
-static NSString *DefaultValueKey=@"DefaultValueKey";
-static NSString *OptionTypeKey=@"OptionType";
-static NSString *DescriptionKey=@"DescriptionKey";
-static NSString *ArgumentDescriptionKey=@"ArgumentDescriptionKey";
-static NSString *AliasTargetKey=@"AliasTargetKey";
-static NSString *RequiredOptionsKey=@"RequiredOptionsKey";
-
-static NSString *NumberValueKey=@"NumberValue";
-static NSString *StringValueKey=@"StringValue";
-static NSString *ArrayValueKey=@"ArrayValue";
-
-static NSString *StringOptionType=@"StringOptionType";
-static NSString *MultipleChoiceOptionType=@"MultipleChoiceOptionType";
-static NSString *IntegerOptionType=@"IntegerOptionType";
-static NSString *FloatingPointOptionType=@"FloatingPointOptionType";
-static NSString *SwitchOptionType=@"SwitchOptionType";
-static NSString *HelpOptionType=@"HelpOptionType";
-static NSString *VersionOptionType=@"VersionOptionType";
-static NSString *AliasOptionType=@"AliasOptionType";
+static NSString *const NamesKey=@"NamesKey";
+static NSString *const AllowedValuesKey=@"AllowedValuesKey";
+static NSString *const DefaultValueKey=@"DefaultValueKey";
+static NSString *const OptionTypeKey=@"OptionType";
+static NSString *const DescriptionKey=@"DescriptionKey";
+static NSString *const ArgumentDescriptionKey=@"ArgumentDescriptionKey";
+static NSString *const AliasTargetKey=@"AliasTargetKey";
+static NSString *const RequiredOptionsKey=@"RequiredOptionsKey";
+
+static NSString *const NumberValueKey=@"NumberValue";
+static NSString *const StringValueKey=@"StringValue";
+static NSString *const ArrayValueKey=@"ArrayValue";
+
+static NSString *const StringOptionType=@"StringOptionType";
+static NSString *const MultipleChoiceOptionType=@"MultipleChoiceOptionType";
+static NSString *const IntegerOptionType=@"IntegerOptionType";
+static NSString *const FloatingPointOptionType=@"FloatingPointOptionType";
+static NSString *const SwitchOptionType=@"SwitchOptionType";
+static NSString *const HelpOptionType=@"HelpOptionType";
+static NSString *const VersionOptionType=@"VersionOptionType";
+static NSString *const AliasOptionType=@"AliasOptionType";
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED<1050
 @interface NSScanner (BuildKludge)
@@ -388,9 +388,7 @@ -(void)addRequiredOption:(NSString *)requiredoption
 
 -(void)addRequiredOptionsArray:(NSArray *)requiredoptions
 {
-	NSEnumerator *enumerator=[requiredoptions objectEnumerator];
-	NSString *requiredoption;
-	while((requiredoption=[enumerator nextObject])) [self addRequiredOption:requiredoption];
+	for(NSString *requiredoption in requiredoptions) [self addRequiredOption:requiredoption];
 }
 
 -(void)addRequiredOption:(NSString *)requiredoption forOption:(NSString *)option
@@ -409,9 +407,7 @@ -(void)addRequiredOption:(NSString *)requiredoption forOption:(NSString *)option
 
 -(void)addRequiredOptionsArray:(NSArray *)requiredoptions forOption:(NSString *)option
 {
-	NSEnumerator *enumerator=[requiredoptions objectEnumerator];
-	NSString *requiredoption;
-	while((requiredoption=[enumerator nextObject])) [self addRequiredOption:requiredoption forOption:option];
+	for(NSString *requiredoption in requiredoptions) [self addRequiredOption:requiredoption forOption:option];
 }
 
 
@@ -620,9 +616,7 @@ -(void)_parseOptionWithDictionary:(NSMutableDictionary *)dict type:(NSString *)t
 
 -(void)_setDefaultValues
 {
-	NSEnumerator *enumerator=[options objectEnumerator];
-	NSMutableDictionary *dict;
-	while((dict=[enumerator nextObject]))
+	for(NSMutableDictionary *dict in [options objectEnumerator])
 	{
 		id defaultvalue=[dict objectForKey:DefaultValueKey];
 		if(!defaultvalue) continue;
@@ -660,9 +654,7 @@ -(void)_enforceRequirementsWithErrors:(NSMutableArray *)errors
 {
 	if([alwaysrequiredoptions count]) [self _requireOptionsInArray:alwaysrequiredoptions when:@"" errors:errors];
 
-	NSEnumerator *enumerator=[options objectEnumerator];
-	NSDictionary *dict;
-	while((dict=[enumerator nextObject]))
+	for(NSDictionary *dict in [options objectEnumerator])
 	{
 		NSArray *names=[dict objectForKey:NamesKey];
 		NSString *name=[names objectAtIndex:0];
@@ -682,9 +674,7 @@ -(void)_requireOptionsInArray:(NSArray *)requiredoptions when:(NSString *)when e
 {
 	NSMutableSet *set=[NSMutableSet set];
 
-	NSEnumerator *enumerator=[requiredoptions objectEnumerator];
-	NSString *requiredoption;
-	while((requiredoption=[enumerator nextObject]))
+	for(NSString *requiredoption in requiredoptions)
 	{
 		if(![self _isOptionDefined:requiredoption]) [set addObject:requiredoption];
 	}
@@ -693,9 +683,7 @@ -(void)_requireOptionsInArray:(NSArray *)requiredoptions when:(NSString *)when e
 
 	NSMutableArray *array=[NSMutableArray array];
 
-	enumerator=[optionordering objectEnumerator];
-	NSString *option;
-	while((option=[enumerator nextObject]))
+	for(NSString *option in optionordering)
 	{
 		if([set containsObject:option]) [array addObject:[self _describeOption:option]];
 	}
@@ -737,9 +725,7 @@ -(NSString *)_describeOptionAndArgument:(NSString *)name
 
 -(void)_reportErrors:(NSArray *)errors
 {
-	NSEnumerator *enumerator=[errors objectEnumerator];
-	NSString *error;
-	while((error=[enumerator nextObject]))
+	for(NSString *error in errors)
 	{
 		[error print];
 		[@"\n" print];

CSFileHandle.h

@@ -24,8 +24,8 @@
 
 #define CSFileHandle XADFileHandle
 
-extern NSString *CSCannotOpenFileException;
-extern NSString *CSFileErrorException;
+extern NSExceptionName const CSCannotOpenFileException;
+extern NSExceptionName const CSFileErrorException;
 
 @interface CSFileHandle:CSHandle
 {
@@ -41,6 +41,12 @@ extern NSString *CSFileErrorException;
 +(CSFileHandle *)fileHandleForReadingAtPath:(NSString *)path;
 +(CSFileHandle *)fileHandleForWritingAtPath:(NSString *)path;
 +(CSFileHandle *)fileHandleForPath:(NSString *)path modes:(NSString *)modes;
++(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path NS_SWIFT_UNAVAILABLE("Use throwing methods instead");
++(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path NS_SWIFT_UNAVAILABLE("Use throwing methods instead");
++(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes NS_SWIFT_UNAVAILABLE("Use throwing methods instead");
++(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError**)outErr;
++(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError**)outErr;
++(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError**)outErr;
 +(CSFileHandle *)fileHandleForStandardInput;
 +(CSFileHandle *)fileHandleForStandardOutput;
 +(CSFileHandle *)fileHandleForStandardError;
@@ -52,12 +58,12 @@ extern NSString *CSFileErrorException;
 -(void)close;
 
 // Public methods
--(FILE *)filePointer;
+@property (readonly) FILE *filePointer NS_RETURNS_INNER_POINTER;
 
 // Implemented by this class
--(off_t)fileSize;
--(off_t)offsetInFile;
--(BOOL)atEndOfFile;
+@property (readonly) off_t fileSize;
+@property (readonly) off_t offsetInFile;
+@property (readonly) BOOL atEndOfFile;
 
 -(void)seekToFileOffset:(off_t)offs;
 -(void)seekToEndOfFile;

CSFileHandle.m

@@ -19,18 +19,93 @@
  * MA 02110-1301  USA
  */
 #import "CSFileHandle.h"
+#import "XADException.h"
 
 #include <sys/stat.h>
 
 
 
-NSString *CSCannotOpenFileException=@"CSCannotOpenFileException";
-NSString *CSFileErrorException=@"CSFileErrorException";
+NSString *const CSCannotOpenFileException=@"CSCannotOpenFileException";
+NSString *const CSFileErrorException=@"CSFileErrorException";
 
 
 
 
 @implementation CSFileHandle
+@synthesize filePointer = fh;
+
++(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path
+{ return [self fileHandleForFileURL:path modes:@"rb"]; }
+
++(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path
+{ return [self fileHandleForFileURL:path modes:@"wb"]; }
+
++(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes
+{
+	if(!path) return nil;
+
+#if defined(__COCOTRON__) // Cocotron
+	FILE *fileh=_wfopen([path fileSystemRepresentationW],
+						(const wchar_t *)[modes cStringUsingEncoding:NSUnicodeStringEncoding]);
+#elif defined(__MINGW32__) // GNUstep under mingw32 - sort of untested
+	FILE *fileh=_wfopen((const wchar_t *)[path fileSystemRepresentation],
+						(const wchar_t *)[modes cStringUsingEncoding:NSUnicodeStringEncoding]);
+#else // Cocoa or GNUstep under Linux
+	FILE *fileh=fopen([path fileSystemRepresentation],modes.UTF8String);
+#endif
+
+	if(!fileh) [[NSException exceptionWithName:CSCannotOpenFileException
+										reason: [NSString stringWithFormat:@"Error attempting to open file \"%@\" in mode \"%@\" (%d).",path,modes, (int)errno]
+									  userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil], NSUnderlyingErrorKey, path, NSURLErrorKey, nil]] raise];
+
+	CSFileHandle *handle=[[CSFileHandle alloc] initWithFilePointer:fileh closeOnDealloc:YES path:path.path];
+	if(handle) return handle;
+
+	fclose(fileh);
+	return nil;
+}
+
++(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError **)outErr
+{ return [self fileHandleForFileURL:path modes:@"rb" error:outErr]; }
+
++(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError **)outErr
+{ return [self fileHandleForFileURL:path modes:@"wb" error:outErr]; }
+
++(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError **)outErr
+{
+	if(!path) {
+		if (outErr) {
+			*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorBadParameters userInfo:nil];
+		}
+		return nil;
+	}
+
+#if defined(__COCOTRON__) // Cocotron
+	FILE *fileh=_wfopen([path fileSystemRepresentationW],
+						(const wchar_t *)[modes cStringUsingEncoding:NSUnicodeStringEncoding]);
+#elif defined(__MINGW32__) // GNUstep under mingw32 - sort of untested
+	FILE *fileh=_wfopen((const wchar_t *)[path fileSystemRepresentation],
+						(const wchar_t *)[modes cStringUsingEncoding:NSUnicodeStringEncoding]);
+#else // Cocoa or GNUstep under Linux
+	FILE *fileh=fopen([path fileSystemRepresentation],modes.UTF8String);
+#endif
+
+	if(!fileh) {
+		if (outErr) {
+			*outErr = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
+		}
+		return nil;
+	}
+
+	CSFileHandle *handle=[[CSFileHandle alloc] initWithFilePointer:fileh closeOnDealloc:YES path:path.path];
+	if(handle) return handle;
+
+	fclose(fileh);
+	if (outErr) {
+		*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorUnknown userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
+	}
+	return nil;
+}
 
 +(CSFileHandle *)fileHandleForReadingAtPath:(NSString *)path
 { return [self fileHandleForPath:path modes:@"rb"]; }

CSHandle.h

@@ -20,6 +20,10 @@
  */
 #import <Foundation/Foundation.h>
 #import <stdint.h>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "XADTypes.h"
+#pragma clang diagnostic pop
 
 
 
@@ -38,13 +42,13 @@
 #endif
 
 
-extern NSString *CSOutOfMemoryException;
-extern NSString *CSEndOfFileException;
-extern NSString *CSNotImplementedException;
-extern NSString *CSNotSupportedException;
-
+XADEXTERN NSExceptionName const CSOutOfMemoryException;
+XADEXTERN NSExceptionName const CSEndOfFileException;
+XADEXTERN NSExceptionName const CSNotImplementedException;
+XADEXTERN NSExceptionName const CSNotSupportedException;
 
 
+XADEXPORT
 @interface CSHandle:NSObject <NSCopying>
 {
 	CSHandle *parent;

CSHandle.m

@@ -24,10 +24,10 @@
 #include <sys/stat.h>
 
 
-NSString *CSOutOfMemoryException=@"CSOutOfMemoryException";
-NSString *CSEndOfFileException=@"CSEndOfFileException";
-NSString *CSNotImplementedException=@"CSNotImplementedException";
-NSString *CSNotSupportedException=@"CSNotSupportedException";
+NSString *const CSOutOfMemoryException=@"CSOutOfMemoryException";
+NSString *const CSEndOfFileException=@"CSEndOfFileException";
+NSString *const CSNotImplementedException=@"CSNotImplementedException";
+NSString *const CSNotSupportedException=@"CSNotSupportedException";