Changeset 166

Timestamp:

04/04/05 00:22:09 (19 years ago)

Author:

Nicholas Riley

Message:

VERSION: Updated for 1.0.1.

main.c: Updated copyright statement. Updated for 1.0.1. Added -U,
triggers OPTS.forceURLs. Added kLSMultipleSessionsNotSupportedErr,
nsvErr. Cleaned up string encoding handling; works much better now.
Split code into stringFromURLIsRemote, utf8StringFromCFStringRef, and
utf8StringFromOSType. Display "contents: zero items" instead of "0
items" in printMoreInfoForURL. Remove extraneous "./" at beginning of
displayed paths. Get versions of non-{applications, packages} and
info from nonbundled apps with CFBundleCopyInfoDictionaryForURL.
Replaced some error codes with numbers so we support building on 10.2
again.

launch.1: Updated for 1.0.1 and -U option.

README: Updated for 1.0.1. Fixed a paste-o in the uninstallation
instructions.

package-launch.sh: Use zsh explicitly. Build as deployment. Fix
permissions. Make tarball contents owned by root/wheel.

Location:

trunk/launch

Files:

• launch/README (modified) (5 diffs)
• launch/VERSION (modified) (1 diff)
• launch/launch.1 (modified) (4 diffs)
• launch/launch.pbproj/nicholas.mode1 (added)
• launch/launch.pbproj/nicholas.pbxuser (modified) (14 diffs)
• launch/launch.pbproj/project.pbxproj (modified) (11 diffs)
• launch/main.c (modified) (24 diffs)
• package-launch.sh (modified) (3 diffs)

trunk/launch/launch/README

@@ -1 @@
-launch 1.0 [23 October 2003]
-==========
+launch 1.0.1 [3 April 2005]
+============
 
 A command-line launcher for Mac OS X in the spirit of open(1).
@@ -56 +56 @@
 Uninstallation:
 
-% sudo rm -f /usr/local/bin/launch /usr/local/man/man1/appswitch.1
+% sudo rm -f /usr/local/bin/launch /usr/local/man/man1/launch.1
 
 COMPILATION
@@ -63 +63 @@
 An Xcode/Project Builder project, 'launch.pbproj', is included.  A
 precompiled binary is also provided.  'launch' was developed and
-tested under Mac OS 10.3 with the October 2003 Developer Tools, and
-does not require any additional software to build.
+tested under Mac OS 10.3.8 with Xcode 1.5, and does not require any
+additional software to build.
 
 USAGE
@@ -202 +202 @@
 various system services owned by the currently logged-on user.  If you
 aren't using 'launch' from a terminal currently logged into the Mac OS
-X GUI, certain operations may not work.  Try opening Terminal.app,
-creating a new terminal, and trying again.
+X GUI, certain operations may not work.  Try opening Terminal, creating
+a new terminal window, and trying again.
 
 Another possibility is to create your own interprocess messaging.
@@ -237 +237 @@
 ---------------
 
+1.0.1 - 3 April 2005
+ - prefer files to URLs; added -U for old behavior
+ - don't display extraneous leading './' on file paths
+ - display 'zero items', not '0 items', for consistency
+ - display versions of non-applications
+ - read Info.plists embedded in unbundled Mach-O applications
+ - non-ASCII arguments are now handled with the filesystem, rather
+   than the system encoding [Derrick Bass]
+ - explicitly use UTF-8 everywhere else to properly interpret and
+   display non-ASCII filenames and URLs
+ - reading OSTypes and 'vers' resources, and opening URLs with
+   Internet Config still uses the system encoding, converting as
+   necessary for display
+ - should be buildable on 10.2 again
 1.0 - 23 October 2003
  - work around CFBundle bug to report bundle identifiers and versions

trunk/launch/launch/VERSION

@@ -1 @@
-1.0
+1.0.1

trunk/launch/launch/launch.1

@@ -1 @@
-.Dd Wed Oct 22 2003      \" DATE 
+.Dd Sun Apr 3 2005       \" DATE 
 .Dt LAUNCH 1 LOCAL       \" Program name and manual section number 
-.Os launch 1.0
+.Os launch 1.0.1
 .Sh NAME
 .Nm launch
@@ -7 +7 @@
 .Sh SYNOPSIS
 .Nm launch
-.Op Fl npswbmhCX         \" [-npswbmhCX]
+.Op Fl npswbmhCXU        \" [-npswbmhCXU]
 .Op Fl c Ar creator      \" [-c creator]
 .Op Fl i Ar bundleID     \" [-i bundleID]
@@ -15 +15 @@
 .Op Ar -                 \" [-]
 .Nm 
-.Op Fl npflswbmhCX
+.Op Fl npflswbmhCXU
 .Ar item ...
 .Sh DESCRIPTION
@@ -99 +99 @@
 Don't start the Classic environment for this Classic application if
 Classic isn't running.
+.It Fl U
+Interpret items as URLs, even if files with the same names as the URLs
+exist.  (This was the default behavior in
+.Nm
+1.0.)
 .El
 .Sh SEE ALSO 

trunk/launch/launch/launch.pbproj/nicholas.pbxuser

@@ -47 +47 @@
                                 PBXFileTableDataSourceColumnWidthsKey = (
                                         20,
-                                        341,
+                                        236,
                                         20,
-                                        65,
+                                        47,
                                         43,
                                         43,
@@ -76 +76 @@
                                 );
                         };
