Changeset 146 for trunk/launch/launch/main.c

Timestamp:

10/23/03 21:06:33 (21 years ago)

Author:

Nicholas Riley

Message:

VERSION: Updated for 1.0 (at long last!)

main.c: Dealt with -b/-h issue through documentation in man page,
removed from to do list. Dealt with -X issue through testing and
adding kLSNoClassicEnvironmentErr. Added kLSNoExecutableErr and
kCGErrorApplicationRequiresNewerSystem. Removed
BROKEN_LAUNCHNEWINSTANCE because it's fixed in Panther. Updated for
1.0. Fixed a couple of minor memory leaks. Output errors to stderr
instead of stdout. Work around bug in LSOpenFromURLSpec in Panther
(filed bug already). Don't make '????' look like a trigraph to GCC.

launch.pbproj: Updated for Xcode.

launch.1: Manual page, finally. Documents several known Mac OS X bugs
which interfere with launch's functioning.

README: Updated for 1.0. Added man page installation/removal
instructions, just like appswitch. s/Chimera/Camino/. Added my zsh
e() function as an example. Updated examples to reflect current
software versions and usage. Updated stationery discussion to mention
that Omni apps handle stationery too.

package-launch.sh: Set type/creator of files (not that it matters
since we're not doing a dmg distribution any more). Changes for man
page packaging.

File:

• trunk/launch/launch/main.c (modified) (17 diffs)

trunk/launch/launch/main.c

@@ -18 +18 @@
 /* To do/think about:
 
-- Do we need to assume -b if -h?  Hiding the foreground app just makes
-it flash (only if Cocoa?)
-
-- Does -X work at all?  What does it return if it fails?
-
 - Launching as root: use authentication framework - doesn't work.
 
@@ -37 +32 @@
 */
 
-#define DEBUG 1
+/* #define DEBUG 1 */
 #define BROKEN_AUTHORIZATION 1
-#define BROKEN_LAUNCHNEWINSTANCE 1
+#define BROKEN_LSOPENFROMURLSPEC 1
 #define kComponentSignatureString "launch"
 
@@ -56 +51 @@
 const char *APP_NAME;
 
-#define VERSION "1.0b3"
+#define VERSION "1.0"
 
 #define STRBUF_LEN 1024
@@ -90 +85 @@
     { kLSLaunchInProgressErr, "application is being opened; please try again after the application is open" },
     { kLSNotRegisteredErr, "application not registered in Launch Services database" },
+    { kLSNoExecutableErr, "application package contains no executable, or an unusable executable" },
+    { kLSNoClassicEnvironmentErr, "Classic environment required but not available" },
 #ifndef BROKEN_AUTHORIZATION
     // Security framework errors
@@ -102 +99 @@
     { procNotFound, "unable to connect to system service.\nAre you logged in?" },
     { kCGErrorIllegalArgument, "window server error.\nAre you logged in?" },
+    { kCGErrorApplicationRequiresNewerSystem, "application requires a newer Mac OS X version" },
     { fnfErr, "file not found" },
     { 0, NULL }
@@ -119 +117 @@
         "  -w            wait for application to finish opening before exiting\n"
         "  -b            launch application in the background\n"
-#ifndef BROKEN_LAUNCHNEWINSTANCE
         "  -m            launch application again, even if already running\n"
-#endif
         "  -h            hide application once it's finished opening\n"
         "  -C            force CFM/PEF Carbon application to launch in Classic\n"
@@ -254 +250 @@
                 CFRelease(url);
                 url = NULL;
-            }
+            } else {
+                CFRelease(scheme);
+            }
         }
     }
@@ -382 +380 @@
         case 'w': LSPEC.launchFlags ^= kLSLaunchAsync; break;      // synchronous
         case 'b': LSPEC.launchFlags |= kLSLaunchDontSwitch; break; // open in background
-#ifdef BROKEN_LAUNCHNEWINSTANCE
-        case 'm': errexit("-m option not functional (LaunchServices bug?), sorry");
-#else
         case 'm': LSPEC.launchFlags |= kLSLaunchNewInstance; break;// open multiple
-#endif
         case 'h': LSPEC.launchFlags |= kLSLaunchAndHide; break;    // hide once launched
         case 'C': LSPEC.launchFlags |= kLSLaunchInClassic; break;  // force Classic
@@ -419 +413 @@
                     if (scheme == NULL || !CFEqual(scheme, CFSTR("file")))
                         errexit("invalid file:// URL (argument of -u)");
+                    CFRelease(scheme);
                 }
             }
@@ -501 +496 @@
 }
 
