Author: rfm
Date: Fri Dec 18 16:27:24 2015
New Revision: 39238
URL: http://svn.gna.org/viewcvs/gnustep?rev=39238&view=rev
Log:
beter reporting of bad defaults write/set
Modified:
libs/ec/trunk/EcProcess.m
Modified: libs/ec/trunk/EcProcess.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcProcess.m?rev=39238&r1=39237&r2=39238&view=diff
==============================================================================
--- libs/ec/trunk/EcProcess.m (original)
+++ libs/ec/trunk/EcProcess.m Fri Dec 18 16:27:24 2015
@@ -3072,15 +3072,30 @@
[cmdDefs setCommand: nil forKey: key];
val = [cmdDefs objectForKey: key];
}
- else if ([msg count] > 3
- && ([mode caseInsensitiveCompare: @"write"] == NSOrderedSame
- || [mode caseInsensitiveCompare: @"set"] == NSOrderedSame))
- {
- val = [msg objectAtIndex: 3];
- [cmdDefs setCommand: val forKey: key];
- val = [cmdDefs objectForKey: key];
- }
- else if ([mode caseInsensitiveCompare: @"read"] == NSOrderedSame)
+ else if ([mode caseInsensitiveCompare: @"write"] == NSOrderedSame
+ || [mode caseInsensitiveCompare: @"set"] == NSOrderedSame)
+ {
+ if ([msg count] == 4)
+ {
+ val = [msg objectAtIndex: 3];
+ [cmdDefs setCommand: val forKey: key];
+ val = [cmdDefs objectForKey: key];
+ }
+ else if ([msg count] == 3)
+ {
+ [self cmdPrintf: @"Missing value for '%@ %@' (no effect).\n",
+ mode, key];
+ val = old;
+ }
+ else
+ {
+ [self cmdPrintf: @"Too many values for '%@ %@' (ignored).\n",
+ mode, key];
+ val = old;
+ }
+ }
+ else if ([mode caseInsensitiveCompare: @"read"] == NSOrderedSame
+ || [mode caseInsensitiveCompare: @"get"] == NSOrderedSame)
{
val = [cmdDefs objectForKey: key];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