-                        PBXPerProjectTemplateStateSaveDate = 88649579;
+                        PBXPerProjectTemplateStateSaveDate = 134264568;
+                        PBXPrepackagedSmartGroups_v2 = (
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        activationKey = OldTargetSmartGroup;
+                                        clz = PBXTargetSmartGroup;
+                                        description = "Displays all targets of the project.";
+                                        globalID = 1C37FABC04509CD000000102;
+                                        name = Targets;
+                                        preferences = {
+                                                image = Targets;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXTargetSmartGroup2;
+                                        description = "Displays all targets of the project as well as nested build phases.";
+                                        globalID = 1C37FBAC04509CD000000102;
+                                        name = Targets;
+                                        preferences = {
+                                                image = Targets;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXExecutablesSmartGroup;
+                                        description = "Displays all executables of the project.";
+                                        globalID = 1C37FAAC04509CD000000102;
+                                        name = Executables;
+                                        preferences = {
+                                                image = Executable;
+                                        };
+                                },
+                                {
+                                        " PBXTransientLocationAtTop " = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXErrorsWarningsSmartGroup;
+                                        description = "Displays files with errors or warnings.";
+                                        globalID = 1C08E77C0454961000C914BD;
+                                        name = "Errors and Warnings";
+                                        preferences = {
+                                                fnmatch = "";
+                                                image = WarningsErrors;
+                                                recursive = 1;
+                                                regex = "";
+                                                root = "<PROJECT>";
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXFilenameSmartGroup;
+                                        description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+                                        globalID = 1CC0EA4004350EF90044410B;
+                                        name = "Implementation Files";
+                                        preferences = {
+                                                canSave = 1;
+                                                fnmatch = "";
+                                                image = SmartFolder;
+                                                isLeaf = 0;
+                                                recursive = 1;
+                                                regex = "?*\\.[mcMC]";
+                                                root = "<PROJECT>";
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXFilenameSmartGroup;
+                                        description = "This group displays Interface Builder NIB Files.";
+                                        globalID = 1CC0EA4004350EF90041110B;
+                                        name = "NIB Files";
+                                        preferences = {
+                                                canSave = 1;
+                                                fnmatch = "*.nib";
+                                                image = SmartFolder;
+                                                isLeaf = 0;
+                                                recursive = 1;
+                                                regex = "";
+                                                root = "<PROJECT>";
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = no;
+                                        absolutePathToBundle = "";
+                                        clz = PBXFindSmartGroup;
+                                        description = "Displays Find Results.";
+                                        globalID = 1C37FABC05509CD000000102;
+                                        name = "Find Results";
+                                        preferences = {
+                                                image = spyglass;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = no;
+                                        absolutePathToBundle = "";
+                                        clz = PBXBookmarksSmartGroup;
+                                        description = "Displays Project Bookmarks.";
+                                        globalID = 1C37FABC05539CD112110102;
+                                        name = Bookmarks;
+                                        preferences = {
+                                                image = Bookmarks;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = XCSCMSmartGroup;
+                                        description = "Displays files with interesting SCM status.";
+                                        globalID = E2644B35053B69B200211256;
+                                        name = SCM;
+                                        preferences = {
+                                                image = PBXRepository;
+                                                isLeaf = 0;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXSymbolsSmartGroup;
+                                        description = "Displays all symbols for the project.";
+                                        globalID = 1C37FABC04509CD000100104;
+                                        name = "Project Symbols";
+                                        preferences = {
+                                                image = ProjectSymbols;
+                                                isLeaf = 1;
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXFilenameSmartGroup;
+                                        description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+                                        globalID = PBXTemplateMarker;
+                                        name = "Simple Filter SmartGroup";
+                                        preferences = {
+                                                canSave = 1;
+                                                fnmatch = "*.nib";
+                                                image = SmartFolder;
+                                                isLeaf = 0;
+                                                recursive = 1;
+                                                regex = "";
+                                                root = "<PROJECT>";
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        absolutePathToBundle = "";
+                                        clz = PBXFilenameSmartGroup;
+                                        description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+                                        globalID = PBXTemplateMarker;
+                                        name = "Simple Regular Expression SmartGroup";
+                                        preferences = {
+                                                canSave = 1;
+                                                fnmatch = "";
+                                                image = SmartFolder;
+                                                isLeaf = 0;
+                                                recursive = 1;
+                                                regex = "?*\\.[mcMC]";
+                                                root = "<PROJECT>";
+                                        };
+                                },
+                                {
+                                        PBXTransientLocationAtTop = bottom;
+                                        clz = XDDesignSmartGroup;
+                                        description = "Displays Xdesign models";
+                                        globalID = 2E4A936305E6979E00701470;
+                                        name = Design;
+                                        preferences = {
+                                                image = Design;
+                                                isLeaf = 0;
+                                        };
+                                },
+                        );
                         PBXWorkspaceContents = (
                                 {
@@ -83 +259 @@
                                                 PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
                                                         Split0 = {
-                                                                bookmark = E1A087D20548746200594651;
+                                                                bookmark = E12B212E0548BF6E00CFF4E9;
                                                                 history = (
                                                                         E1375C530530898300FE8BF8,
-                                                                        E103506B05355596002A18D1,
                                                                         E11E9B8E0544EE7900045D4F,
                                                                         E11E9B8F0544EE7900045D4F,
@@ -92 +267 @@
                                                                         E1A087CE0548746200594651,
                                                                         E1A087CF0548746200594651,
-                                                                        E1A087D00548746200594651,
-                                                                );
-                                                                nextStack = (
-                                                                        E1A087D10548746200594651,
+                                                                        E103506C05355596002A18D1,
                                                                 );
                                                                 prevStack = (
                                                                         E1375C560530898300FE8BF8,
-                                                                        E103506C05355596002A18D1,
                                                                 );
                                                         };
@@ -124 +295 @@
                                         };
                                 },
-                                {
-                                        PBXProjectWorkspaceModule_StateKey_Rev36 = {
-                                                PBXProjectWorkspaceModule_EditorOpen = true;
-                                                PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
-                                                        Split0 = {
-                                                                bookmark = E1A087D40548746200594651;
-                                                                history = (
-                                                                        E1A087D30548746200594651,
-                                                                );
-                                                        };
-                                                        SplitCount = 1;
-                                                };
-                                                PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {600, 115}}";
-                                                PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 115}, {600, 186}}";
-                                                PBXProjectWorkspaceModule_OldSuperviewFrame = "{{0, 0}, {600, 301}}";
-                                                PBXProjectWorkspaceModule_SGTM = {
-                                                        PBXBottomSmartGroupGIDs = (
-                                                        );
-                                                        PBXTopSmartGroupGIDs = (
-                                                        );
-                                                };
-                                        };
-                                },
                         );
                         "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
@@ -208 +356 @@
                                         WindowFrame = "{{8, 70}, {775, 753}}";
                                 },
-                                {
-                                        Frame = "{{0, 0}, {600, 321}}";
-                                        PBXProjectWorkspaceModule_GeometryKey_Rev11 = {
-                                                GroupTreeCollapsed = yes;
-                                                PBXProjectWorkspaceModule_SGTM_Geometry = {
-                                                        _collapsingFrameDimension = 182;
-                                                        _indexOfCollapsedView = 0;
-                                                        _percentageOfCollapsedView = 0.3033333;
-                                                        sizes = (
-                                                                "{{0, 0}, {600, 301}}",
-                                                        );
-                                                };
-                                        };
-                                        WindowFrame = "{{523, 63}, {600, 383}}";
-                                },
                         );
                         "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
@@ -277 +410 @@
                                 WindowFrame = "{{723, 149}, {517, 249}}";
                         };
-                        PBXWorkspaceStateSaveDate = 88649579;
-                };
-                perUserProjectItems = {
-                        E103506B05355596002A18D1 = E103506B05355596002A18D1;
-                        E103506C05355596002A18D1 = E103506C05355596002A18D1;
-                        E11E9B8E0544EE7900045D4F = E11E9B8E0544EE7900045D4F;
-                        E11E9B8F0544EE7900045D4F = E11E9B8F0544EE7900045D4F;
-                        E1375C530530898300FE8BF8 = E1375C530530898300FE8BF8;
-                        E1375C560530898300FE8BF8 = E1375C560530898300FE8BF8;
-                        E1A087BB0548731500594651 = E1A087BB0548731500594651;
-                        E1A087CE0548746200594651 = E1A087CE0548746200594651;
-                        E1A087CF0548746200594651 = E1A087CF0548746200594651;
-                        E1A087D00548746200594651 = E1A087D00548746200594651;
-                        E1A087D10548746200594651 = E1A087D10548746200594651;
-                        E1A087D20548746200594651 = E1A087D20548746200594651;
-                        E1A087D30548746200594651 = E1A087D30548746200594651;
-                        E1A087D40548746200594651 = E1A087D40548746200594651;
+                        PBXWorkspaceStateSaveDate = 134264568;
                 };
                 sourceControlManager = E14C945E052A896100142529;
