Changeset 16 for trunk/Cocoa/F-Script Anywhere/Source/DeVercruesseProcess.m

Timestamp:

10/20/02 04:46:29 (22 years ago)

Author:

Nicholas Riley

Message:

F-Script Anywhere 1.1.5

File:

• trunk/Cocoa/F-Script Anywhere/Source/DeVercruesseProcess.m (modified) (4 diffs)

trunk/Cocoa/F-Script Anywhere/Source/DeVercruesseProcess.m

@@ -20 +20 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
-// njr changes: 
 
 #import "DeVercruesseProcess.h"
@@ -102 +100 @@
 - (NSString *)executableLoc;
 {
-    CFURLRef bundleURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef) [self loc], kCFURLPOSIXPathStyle, NO);
-    CFBundleRef bundleRef = CFBundleCreate(NULL, bundleURL);
+    CFStringRef bundleLoc = (CFStringRef) [self loc];
+    CFURLRef bundleURL;
+    CFBundleRef bundleRef;
+
+    if (bundleLoc == NULL) {
+        // GetProcessBundleLocation returns NULL on 10.1.5 for certain CFM Carbon applications (BBEdit 6.5.3) - njr
+        return nil; // XXX should really handle this better, but for the purposes of F-Script Anywhere, we donÕt care if itÕs not a Carbon app, and this works fine going forward.
+    }
+    
+    bundleURL = CFURLCreateWithFileSystemPath(NULL, bundleLoc, kCFURLPOSIXPathStyle, NO);
+    bundleRef = CFBundleCreate(NULL, bundleURL);
 
     if (bundleRef == NULL) {
+        BOOL isDir;
         CFRelease(bundleURL);
-        return nil; // not a bundle
+        if ([[NSFileManager defaultManager] fileExistsAtPath: [self loc] isDirectory: &isDir] && !isDir)
+            return [self loc];
+        return nil; // not a bundle or file
     } else {
         CFURLRef execURL = CFBundleCopyExecutableURL(bundleRef);
@@ -144 +154 @@
     char                buffer[1025];
     CFStringRef         pName;
-    NSBundle            *b;
     
     
     if( !name )
     {
-        if( [self loc] )
-        {
-            b = [NSBundle bundleWithPath:loc];
-            if( b )
-            {
-                name = [b localizedStringForKey:@"CFBundleName" value:@"_AsM_nO_nAmE_" table:@"InfoPlist"];
-                
-                if( [name isEqualToString:@"_AsM_nO_nAmE_"] )
-                    name = [[b infoDictionary] objectForKey:@"CFBundleName"];
-                
-                if( name )
-                    [name retain];
-            }
-        }
-        
         if( !name && (CopyProcessName( &psn, &pName) == noErr) )    // with thanks to Dylan Ashe
         {
@@ -173 +167 @@
             CFRelease( pName);
         }
-    }
-    
-    return name;
+        // CFBundleName code demoted to alternate method because it was causing plist processing issues in Jaguar, yet CopyProcessName doesn't work for everything, e.g. Help Viewer - njr
+        else if( [self loc] )
+        {
+            NSBundle *b = [NSBundle bundleWithPath:loc];
+            if( b )
+            {
+                name = [b localizedStringForKey:@"CFBundleName" value:@"_AsM_nO_nAmE_" table:@"InfoPlist"];
+
+                if( [name isEqualToString:@"_AsM_nO_nAmE_"] )
+                    name = [[b infoDictionary] objectForKey:@"CFBundleName"];
+
+                if( name )
+                    [name retain];
+            }
+        }
+        
+   }
+
+    return name ? name : @"Çunknown nameÈ";
 }