-// 'context' is to match prototype for CFArrayApplierFunction, it's unused
-void printPathFromURL(CFURLRef url, void *context) {
+void printPathFromURL(CFURLRef url, FILE *stream) {
     CFStringRef scheme, pathOrURL;
     static char strBuffer[STRBUF_LEN];
     
-    check(url != NULL && context == NULL);
+    check(url != NULL && stream != NULL);
 
     scheme = CFURLCopyScheme(url);
@@ -517 +511 @@
     strBuffer[0] = '\0';
     CFStringGetCString(pathOrURL, strBuffer, STRBUF_LEN, CFStringGetSystemEncoding()); // XXX buffer size issues?
-    printf("%s\n", strBuffer);
+    fprintf(stream, "%s\n", strBuffer);
     CFRelease(scheme);
     CFRelease(pathOrURL);
@@ -700 +694 @@
                                 bundleID = CFDictionaryGetValue(infoPlist, kCFBundleIdentifierKey);
                                 if (bundleID != NULL) CFRetain(bundleID);
-                                CFStringRef appVersion = CFDictionaryGetValue(infoPlist, CFSTR("CFBundleShortVersionString"));
+                                appVersion = CFDictionaryGetValue(infoPlist, CFSTR("CFBundleShortVersionString"));
                                 if (appVersion == NULL)
                                     appVersion = CFDictionaryGetValue(infoPlist, kCFBundleVersionKey);
@@ -723 +717 @@
                 if (bundleID != NULL) CFRetain(bundleID);
                 // prefer a short version string, e.g. "1.0 Beta" instead of "51" for Safari
-                CFStringRef appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
+                appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
                 if (appVersion == NULL)
                     appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
-                if (appVersion != NULL)
+                if (appVersion != NULL) {
+                    CFRetain(appVersion);
                     intVersion = CFBundleGetVersionNumber(bundle);
+                }
                 CFRelease(bundle);
             }
@@ -749 +745 @@
         CFStringGetCString(kind, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
         printf("\tkind: %s\n", tmpBuffer);
+        CFRelease(kind);
         printMoreInfoFromURL(url);
     }
@@ -772 +769 @@
     
     CFRelease(urlStr);
+}
+
+OSStatus openFromURLSpec() {
+#ifndef BROKEN_LSOPENFROMURLSPEC
+    return LSOpenFromURLSpec(&LSPEC, NULL);
+#else
+    LSLaunchFSRefSpec spec = {NULL, 0, NULL, LSPEC.passThruParams,
+                              LSPEC.launchFlags, LSPEC.asyncRefCon};
+    CFIndex urlIndex, urlCount = LSPEC.itemURLs ? CFArrayGetCount(LSPEC.itemURLs) : 0;
+    FSRef *itemRefs = malloc(urlCount * sizeof(FSRef));
+    CFURLRef url;
+    CFStringRef scheme, fileScheme = CFSTR("file");
+    int itemIndex = 0;
+    OSStatus err;
+
+    for (urlIndex = 0 ; urlIndex < urlCount ; urlIndex++) {
+        url = CFArrayGetValueAtIndex(LSPEC.itemURLs, urlIndex);
+        scheme = CFURLCopyScheme(url);
+        if (CFEqual(scheme, fileScheme)) {
+            if (CFURLGetFSRef(url, &itemRefs[itemIndex])) {
+                itemIndex++;
+                CFArrayRemoveValueAtIndex((CFMutableArrayRef)LSPEC.itemURLs, urlIndex);
+                urlIndex--;
+                urlCount--;
+            } else {
+                fprintf(stderr, "%s: unable to locate: ", APP_NAME);
+                printPathFromURL(url, stderr);
+            }
+        }
+        CFRelease(scheme);
+    }
+
+    if (urlCount > 0 || itemIndex == 0) { /* URLs, or no items */
+        err = LSOpenFromURLSpec(&LSPEC, NULL);
+        if (err != noErr)
+            return err;
+    }
+    if (itemIndex > 0) {
+        FSRef appRef;
+        spec.numDocs = itemIndex;
+        spec.itemRefs = itemRefs;
+        if (LSPEC.appURL != NULL) {
+            if (!CFURLGetFSRef(LSPEC.appURL, &appRef)) {
+                errexit("can't find application");
+            }
+            spec.appRef = &appRef;
+        }
+        return LSOpenFromRefSpec(&spec, NULL);
+    }
+    return noErr;
+#endif
 }
 
@@ -798 +846 @@
     switch (OPTS.action) {
     case ACTION_FIND:
-        printPathFromURL(LSPEC.appURL, NULL);
+        printPathFromURL(LSPEC.appURL, stdout);
         break;
     case ACTION_OPEN:
-        err = LSOpenFromURLSpec(&LSPEC, NULL);
+        err = openFromURLSpec();
         if (err != noErr) osstatusexit(err, "can't open application", argv[1]);
         break;
     case ACTION_FIND_ITEMS:
         CFArrayApplyFunction(LSPEC.itemURLs, CFRangeMake(0, CFArrayGetCount(LSPEC.itemURLs)),
-                             (CFArrayApplierFunction) printPathFromURL, NULL);
+                             (CFArrayApplierFunction) printPathFromURL, stdout);
         break;
     case ACTION_OPEN_ITEMS:
-        err = LSOpenFromURLSpec(&LSPEC, NULL);
+        err = openFromURLSpec();
         if (err != noErr) osstatusexit(err, "can't open items", argv[1]);
         break;
@@ -819 +867 @@
     {
         ICInstance icInst;
-        err = ICStart(&icInst, '????');
+        err = ICStart(&icInst, '\?\?\?\?'); // in case GCC trigraph handling is enabled
         if (err != noErr) osstatusexit(err, "can't initialize Internet Config", argv[1]);
         CFArrayApplyFunction(LSPEC.itemURLs, CFRangeMake(0, CFArrayGetCount(LSPEC.itemURLs)),