@@ -302 +419 @@
         08FB7796FE84155DC02AAC07 = {
                 uiCtxt = {
-                        sepNavIntBoundsRect = "{{0, 0}, {578, 13369}}";
-                        sepNavSelRange = "{3507, 26}";
-                        sepNavVisRect = "{{0, 996}, {578, 654}}";
-                        sepNavWindowFrame = "{{265, 76}, {725, 703}}";
+                        sepNavIntBoundsRect = "{{0, 0}, {740, 11507}}";
+                        sepNavSelRange = "{29214, 0}";
+                        sepNavVisRect = "{{0, 8530}, {740, 660}}";
+                        sepNavWindowFrame = "{{15, 43}, {755, 698}}";
                 };
         };
@@ -314 +431 @@
                 );
         };
-        E103506B05355596002A18D1 = {
-                fRef = E1375C5D0530898300FE8BF8;
-                isa = PBXTextBookmark;
-                name = "LSOpen.h: 241";
-                rLen = 0;
-                rLoc = 8490;
-                rType = 0;
-                vrLen = 1029;
-                vrLoc = 7546;
-        };
-        E103506C05355596002A18D1 = {
-                fRef = E1375C5D0530898300FE8BF8;
-                isa = PBXTextBookmark;
-                name = "LSOpen.h: 241";
-                rLen = 0;
-                rLoc = 8490;
-                rType = 0;
-                vrLen = 1029;
-                vrLoc = 7546;
-        };
-        E103508E0535B52C002A18D1 = {
-                isa = PBXFileReference;
-                name = CFString.h;
-                path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E11E9B8E0544EE7900045D4F = {
-                fRef = E11E9B950544EE9700045D4F;
-                isa = PBXTextBookmark;
-                name = "(null): 158";
-                rLen = 0;
-                rLoc = 8234;
-                rType = 0;
-                vrLen = 1977;
-                vrLoc = 6660;
-        };
-        E11E9B8F0544EE7900045D4F = {
-                fRef = E103508E0535B52C002A18D1;
-                isa = PBXTextBookmark;
-                name = "CFString.h: CFStringCreateWithCString";
-                rLen = 16;
-                rLoc = 6861;
-                rType = 0;
-                vrLen = 2215;
-                vrLoc = 5649;
-        };
-        E11E9B940544EE9700045D4F = {
-                expectedFileType = sourcecode.c.h;
-                isa = PBXFileReference;
-                name = CFURL.h;
-                path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFURL.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E11E9B950544EE9700045D4F = {
-                isa = PBXFileReference;
-                name = CFStringEncodingExt.h;
-                path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFStringEncodingExt.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E11E9B960544EE9700045D4F = {
-                expectedFileType = sourcecode.c.h;
-                isa = PBXFileReference;
-                name = LSOpen.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/LSOpen.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E1375C530530898300FE8BF8 = {
-                fRef = E1375C5C0530898300FE8BF8;
-                isa = PBXTextBookmark;
-                name = "(null): 1";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 688;
-                vrLoc = 0;
-        };
-        E1375C560530898300FE8BF8 = {
-                fRef = E1375C5B0530898300FE8BF8;
-                isa = PBXTextBookmark;
-                name = "(null): 1";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 688;
-                vrLoc = 0;
-        };
-        E1375C5B0530898300FE8BF8 = {
-                isa = PBXFileReference;
-                name = LaunchServices.h;
-                path = /Developer/SDKs/MacOSX10.2.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/LaunchServices.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E1375C5C0530898300FE8BF8 = {
-                isa = PBXFileReference;
-                name = LaunchServices.h;
-                path = /Developer/SDKs/MacOSX10.2.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/LaunchServices.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E1375C5D0530898300FE8BF8 = {
-                isa = PBXFileReference;
-                name = LSOpen.h;
-                path = /Developer/SDKs/MacOSX10.3.0.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/LSOpen.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
         E14C945E052A896100142529 = {
+                fallbackIsa = XCSourceControlManager;
+                isSCMEnabled = 1;
                 isa = PBXSourceControlManager;
                 scmConfiguration = {
                 };
-                scmType = scm.cvs;
+                scmType = scm.subversion;
         };
         E14C945F052A896100142529 = {
                 indexTemplatePath = "";
                 isa = PBXCodeSenseManager;
-                usesDefaults = 1;
+                usesDefaults = 0;
                 wantsCodeCompletion = 1;
-                wantsCodeCompletionAutoPopup = 0;
                 wantsCodeCompletionAutoSuggestions = 0;
                 wantsCodeCompletionCaseSensitivity = 1;
+                wantsCodeCompletionListAlways = 1;
                 wantsCodeCompletionOnlyMatchingItems = 1;
                 wantsCodeCompletionParametersIncluded = 1;
@@ -448 +456 @@
                 fileReference = 08FB7796FE84155DC02AAC07;
                 isa = PBXFileBreakpoint;
-                lineNumber = 674;
+                lineNumber = 708;
                 state = 1;
         };
@@ -463 +471 @@
                 name = "handle URL/file arguments";
                 rLen = 0;
-                rLoc = 17962;
+                rLoc = 18094;
                 rType = 0;
                 vrLen = 1773;
                 vrLoc = 14523;
-        };
-        E1A087BB0548731500594651 = {
-                fRef = E11E9B960544EE9700045D4F;
-                isa = PBXTextBookmark;
-                name = "LSOpen.h: LSLaunchFSRefSpec";
-                rLen = 27;
-                rLoc = 2548;
-                rType = 0;
-                vrLen = 2176;
-                vrLoc = 1426;
-        };
-        E1A087C80548731D00594651 = {
-                expectedFileType = sourcecode.c.c;
-                isa = PBXFileReference;
-                name = main.c;
-                path = /Volumes/Ti/Users/nicholas/Documents/Development/launch/launch/main.c;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E1A087CE0548746200594651 = {
-                fRef = E11E9B940544EE9700045D4F;
-                isa = PBXTextBookmark;
-                name = "CFURL.h: CFURLGetFSRef";
-                rLen = 58;
-                rLoc = 18538;
-                rType = 0;
-                vrLen = 1812;
-                vrLoc = 16881;
-        };
-        E1A087CF0548746200594651 = {
-                fRef = E1A087D50548746200594651;
-                isa = PBXTextBookmark;
-                name = "(null): 5155";
-                rLen = 0;
-                rLoc = 175675;
-                rType = 0;
-                vrLen = 2070;
-                vrLoc = 174398;
-        };
-        E1A087D00548746200594651 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: 805";
-                rLen = 5;
-                rLoc = 33144;
-                rType = 0;
-                vrLen = 1438;
-                vrLoc = 31911;
-        };
-        E1A087D10548746200594651 = {
-                fRef = E1A087D60548746200594651;
-                isa = PBXTextBookmark;
-                name = "(null): 5155";
-                rLen = 0;
-                rLoc = 175675;
-                rType = 0;
-                vrLen = 2070;
-                vrLoc = 174398;
-        };
-        E1A087D20548746200594651 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: 805";
-                rLen = 0;
-                rLoc = 33157;
-                rType = 0;
-                vrLen = 1436;
-                vrLoc = 31909;
-        };
-        E1A087D30548746200594651 = {
-                fRef = E1A087C80548731D00594651;
-                isa = PBXTextBookmark;
-                rLen = 1;
-                rLoc = 808;
-                rType = 1;
-        };
-        E1A087D40548746200594651 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: 809";
-                rLen = 0;
-                rLoc = 33280;
-                rType = 0;
-                vrLen = 325;
-                vrLoc = 33020;
-        };
-        E1A087D50548746200594651 = {
-                isa = PBXFileReference;
-                name = Files.h;
-                path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/Files.h;
-                refType = 0;
-                sourceTree = "<absolute>";
-        };
-        E1A087D60548746200594651 = {
-                isa = PBXFileReference;
-                name = Files.h;
-                path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/Files.h;
-                refType = 0;
-                sourceTree = "<absolute>";
         };
         F561F49E0139D79101AEEDB1 = {
@@ -581 +490 @@
                 configStateDict = {
                 };
+                cppStopOnCatchEnabled = 0;
+                cppStopOnThrowEnabled = 0;
+                customDataFormattersEnabled = 1;
                 debuggerPlugin = GDBDebugging;
+                disassemblyDisplayState = 0;
                 dylibVariantSuffix = "";
                 enableDebugStr = 1;
@@ -587 +500 @@
                 );
                 isa = PBXExecutable;
+                libgmallocEnabled = 0;
                 name = launch;
                 shlibInfoDictList = (
@@ -595 +509 @@
         F5C0CA9501B5740C01AEEDB1 = {
                 uiCtxt = {
-                        sepNavIntBoundsRect = "{{0, 0}, {709, 3779}}";
-                        sepNavSelRange = "{7907, 0}";
-                        sepNavVisRect = "{{0, 3118}, {709, 443}}";
-                        sepNavWindowFrame = "{{38, 304}, {750, 502}}";
+                        sepNavIntBoundsRect = "{{0, 0}, {735, 3479}}";
+                        sepNavSelRange = "{8123, 0}";
+                        sepNavVisRect = "{{0, 2798}, {735, 464}}";
+                        sepNavWindowFrame = "{{130, 134}, {750, 502}}";
                 };
         };

trunk/launch/launch/launch.pbproj/project.pbxproj

@@ -7 +7 @@
         objects = {
                 014CEA490018CE3211CA2923 = {
-                        buildRules = (
-                        );
                         buildSettings = {
                                 COPY_PHASE_STRIP = NO;
@@ -22 +20 @@
                 };
                 014CEA4A0018CE3211CA2923 = {
-                        buildRules = (
-                        );
                         buildSettings = {
                                 COPY_PHASE_STRIP = YES;
@@ -43 +39 @@
 //034
                 034768E2FF38A6DC11DB9C8B = {
-                        expectedFileType = "compiled.mach-o.executable";
-                        fallbackIsa = PBXFileReference;
-                        isa = PBXExecutableFileReference;
+                        explicitFileType = "compiled.mach-o.executable";
+                        isa = PBXFileReference;
                         path = launch;
                         refType = 3;
@@ -62 +57 @@
                 08FB7793FE84155DC02AAC07 = {
                         buildSettings = {
+                                MACOSX_DEPLOYMENT_TARGET = 10.2;
+                                SDKROOT = /Developer/SDKs/MacOSX10.2.8.sdk;
                         };
                         buildStyles = (
@@ -98 +95 @@
                 };
                 08FB7796FE84155DC02AAC07 = {
-                        expectedFileType = sourcecode.c.c;
                         fileEncoding = 30;
                         isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.c.c;
                         path = main.c;
                         refType = 4;
                         sourceTree = "<group>";
+                        tabWidth = 8;
                 };
                 08FB779DFE84155DC02AAC07 = {
@@ -197 +195 @@
 //094
                 09AB6884FE841BABC02AAC07 = {
-                        expectedFileType = wrapper.framework;
-                        fallbackIsa = PBXFileReference;
-                        isa = PBXFrameworkReference;
+                        isa = PBXFileReference;
+                        lastKnownFileType = wrapper.framework;
                         name = CoreFoundation.framework;
                         path = /System/Library/Frameworks/CoreFoundation.framework;
@@ -241 +238 @@
 //F54
                 F561F49F0139D7DD01AEEDB1 = {
-                        expectedFileType = wrapper.framework;
-                        fallbackIsa = PBXFileReference;
-                        isa = PBXFrameworkReference;
+                        isa = PBXFileReference;
+                        lastKnownFileType = wrapper.framework;
                         name = ApplicationServices.framework;
                         path = /System/Library/Frameworks/ApplicationServices.framework;
@@ -256 +252 @@
                 };
                 F574340B01B8A47B01AEEDB1 = {
-                        expectedFileType = text;
                         fileEncoding = 30;
                         isa = PBXFileReference;
+                        lastKnownFileType = text;
                         path = VERSION;
                         refType = 4;
@@ -264 +260 @@
                 };
                 F579CF4B019A1C6D01AEEDB1 = {
-                        expectedFileType = wrapper.framework;
-                        fallbackIsa = PBXFileReference;
-                        isa = PBXFrameworkReference;
+                        isa = PBXFileReference;
+                        lastKnownFileType = wrapper.framework;
                         name = Security.framework;
                         path = /System/Library/Frameworks/Security.framework;
@@ -279 +274 @@
                 };
                 F5C0CA9501B5740C01AEEDB1 = {
-                        expectedFileType = text;
                         fileEncoding = 30;
                         isa = PBXFileReference;
+                        lastKnownFileType = text;
                         path = README;
                         refType = 4;
@@ -287 +282 @@
                 };
                 F5E819BF0198DFF701AEEDB1 = {
-                        expectedFileType = wrapper.framework;
-                        fallbackIsa = PBXFileReference;
-                        isa = PBXFrameworkReference;
+                        isa = PBXFileReference;
+                        lastKnownFileType = wrapper.framework;
                         name = Carbon.framework;
                         path = /System/Library/Frameworks/Carbon.framework;

trunk/launch/launch/main.c

@@ -3 +3 @@
  Nicholas Riley <launchsw@sabi.net>
 
- Copyright (c) 2001-03, Nicholas Riley
+ Copyright (c) 2001-05, Nicholas Riley
  All rights reserved.
 
@@ -51 +51 @@
 const char *APP_NAME;
 
-#define VERSION "1.0"
+#define VERSION "1.0.1"
 
 #define STRBUF_LEN 1024
@@ -59 +59 @@
     OSType creator;
     CFStringRef bundleID, name;
+    Boolean forceURLs;
     enum { ACTION_FIND, ACTION_FIND_ITEMS,
            ACTION_OPEN, ACTION_OPEN_ITEMS, 
@@ -64 +65 @@
 } OPTS = 
 {
-    kLSUnknownCreator, NULL, NULL,
+    kLSUnknownCreator, NULL, NULL, false,
     ACTION_DEFAULT
 };
@@ -87 +88 @@
     { -10827, "application package contains no executable, or an unusable executable" }, /* kLSNoExecutableErr, not defined in 10.2 */
     { -10828, "Classic environment required but not available" }, /* kLSNoClassicEnvironmentErr, not defined in 10.2 */
+    { -10829, "unable to launch multiple instances of application" }, /* kLSMultipleSessionsNotSupportedErr, not defined in 10.2 */
 #ifndef BROKEN_AUTHORIZATION
     // Security framework errors
@@ -97 +99 @@
     { icInternalErr, "internal Internet Config error" },
     // Misc. errors
+    { nsvErr, "the volume cannot be found (buggy filesystem?)" },
     { procNotFound, "unable to connect to system service.\nAre you logged in?" },
     { kCGErrorIllegalArgument, "window server error.\nAre you logged in?" },
@@ -105 +108 @@
 
 void usage() {
-    fprintf(stderr, "usage: %s [-npswbmhCX] [-c creator] [-i bundleID] [-u URL] [-a name] [item ...] [-]\n"
-                    "   or: %s [-npflswbmhCX] item ...\n", APP_NAME, APP_NAME);
+    fprintf(stderr, "usage: %s [-npswbmhCXU] [-c creator] [-i bundleID] [-u URL] [-a name] [item ...] [-]\n"
+                    "   or: %s [-npflswbmhCXU] item ...\n", APP_NAME, APP_NAME);
     fprintf(stderr,
         "  -n            print matching paths/URLs instead of opening them\n"
@@ -121 +124 @@
         "  -C            force CFM/PEF Carbon application to launch in Classic\n"
         "  -X            don't start Classic for this app if Classic isn't running\n"
+        "  -U            interpret items as URLs, even if same-named files exist\n"
         "  -c creator    match application by four-character creator code ('ToyS')\n"
         "  -i bundle ID  match application by bundle identifier (com.apple.scripteditor)\n"
@@ -127 +131 @@
         "'document' may be a file, folder, or disk - whatever the application can open.\n"
         "'item' may be a file, folder, disk, or URL.\n\n");
-    fprintf(stderr, "launch "VERSION" (c) 2001-03 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
+    fprintf(stderr, "launch "VERSION" (c) 2001-05 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
                     "Please send bugs, suggestions, etc. to <launchsw@sabi.net>.\n");
 
@@ -341 +345 @@
     if (argc == 1) usage();
     
-    while ( (ch = getopt(argc, argv, "npflswbmhCXc:i:u:a:")) != -1) {
+    while ( (ch = getopt(argc, argv, "npflswbmhCXUc:i:u:a:")) != -1) {
         switch (ch) {
         case 'n':
@@ -384 +388 @@
         case 'C': LSPEC.launchFlags |= kLSLaunchInClassic; break;  // force Classic
         case 'X': LSPEC.launchFlags ^= kLSLaunchStartClassic; break;// don't start Classic for app
+        case 'U': OPTS.forceURLs = true; break;
         case 'c':
             if (strlen(optarg) != 4) errexit("creator (argument of -c) must be four characters long");
@@ -390 +395 @@
             break;
         case 'i':
-            OPTS.bundleID = CFStringCreateWithCString(NULL, optarg, CFStringGetSystemEncoding());
+            OPTS.bundleID = CFStringCreateWithCString(NULL, optarg, kCFStringEncodingUTF8);
             appSpecified = true;
             break;
         case 'a':
-            OPTS.name = CFStringCreateWithCString(NULL, optarg, CFStringGetSystemEncoding());
+            OPTS.name = CFStringCreateWithCString(NULL, optarg, kCFStringEncodingUTF8);
             appSpecified = true;
             break;
         case 'u':
-            { CFStringRef str = CFStringCreateWithCString(NULL, optarg, CFStringGetSystemEncoding());
+            { CFStringRef str = CFStringCreateWithCString(NULL, optarg, kCFStringEncodingUTF8);
               LSPEC.appURL = CFURLCreateWithString(NULL, str, NULL);
               if (str != NULL) CFRelease(str);
@@ -471 +476 @@
                 LSPEC.launchFlags ^= kLSLaunchAsync;
             } else {
-                argStr = CFStringCreateWithCString(NULL, argv[i], CFStringGetSystemEncoding());
-                // check for URLs
-                itemURL = normalizedURLFromString(argStr);
-                if (itemURL == NULL && OPTS.action == ACTION_LAUNCH_URLS) {
-                    // check for email addresses
-                    if (strchr(argv[i], '@') != NULL && strchr(argv[i], '/') == NULL)
-                        itemURL = normalizedURLFromPrefixSlack(CFSTR("mailto:"), argStr);
-                    // check for "slack" URLs
-                    if (itemURL == NULL && strchr(argv[i], '.') != NULL && strchr(argv[i], '/') != argv[i])
-                        itemURL = normalizedURLFromPrefixSlack(CFSTR("http://"), argStr);
-                }
+                struct stat stat_buf;
+                if (!OPTS.forceURLs && stat(argv[i], &stat_buf) == 0) {
+                    itemURL = NULL;
+                } else {
+                    argStr = CFStringCreateWithCString(NULL, argv[i], kCFStringEncodingUTF8);
+                    // check for URLs
+                    itemURL = normalizedURLFromString(argStr);
+                    if (itemURL == NULL && OPTS.action == ACTION_LAUNCH_URLS) {
+                        // check for email addresses
+                        if (strchr(argv[i], '@') != NULL && strchr(argv[i], '/') == NULL)
+                            itemURL = normalizedURLFromPrefixSlack(CFSTR("mailto:"), argStr);
+                        // check for "slack" URLs
+                        if (itemURL == NULL && strchr(argv[i], '.') != NULL && strchr(argv[i], '/') != argv[i])
+                            itemURL = normalizedURLFromPrefixSlack(CFSTR("http://"), argStr);
+                    }
+                }
                 if (itemURL == NULL) {
                     // check for file paths
-                    itemURL = CFURLCreateWithFileSystemPath(NULL, argStr, kCFURLPOSIXPathStyle, false);
+                    itemURL = CFURLCreateFromFileSystemRepresentation(NULL, argv[i], strlen(argv[i]), false);
                     err = LSCopyItemInfoForURL(itemURL, kLSRequestExtensionFlagsOnly, &docInfo);
                     if (err != noErr) osstatusexit(err, "unable to locate '%s'", argv[i]);
@@ -496 +506 @@
 }
 
+Boolean stringFromURLIsRemote(CFURLRef url, char *strBuffer) {
+    CFStringRef scheme = CFURLCopyScheme(url);
+    Boolean isRemote = !CFEqual(scheme, CFSTR("file"));
+    CFRelease(scheme);
+    
+    strBuffer[0] = '\0';
+    if (isRemote) {
+        CFStringRef urlString = CFURLGetString(url);
+        CFStringGetCString(urlString, strBuffer, STRBUF_LEN, kCFStringEncodingUTF8);
+        CFRelease(urlString);
+    } else {
+        if (CFURLGetFileSystemRepresentation(url, false, strBuffer, STRBUF_LEN)) {
+            if (strBuffer[0] == '.' && strBuffer[1] == '/') {
+                // remove the leading "./"
+                char *fromBufPtr = strBuffer + 2;
+                while (true) {
+                    *strBuffer = *fromBufPtr;
+                    if (*fromBufPtr == '\0') break;
+                    strBuffer++;
+                    fromBufPtr++;
+                }
+            }
+        } else {
+            strcpy(strBuffer, "[can't get path: CFURLGetFileSystemRepresentation failed]");
+        }
+    }
+    return isRemote;
+}
+
 void printPathFromURL(CFURLRef url, FILE *stream) {
-    CFStringRef scheme, pathOrURL;
     static char strBuffer[STRBUF_LEN];
-    
     check(url != NULL && stream != NULL);
-
-    scheme = CFURLCopyScheme(url);
-    
-    if (CFEqual(scheme, CFSTR("file")))
-        pathOrURL = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
-    else
-        pathOrURL = CFURLGetString(url);
-
-    strBuffer[0] = '\0';
-    CFStringGetCString(pathOrURL, strBuffer, STRBUF_LEN, CFStringGetSystemEncoding()); // XXX buffer size issues?
+    stringFromURLIsRemote(url, strBuffer);
     fprintf(stream, "%s\n", strBuffer);
-    CFRelease(scheme);
-    CFRelease(pathOrURL);
 }
 
@@ -582 +608 @@
 
     if (fscInfo.nodeFlags & kFSNodeIsDirectoryMask) {
-        printf("\tcontents: %lu item%s\n", fscInfo.valence, fscInfo.valence != 1 ? "s" : "");
+        printf("\tcontents: ");
+        switch (fscInfo.valence) {
+        case 0: printf("zero items\n"); break;
+        case 1: printf("1 item\n"); break;
+        default: printf("%lu items\n", fscInfo.valence);
+        }
     } else {
         printSizes("data fork size", fscInfo.dataLogicalSize, fscInfo.dataPhysicalSize, true);
@@ -605 +636 @@
 }
 
+const char *utf8StringFromCFStringRef(CFStringRef cfStr) {
+    static char tmpBuffer[STRBUF_LEN];
+    CFStringGetCString(cfStr, tmpBuffer, STRBUF_LEN, kCFStringEncodingUTF8);
+    return tmpBuffer;
+}
+
+const char *utf8StringFromOSType(OSType osType) {
+    CFStringRef typeStr = CFStringCreateWithBytes(NULL, (const char *)&osType, 4, CFStringGetSystemEncoding(), false);
+    if (typeStr == NULL) {
+        // punt to displaying verbatim
+        static char tmpBuffer[4];
+        tmpBuffer[4] = '\0';
+        strncpy(tmpBuffer, (const char *)&osType, 4);
+        return tmpBuffer;
+    }
+    const char *buffer = utf8StringFromCFStringRef(typeStr);
+    CFRelease(typeStr);
+    return buffer;
+}
+
 // 'context' is to match prototype for CFArrayApplierFunction, it's unused
 void printInfoFromURL(CFURLRef url, void *context) {
-    CFStringRef scheme, pathOrURL, kind;
-    Boolean isRemote;
-    static char strBuffer[STRBUF_LEN], tmpBuffer[STRBUF_LEN];
+    CFStringRef kind;
+    static char strBuffer[STRBUF_LEN];
     
     check(url != NULL && context == NULL);
 
-    scheme = CFURLCopyScheme(url);
-    
-    isRemote = !CFEqual(scheme, CFSTR("file"));
-    if (isRemote)
-        pathOrURL = CFURLGetString(url);
-    else
-        pathOrURL = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
-
-    strBuffer[0] = '\0';
-    CFStringGetCString(pathOrURL, strBuffer, STRBUF_LEN, CFStringGetSystemEncoding()); // XXX buffer size issues?
-    if (isRemote)
+    if (stringFromURLIsRemote(url, strBuffer))
         printf("<%s>: URL\n", strBuffer);
     else {
         static LSItemInfoRecord info;
+        CFStringRef version = NULL;
+        UInt32 intVersion = 0;
         OSStatus err = LSCopyItemInfoForURL(url, kLSRequestAllInfo, &info);
         if (err != noErr) osstatusexit(err, "unable to get information about '%s'", strBuffer);
@@ -655 +697 @@
         printf("\n");
         if (!(info.flags & kLSItemInfoIsContainer) || info.flags & kLSItemInfoIsPackage) {
-            tmpBuffer[4] = '\0';
-            strncpy(tmpBuffer, (char *)&info.filetype, 4); printf("\ttype: '%s'", tmpBuffer);
-            strncpy(tmpBuffer, (char *)&info.creator, 4); printf("\tcreator: '%s'\n", tmpBuffer);
+            printf("\ttype: '%s'", utf8StringFromOSType(info.filetype));
+            printf("\tcreator: '%s'\n", utf8StringFromOSType(info.creator));
         }
         if (info.flags & kLSItemInfoIsPackage || info.flags & kLSItemInfoIsApplication) {
@@ -663 +704 @@
             CFBundleRef bundle = CFBundleCreate(NULL, url);
             CFStringRef bundleID = NULL;
-            CFStringRef appVersion = NULL;
-            UInt32 intVersion = 0;
             if (bundle == NULL && (info.flags & kLSItemInfoIsApplication)) {
                 FSRef fsr;
@@ -683 +722 @@
                             CFPropertyListRef infoPlist = CFPropertyListCreateFromXMLData(NULL, plstData, kCFPropertyListImmutable, &error);
                             if (plstData != NULL) {
-                                CFRelease(plstData);
-                                plstData = NULL;
+                                CFRelease(plstData);
+                                plstData = NULL;
+                            } else {
+                                // this function should handle the 'plst' 0 case too, but it doesn't provide error messages; however, it handles the case of an unbundled Mach-O binary, so it is useful as a fallback
+                                infoPlist = CFBundleCopyInfoDictionaryForURL(url);
                             }
                             if (infoPlist == NULL) {
-                                CFStringGetCString(error, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
-                                printf("\t['plst' 0 resource invalid: %s]\n", tmpBuffer);
+                                printf("\t['plst' 0 resource invalid: %s]\n", utf8StringFromCFStringRef(error));
                                 CFRelease(error);
                             } else {
@@ -694 +735 @@
                                 bundleID = CFDictionaryGetValue(infoPlist, kCFBundleIdentifierKey);
                                 if (bundleID != NULL) CFRetain(bundleID);
-                                appVersion = CFDictionaryGetValue(infoPlist, CFSTR("CFBundleShortVersionString"));
-                                if (appVersion == NULL)
-                                    appVersion = CFDictionaryGetValue(infoPlist, kCFBundleVersionKey);
-                                if (appVersion != NULL) CFRetain(appVersion);
+                                version = CFDictionaryGetValue(infoPlist, CFSTR("CFBundleShortVersionString"));
+                                if (version == NULL)
+                                    version = CFDictionaryGetValue(infoPlist, kCFBundleVersionKey);
+                                if (version != NULL) CFRetain(version);
                                 CFRelease(infoPlist);
                             }
@@ -705 +746 @@
                             if (err != noErr && err != resNotFound) osstatusexit(err, "unable to read 'vers' 1 resource");
                         } else {
-                            if (appVersion == NULL) { // prefer 'plst' version
-                                appVersion = CFStringCreateWithPascalString(NULL, vers[0]->shortVersion, CFStringGetSystemEncoding()); // XXX use country code instead?
+                            if (version == NULL) { // prefer 'plst' version
+                                version = CFStringCreateWithPascalString(NULL, vers[0]->shortVersion, CFStringGetSystemEncoding()); // XXX use country code instead?
                             }
                             intVersion = ((NumVersionVariant)vers[0]->numericVersion).whole;
@@ -717 +758 @@
                 if (bundleID != NULL) CFRetain(bundleID);
                 // prefer a short version string, e.g. "1.0 Beta" instead of "51" for Safari
-                appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
-                if (appVersion == NULL)
-                    appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
-                if (appVersion != NULL) {
-                    CFRetain(appVersion);
+                version = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
+                if (version == NULL)
+                    version = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
+                if (version != NULL) {
+                    CFRetain(version);
                     intVersion = CFBundleGetVersionNumber(bundle);
                 }
@@ -727 +768 @@
             }
             if (bundleID != NULL) {
-                CFStringGetCString(bundleID, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
-                printf("\tbundle ID: %s\n", tmpBuffer);
+                printf("\tbundle ID: %s\n", utf8StringFromCFStringRef(bundleID));
                 CFRelease(bundleID);
             }
-            if (appVersion != NULL) {
-                CFStringGetCString(appVersion, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
-                printf("\tversion: %s", tmpBuffer);
-                if (intVersion != 0) printf(" [0x%lx = %lu]", intVersion, intVersion);
-                putchar('\n');
-                CFRelease(appVersion);
-            }
-        }
-        
+        } else {
+            // try to get a version if we can, but don't complain if we can't
+            FSRef fsr;
+            if (CFURLGetFSRef(url, &fsr)) {
+                SInt16 resFork = FSOpenResFile(&fsr, fsRdPerm);
+                if (ResError() == noErr) {
+                    VersRecHndl vers = (VersRecHndl)Get1Resource('vers', 1);
+                    if (ResError() == noErr && vers != NULL) {
+                        version = CFStringCreateWithPascalString(NULL, vers[0]->shortVersion, CFStringGetSystemEncoding()); // XXX use country code instead?
+                        intVersion = ((NumVersionVariant)vers[0]->numericVersion).whole;
+                    }
+                }
+                CloseResFile(resFork);
+            }
+        }
+        
+        if (version != NULL) {
+            printf("\tversion: %s", utf8StringFromCFStringRef(version));
+            if (intVersion != 0) printf(" [0x%lx = %lu]", intVersion, intVersion);
+            putchar('\n');
+            CFRelease(version);
+        }
+
         // kind string
         err = LSCopyKindStringForURL(url, &kind);
         if (err != noErr) osstatusexit(err, "unable to get kind of '%s'", strBuffer);
-        CFStringGetCString(kind, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
-        printf("\tkind: %s\n", tmpBuffer);
+        printf("\tkind: %s\n", utf8StringFromCFStringRef(kind));
         CFRelease(kind);
         printMoreInfoFromURL(url);
     }
-    CFRelease(scheme);
-    CFRelease(pathOrURL);
 }
 
@@ -760 +811 @@
 
     strBuffer[0] = '\0';
-    CFStringGetCString(urlStr, strBuffer, STRBUF_LEN, CFStringGetSystemEncoding()); // XXX buffer size issues?
+    CFStringGetCString(urlStr, strBuffer, STRBUF_LEN, CFStringGetSystemEncoding()); // XXX no idea what encoding ICLaunchURL is supposed to take; leave as is for now
     strStart = 0;
     strEnd = strlen(strBuffer);

trunk/launch/package-launch.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/zsh
 
 set -x -v
@@ -5 +5 @@
 cd launch && \
 find . -name \*~ -exec rm '{}' \; && \
-xcodebuild && \
+xcodebuild -buildstyle Deployment && \
 SetFile -c 'R*ch' -t 'TEXT' README VERSION launch.1 && \
 strip build/launch && \
 sudo /usr/bin/install -c build/launch /usr/local/bin && \
 sudo /usr/bin/install -c launch.1 /usr/local/man/man1 && \
+chmod 755 build/launch && \
+chmod 644 launch.1 && \
 rm -rf build/launch.build build/intermediates build/.gdb_history && \
 VERSION=`cat VERSION` TARBALL="launch-$VERSION.tar.gz" && \
@@ -16 +18 @@
 rm -f launch-$VERSION $TARBALL $DMG && \
 ln -s launch launch-$VERSION && \
-tar --exclude=.DS_Store --exclude=.svn --exclude=.gdb_history -zchf launch-$VERSION.tar.gz launch-$VERSION && \
+tar --owner=root --group=wheel --exclude=.DS_Store --exclude=.svn --exclude=.gdb_history -zchf launch-$VERSION.tar.gz launch-$VERSION && \
 #hdiutil create $DMG -megabytes 5 -ov -type UDIF && \
 #DISK=`hdid $DMG | sed -ne ' /Apple_partition_scheme/ s|^/dev/\([^ ]*\).*$|\1|p'` && \