Attachment 207372 Details for Bug 364484 – Silenio's patch from bug 353185

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Silenio's patch from bug 353185

patch353185.txt (text/plain), 1.52 KB, created by Andrew Niefer

on 2011-11-22 11:01:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2011-11-22 11:01:22 EST

Size: 1.52 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
>index c91f213..7943957 100644
>--- a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
>+++ b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c
>@@ -118,16 +118,20 @@ static NSWindow* window = nil;
> 	}
> 		
> 	for (index = 1; index<=count; index++) {
>-		NSAppleEventDescriptor *desc = [event descriptorAtIndex:index];
>-		if (desc) {
>-			desc = [desc coerceToDescriptorType:typeFSRef];
>-			CFURLRef url = CFURLCreateFromFSRef(kCFAllocatorDefault, [[desc data] bytes]);
>-			if (url) {
>-				NSString *pathName = (NSString *)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
>-				[files addObject:pathName];
>-				[pathName release];
>-				CFRelease(url);
>-			}
>+		CFURLRef url = NULL;
>+		NSAppleEventDescriptor *desc = [event descriptorAtIndex:index], *coerceDesc;
>+		if (!desc) continue;
>+		if ((coerceDesc = [desc coerceToDescriptorType: typeFSRef]) != NULL) {
>+			url = CFURLCreateFromFSRef(kCFAllocatorDefault, [[coerceDesc data] bytes]);
>+		} else if ((coerceDesc = [desc coerceToDescriptorType: typeFileURL]) != NULL) {
>+			NSData *data = [coerceDesc data];
>+			url = CFURLCreateWithBytes(kCFAllocatorDefault, [data bytes], [data length], kCFStringEncodingUTF8, NULL);
>+		}
>+		if (url) {
>+			NSString *pathName = (NSString *)CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
>+			[files addObject:pathName];
>+			[pathName release];
>+			CFRelease(url);
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 364484: 207372