Author: thebeing
Date: Mon Sep 19 17:56:51 2016
New Revision: 40090
URL: http://svn.gna.org/viewcvs/gnustep?rev=40090&view=rev
Log:
Fix detection of the charset in XML data
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Source/Additions/GSMime.m
libs/base/trunk/Tests/base/GSMime/xml-charset.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=40090&r1=40089&r2=40090&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Mon Sep 19 17:56:51 2016
@@ -1,3 +1,13 @@
+2016-09-19 Niels Grewe <[email protected]>>
+
+ * Source/Additions/GSMime.m (charsetForXml):
+ Fix detection of charset in XML document.
+ * Tests/base/GSMime/xml-charset.m: Test case.
+
+2016-09-16 Wolfgang Lux <[email protected]>
+
+ * Source/Additions/GSMime.m (convertTo7BitSafe):
+
2016-09-16 Wolfgang Lux <[email protected]>
* Source/Additions/GSMime.m (convertTo7BitSafe):
Modified: libs/base/trunk/Source/Additions/GSMime.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/Additions/GSMime.m?rev=40090&r1=40089&r2=40090&view=diff
==============================================================================
--- libs/base/trunk/Source/Additions/GSMime.m (original)
+++ libs/base/trunk/Source/Additions/GSMime.m Mon Sep 19 17:56:51 2016
@@ -4764,7 +4764,7 @@
{
/* Extract the charset and return it.
*/
- r = NSMakeRange(index, r.length - index);
+ r = NSMakeRange(index, r.location - index);
return [xml substringWithRange: r];
}
}
Modified: libs/base/trunk/Tests/base/GSMime/xml-charset.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/GSMime/xml-charset.m?rev=40090&r1=40089&r2=40090&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/GSMime/xml-charset.m (original)
+++ libs/base/trunk/Tests/base/GSMime/xml-charset.m Mon Sep 19 17:56:51 2016
@@ -8,9 +8,10 @@
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSString *xml = @"<?xml version=\"1.0\" encoding=\"UTF-8\"?><html></html>";
NSString *charset = nil;
- testHopeful = YES;
- PASS_RUNS(charset = [GSMimeDocument charsetForXml: xml], "Can determine
cahrset of xml document.");
+ PASS_RUNS(charset = [GSMimeDocument charsetForXml: xml], "Can determine
charset of xml document.");
+ PASS_EQUAL(@"UTF-8", charset, "Charset detected correctly");
DESTROY(arp);
+ return 0;
}
#else
int main(int argc,char **argv)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
