Changeset 272 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

07/21/06 20:01:32 (18 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.m: Strip intra-URL whitespace, not just leading and trailing.

ICeCoffEE.ldb: More localization changes.

ICeCoffEE.xcodeproj: Copy Smart Crash Reports, its Unsanity Installer
plugin, and the German-localized Select Services nib (oops).

And nuke some .DS_Stores for good measure.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m (modified) (3 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -243 +243 @@
     OSStatus err = noErr;
     long selStart, selEnd;
-    string = [string stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-    unsigned len = [string length];
+    NSMutableString *urlString = [[NSMutableString alloc] init];
+    NSCharacterSet *whitespace = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+    NSScanner *scanner = [[NSScanner alloc] initWithString: string];
+    NSString *fragmentString;
+    while ([scanner scanUpToCharactersFromSet: whitespace intoString: &fragmentString]) {
+        [urlString appendString: fragmentString];
+    }
+    unsigned len = [urlString length];
 
     Handle h = NULL;
@@ -253 +259 @@
             ICCF_OSErrCAssert(MemError(), @"NewHandle");
 
-        if (CFStringGetBytes((CFStringRef)string, CFRangeMake(0, len), kCFStringEncodingASCII, '\0', false, (UInt8 *)*h, len, NULL) != len)
+        if (CFStringGetBytes((CFStringRef)urlString, CFRangeMake(0, len), kCFStringEncodingASCII, '\0', false, (UInt8 *)*h, len, NULL) != len)
             ICCF_OSErrCAssert(kTECNoConversionPathErr, @"CFStringGetBytes");
 
@@ -272 +278 @@
     NS_HANDLER
         DisposeHandle(h);
+        [urlString release];
         [localException raise];
     NS_ENDHANDLER
-
+        
     DisposeHandle(h);
+    [urlString release];
 
     return (err == noErr);