Changeset 156 for trunk/appswitch

Timestamp:

04/19/04 02:40:59 (21 years ago)

Author:

Nicholas Riley

Message:

appswitch.1: Updated for appswitch 1.0.1.

appswitch.xcode: Converted to Xcode project from PBX project; still
using legacy target for now.

main.c: Updated copyright date. Fixed memory leak and bogus return
value in bundleIdentifierForApplication. Fixed a caller to properly
release then bundle identifier when it's finished with it.

README: Updated for appswitch 1.0.1. Summarize changes.

Location:

trunk/appswitch/appswitch

Files:

• README (modified) (4 diffs)
• appswitch.1 (modified) (2 diffs)
• appswitch.xcode (moved) (moved from trunk/appswitch/appswitch/appswitch.pbproj )
• appswitch.xcode/nicholas.pbxuser (modified) (3 diffs)
• appswitch.xcode/project.pbxproj (modified) (13 diffs)
• main.c (modified) (3 diffs)

trunk/appswitch/appswitch/README

@@ -1 @@
-appswitch 1.0 [19 February 2003]
-=============
+appswitch 1.0.1 [19 April 2004]
+===============
 
 A command-line interface to the Mac OS X process manager.
@@ -37 +37 @@
 Uninstallation:
 
-% sudo rm -f /usr/local/bin/appswitch
+% sudo rm -f /usr/local/bin/appswitch /usr/local/man/man1/appswitch.1
 
 COMPILATION
@@ -44 +44 @@
 A Project Builder project, 'appswitch.pbproj', is included.  A
 precompiled binary is also provided.  'appswitch' was developed and
-tested under Mac OS 10.2.4 with the December 2002 Developer Tools,
+tested under Mac OS 10.3.3 with the April 2004 Developer Tools,
 and does not require any additional software to build.
 
@@ -73 +73 @@
 ---------------
 
+1.0.1 - 19 April 2004
+- fixed crash matching applications with no bundle identifier
 1.0   - 19 February 2003
  - added description of -q delay bug (no workaround)

trunk/appswitch/appswitch/appswitch.1

@@ -1 @@
-.Dd Wed Feb 19 2003      \" DATE 
+.Dd Mon Apr 19 2004      \" DATE 
 .Dt APPSWITCH 1 LOCAL    \" Program name and manual section number 
-.Os appswitch 1.0
+.Os appswitch 1.0.1
 .Sh NAME
 .Nm appswitch
-.Nd switch, hide, show, kill or list Mac OS X applications
+.Nd switch, hide, show, quit, kill or list Mac OS X applications
 .Sh SYNOPSIS
 .Nm appswitch
@@ -161 +161 @@
 The
 .Fl q
-option is very slow on Mac OS X 10.2.4 and earlier; this is an
-acknowledged bug in AECreateAppleEvent with no known workaround. Chris
-Espinosa from Apple has stated that they plan to fix it in a future
-release.
+option is very slow on Mac OS X 10.2.8 and earlier; this is an
+acknowledged bug in AECreateAppleEvent with no known workaround.
+The bug is fixed in Mac OS X 10.3.
 .Sh AUTHOR
 .An "Nicholas Riley" Aq appswitch@sabi.net
-.\" .Sh HISTORY           \" Document history if command behaves in a unique manner 
-
+.\" .Sh HISTORY           \" Document history if command behaves in a unique manner

trunk/appswitch/appswitch/appswitch.xcode/nicholas.pbxuser

@@ -9 +9 @@
                 );
                 breakpoints = (
-                );
+                        E18A0A3006336368008DC67C,
+                        E18A0A39063363B8008DC67C,
+                );
+                codeSenseManager = E18A0A2A063362FF008DC67C;
                 executables = (
                         E1A0BD2C03EFAD1C00050001,
                 );
                 perUserDictionary = {
-                        PBXPerProjectTemplateStateSaveDate = 67398120;
+                        PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
+                                PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+                                PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
+                                PBXFileTableDataSourceColumnWidthsKey = (
+                                        22,
+                                        525.7974,
+                                );
+                                PBXFileTableDataSourceColumnsKey = (
+                                        PBXExecutablesDataSource_ActiveFlagID,
+                                        PBXExecutablesDataSource_NameID,
+                                );
+                        };
+                        PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+                                PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+                                PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+                                PBXFileTableDataSourceColumnWidthsKey = (
+                                        20,
+                                        321,
+                                        20,
+                                        61,
+                                        43,
+                                        43,
+                                        20,
+                                );
+                                PBXFileTableDataSourceColumnsKey = (
+                                        PBXFileDataSource_FiletypeID,
+                                        PBXFileDataSource_Filename_ColumnID,
+                                        PBXFileDataSource_Built_ColumnID,
+                                        PBXFileDataSource_ObjectSize_ColumnID,
+                                        PBXFileDataSource_Errors_ColumnID,
+                                        PBXFileDataSource_Warnings_ColumnID,
+                                        PBXFileDataSource_Target_ColumnID,
+                                );
+                        };
+                        PBXPerProjectTemplateStateSaveDate = 104034524;
+                        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>";
+                                        };
+                                },
+                        );
                         PBXWorkspaceContents = (
                                 {
-                                        LeftSlideOut = {
-                                                Split0 = {
-                                                        Split0 = {
-                                                                NavContent0 = {
-                                                                        bookmark = E1B46F540404978A00050002;
+                                        PBXProjectWorkspaceModule_StateKey_Rev39 = {
+                                                PBXProjectWorkspaceModule_DEGV_Geometry = {
+                                                        _collapsingFrameDimension = 0;
+                                                        _indexOfCollapsedView = 0;
+                                                        _percentageOfCollapsedView = 0;
+                                                        isCollapsed = yes;
+                                                        sizes = (
+                                                                "{{0, 0}, {571, 118}}",
+                                                                "{{0, 118}, {571, 547}}",
+                                                        );
+                                                };
+                                                PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+                                                        BoundsStr = "{{0, 0}, {556, 101}}";
+                                                        Rows = (
+                                                                0,
+                                                        );
+                                                        VisibleRectStr = "{{0, 0}, {556, 101}}";
+                                                };
+                                                PBXProjectWorkspaceModule_EditorOpen = true;
+                                                PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+                                                        PBXSplitModuleInNavigatorKey = {
+                                                                Split0 = {
+                                                                        bookmark = E1737411063370F0002A81F1;
                                                                         history = (
-                                                                                E16C83D103F83AD700050002,
-                                                                                E16C83D203F83AD700050002,
-                                                                                E16C83D303F83AD700050002,
-                                                                                E16C83D403F83AD700050002,
-                                                                                E16C83D503F83AD700050002,
-                                                                                E16C83D603F83AD700050002,
-                                                                                E16C83D703F83AD700050002,
-                                                                                E16C83D803F83AD700050002,
-                                                                                E16C83D903F83AD700050002,
-                                                                                E16C83DA03F83AD700050002,
-                                                                                E16C83DB03F83AD700050002,
-                                                                                E16C83DD03F83AD700050002,
-                                                                                E16C840303FB5E7100050002,
-                                                                                E16C842A03FB74A500050002,
-                                                                                E1B46F500404978A00050002,
-                                                                                E1B46F510404978A00050002,
-                                                                                E16C83DE03F83AD700050002,
+                                                                                E18A0A500633657C008DC67C,
+                                                                                E18A0A5B0633660A008DC67C,
+                                                                                E18A0A6B06336B3F008DC67C,
+                                                                                E18A0A6F06336B56008DC67C,
+                                                                                E173740F063370F0002A81F1,
+                                                                                E18A0A3A06336491008DC67C,
                                                                         );
                                                                         prevStack = (
-                                                                                E16C83E103F83AD700050002,
-                                                                                E16C83E203F83AD700050002,
-                                                                                E16C83E303F83AD700050002,
-                                                                                E16C83E403F83AD700050002,
-                                                                                E16C83E503F83AD700050002,
-                                                                                E16C83E603F83AD700050002,
-                                                                                E16C83E703F83AD700050002,
-                                                                                E16C83E803F83AD700050002,
-                                                                                E16C83E903F83AD700050002,
-                                                                                E16C83EA03F83AD700050002,
-                                                                                E16C83EB03F83AD700050002,
-                                                                                E16C83EC03F83AD700050002,
-                                                                                E1B46F520404978A00050002,
-                                                                                E1B46F530404978A00050002,
+                                                                                E18A0A3C06336491008DC67C,
+                                                                                E18A0A6306336B3C008DC67C,
+                                                                                E18A0A6806336B3E008DC67C,
+                                                                                E18A0A6C06336B3F008DC67C,
+                                                                                E1737410063370F0002A81F1,
                                                                         );
                                                                 };
-                                                                NavCount = 1;
-                                                                NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {746, 633}}";
-                                                                        NavBarVisible = YES;
-                                                                };
-                                                                NavSplitVertical = NO;
+                                                                SplitCount = 1;
+                                                        };
+                                                };
+                                                PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+                                                        PBXProjectWorkspaceModule_SGTM_Geometry = {
+                                                                _collapsingFrameDimension = 0;
+                                                                _indexOfCollapsedView = 0;
+                                                                _percentageOfCollapsedView = 0;
+                                                                sizes = (
+                                                                        "{{0, 0}, {182, 665}}",
+                                                                        "{{182, 0}, {571, 665}}",
+                                                                );
+                                                        };
+                                                };
+                                                PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {571, 118}}";
+                                                PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 118}, {571, 547}}";
+                                                PBXProjectWorkspaceModule_OldSuperviewFrame = "{{182, 0}, {571, 665}}";
+                                                PBXProjectWorkspaceModule_SGTM = {
+                                                        PBXBottomSmartGroupGIDs = (
+                                                                1C37FBAC04509CD000000102,
+                                                                1C37FAAC04509CD000000102,
+                                                                1C08E77C0454961000C914BD,
+                                                                1CC0EA4004350EF90044410B,
+                                                                1CC0EA4004350EF90041110B,
+                                                                1C37FABC05509CD000000102,
+                                                                1C37FABC05539CD112110102,
+                                                                E2644B35053B69B200211256,
+                                                                1C37FABC04509CD000100104,
+                                                        );
+                                                        PBXSmartGroupTreeModuleColumnData = {
+                                                                PBXSmartGroupTreeModuleColumnWidthsKey = (
+                                                                        165,
+                                                                );
+                                                                PBXSmartGroupTreeModuleColumnsKey_v4 = (
+                                                                        MainColumn,
+                                                                );
+                                                        };
+                                                        PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+                                                                PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+                                                                        08FB7794FE84155DC02AAC07,
+                                                                        08FB7795FE84155DC02AAC07,
+                                                                        C6859E96029091FE04C91782,
+                                                                        1C37FAAC04509CD000000102,
+                                                                );
+                                                                PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+                                                                        (
+                                                                                10,
+                                                                        ),
+                                                                );
+                                                                PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 0}, {165, 647}}";
+                                                        };
+                                                        PBXTopSmartGroupGIDs = (
+                                                        );
+                                                };
+                                        };
+                                },
+                        );
+                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+                        };
+                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXDebugCLIModule" = {
+                        };
+                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXDebugSessionModule" = {
+                                Debugger = {
+                                        HorizontalSplitView = {
+                                                _collapsingFrameDimension = 0;
+                                                _indexOfCollapsedView = 0;
+                                                _percentageOfCollapsedView = 0;
+                                                isCollapsed = yes;
+                                                sizes = (
+                                                        "{{0, 0}, {180, 195}}",
+                                                        "{{180, 0}, {565, 195}}",
+                                                );
+                                        };
+                                        VerticalSplitView = {
+                                                _collapsingFrameDimension = 0;
+                                                _indexOfCollapsedView = 0;
+                                                _percentageOfCollapsedView = 0;
+                                                isCollapsed = yes;
+                                                sizes = (
+                                                        "{{0, 0}, {745, 195}}",
+                                                        "{{0, 195}, {745, 227}}",
+                                                );
+                                        };
+                                };
+                                LauncherConfigVersion = 8;
+                        };
+                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
+                                PBXSplitModuleInNavigatorKey = {
+                                        SplitCount = 1;
+                                };
+                        };
+                        "PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+                                PBXProjectWorkspaceModule_StateKey_Rev39 = {
+                                        PBXProjectWorkspaceModule_DEGV_Geometry = {
+                                                _collapsingFrameDimension = 0;
+                                                _indexOfCollapsedView = 0;
+                                                _percentageOfCollapsedView = 0;
+                                                isCollapsed = yes;
+                                                sizes = (
+                                                        "{{0, 0}, {571, 115}}",
+                                                        "{{0, 115}, {571, 550}}",
+                                                );
+                                        };
+                                        PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+                                                BoundsStr = "{{0, 0}, {556, 98}}";
+                                                Rows = (
+                                                        0,
+                                                );
+                                                VisibleRectStr = "{{0, 0}, {556, 98}}";
+                                        };
+                                        PBXProjectWorkspaceModule_EditorOpen = true;
+                                        PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+                                                PBXSplitModuleInNavigatorKey = {
+                                                        Split0 = {
+                                                                bookmark = E18A0A28063362F9008DC67C;
+                                                                history = (
+                                                                        E18A0A22063362F5008DC67C,
+                                                                );
                                                         };
                                                         SplitCount = 1;
-                                                        Tab1 = {
-                                                                Debugger = {
-                                                                        Split0 = {
-                                                                                SplitCount = 2;
-                                                                        };
-                                                                        SplitCount = 1;
-                                                                        TabCount = 2;
-                                                                };
-                                                                LauncherConfigVersion = 7;
-                                                        };
-                                                        Tab2 = {
-                                                                LauncherConfigVersion = 3;
-                                                                Runner = {
-                                                                };
-                                                        };
-                                                        TabCount = 5;
-                                                };
-                                                SplitCount = 1;
-                                                Tab1 = {
-                                                        OptionsSetName = "Hierarchy, all classes";
-                                                };
-                                                TabCount = 5;
-                                        };
-                                },
-                                {
-                                        LeftSlideOut = {
-                                                Split0 = {
-                                                        Split0 = {
-                                                                NavCount = 1;
-                                                                NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {618, 150}}";
-                                                                        NavBarVisible = YES;
-                                                                };
-                                                                NavSplitVertical = NO;
-                                                        };
-                                                        SplitCount = 1;
-                                                        Tab1 = {
-                                                                Debugger = {
-                                                                        Split0 = {
-                                                                                SplitCount = 2;
-                                                                        };
-                                                                        SplitCount = 1;
-                                                                        TabCount = 2;
-                                                                };
-                                                                LauncherConfigVersion = 7;
-                                                        };
-                                                        Tab2 = {
-                                                                LauncherConfigVersion = 3;
-                                                                Runner = {
-                                                                };
-                                                        };
-                                                        TabCount = 5;
-                                                };
-                                                SplitCount = 1;
-                                                Tab1 = {
-                                                        OptionsSetName = "Hierarchy, all classes";
-                                                };
-                                                TabCount = 5;
-                                        };
+                                                };
+                                        };
+                                        PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+                                                PBXProjectWorkspaceModule_SGTM_Geometry = {
+                                                        _collapsingFrameDimension = 0;
+                                                        _indexOfCollapsedView = 0;
+                                                        _percentageOfCollapsedView = 0;
+                                                        sizes = (
+                                                                "{{0, 0}, {182, 665}}",
+                                                                "{{182, 0}, {571, 665}}",
+                                                        );
+                                                };
+                                        };
+                                        PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {571, 115}}";
+                                        PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 115}, {571, 550}}";
+                                        PBXProjectWorkspaceModule_OldSuperviewFrame = "{{182, 0}, {571, 665}}";
+                                        PBXProjectWorkspaceModule_SGTM = {
+                                                PBXBottomSmartGroupGIDs = (
+                                                        1C37FBAC04509CD000000102,
+                                                        1C37FAAC04509CD000000102,
+                                                        1C08E77C0454961000C914BD,
+                                                        1CC0EA4004350EF90044410B,
+                                                        1CC0EA4004350EF90041110B,
+                                                        1C37FABC05509CD000000102,
+                                                        1C37FABC05539CD112110102,
+                                                        E2644B35053B69B200211256,
+                                                        1C37FABC04509CD000100104,
+                                                );
+                                                PBXSmartGroupTreeModuleColumnData = {
+                                                        PBXSmartGroupTreeModuleColumnWidthsKey = (
+                                                                165,
+                                                        );
+                                                        PBXSmartGroupTreeModuleColumnsKey_v4 = (
+                                                                MainColumn,
+                                                        );
+                                                };
+                                                PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+                                                        PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+                                                                08FB7794FE84155DC02AAC07,
+                                                                08FB7795FE84155DC02AAC07,
+                                                        );
+                                                        PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+                                                                (
+                                                                        2,
+                                                                        1,
+                                                                        0,
+                                                                ),
+                                                        );
+                                                        PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 0}, {165, 647}}";
+                                                };
+                                                PBXTopSmartGroupGIDs = (
+                                                );
+                                        };
+                                };
+                        };
+                        PBXWorkspaceGeometries = (
+                                {
+                                        Frame = "{{0, 0}, {753, 665}}";
+                                        PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+                                        };
+                                        RubberWindowFrame = "46 125 753 707 0 0 1280 832 ";
                                 },
                         );
-                        PBXWorkspaceGeometries = (
-                                {
-                                        ContentSize = "{1018, 656}";
-                                        LeftSlideOut = {
-                                                ActiveTab = 1;
-                                                ActiveTabName = PBXClassBrowserModule;
-                                                Collapsed = NO;
-                                                Frame = "{{0, 23}, {1018, 633}}";
-                                                Split0 = {
-                                                        Collapsed = NO;
-                                                        Frame = "{{272, 0}, {746, 633}}";
-                                                        Split0 = {
-                                                                Frame = "{{0, 0}, {746, 633}}";
-                                                        };
-                                                        SplitCount = 1;
-                                                        Tab0 = {
-                                                                Frame = "{{0, 0}, {681, 289}}";
-                                                        };
-                                                        Tab1 = {
-                                                                Debugger = {
-                                                                        Collapsed = NO;
-                                                                        Frame = "{{0, 0}, {681, 150}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 24}, {681, 126}}";
-                                                                                Split0 = {
-                                                                                        Frame = "{{0, 0}, {333, 126}}";
-                                                                                };
-                                                                                Split1 = {
-                                                                                        DebugVariablesTableConfiguration = (
-                                                                                                Name,
-                                                                                                123,
-                                                                                                Value,
-                                                                                                85,
-                                                                                                Summary,
-                                                                                                105.123,
-                                                                                        );
-                                                                                        Frame = "{{342, 0}, {339, 126}}";
-                                                                                };
-                                                                                SplitCount = 2;
-                                                                        };
-                                                                        SplitCount = 1;
-                                                                        Tab0 = {
-                                                                                Frame = "{{0, 0}, {100, 50}}";
-                                                                        };
-                                                                        Tab1 = {
-                                                                                Frame = "{{0, 0}, {100, 50}}";
-                                                                        };
-                                                                        TabCount = 2;
-                                                                        TabsVisible = YES;
-                                                                };
-                                                                Frame = "{{0, 0}, {681, 120}}";
-                                                                LauncherConfigVersion = 7;
-                                                        };
-                                                        Tab2 = {
-                                                                Frame = "{{0, 0}, {681, 234}}";
-                                                                LauncherConfigVersion = 3;
-                                                                Runner = {
-                                                                        Frame = "{{0, 0}, {681, 234}}";
-                                                                };
-                                                        };
-                                                        Tab3 = {
-                                                                BuildMessageFrame = "{{0, 0}, {683, 205}}";
-                                                                BuildTranscriptFrame = "{{0, 214}, {683, 2}}";
-                                                                BuildTranscriptFrameExpanded = YES;
-                                                                Frame = "{{0, 0}, {681, 238}}";
-                                                        };
-                                                        Tab4 = {
-                                                                Frame = "{{0, 0}, {612, 295}}";
-                                                        };
-                                                        TabCount = 5;
-                                                        TabsVisible = NO;
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Frame = "{{0, 0}, {265, 633}}";
-                                                        GroupTreeTableConfiguration = (
-                                                                TargetStatusColumn,
-                                                                18,
-                                                                MainColumn,
-                                                                232,
-                                                        );
-                                                };
-                                                Tab1 = {
-                                                        ClassesFrame = "{{0, 0}, {250, 381}}";
-                                                        ClassesTreeTableConfiguration = (
-                                                                PBXBookColumnIdentifier,
-                                                                20,
-                                                                PBXClassColumnIdentifier,
-                                                                207,
-                                                        );
-                                                        Frame = "{{0, 0}, {248, 633}}";
-                                                        MembersFrame = "{{0, 390}, {250, 243}}";
-                                                        MembersTreeTableConfiguration = (
-                                                                PBXBookColumnIdentifier,
-                                                                20,
-                                                                PBXMethodColumnIdentifier,
-                                                                206,
-                                                        );
-                                                };
-                                                Tab2 = {
-                                                        Frame = "{{0, 0}, {217, 554}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {239, 554}}";
-                                                        TargetTableConfiguration = (
-                                                                ActiveObject,
-                                                                16,
-                                                                ObjectNames,
-                                                                206.296,
-                                                        );
-                                                };
-                                                Tab4 = {
-                                                        BreakpointsTreeTableConfiguration = (
-                                                                breakpointColumn,
-                                                                197,
-                                                                enabledColumn,
-                                                                31,
-                                                        );
-                                                        Frame = "{{0, 0}, {250, 554}}";
-                                                };
-                                                TabCount = 5;
-                                                TabsVisible = YES;
-                                        };
-                                        NavBarShownByDefault = YES;
-                                        StatusViewVisible = YES;
-                                        Template = 64ABBB4501FA494900185B06;
-                                        ToolbarVisible = YES;
-                                        WindowLocation = "{4, 111}";
-                                },
-                                {
-                                        ContentSize = "{618, 257}";
-                                        LeftSlideOut = {
-                                                Collapsed = NO;
-                                                Frame = "{{0, 23}, {618, 234}}";
-                                                Split0 = {
-                                                        ActiveTab = 2;
-                                                        ActiveTabName = PBXBuildResultsModule;
-                                                        Collapsed = YES;
-                                                        Frame = "{{0, 0}, {618, 234}}";
-                                                        Split0 = {
-                                                                Frame = "{{1e+06, 1e+06}, {618, 0}}";
-                                                        };
-                                                        SplitCount = 1;
-                                                        Tab0 = {
-                                                                Frame = "{{0, 0}, {952, 321}}";
-                                                        };
-                                                        Tab1 = {
-                                                                Debugger = {
-                                                                        Collapsed = NO;
-                                                                        Frame = "{{0, 0}, {781, 452}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 24}, {781, 428}}";
-                                                                                Split0 = {
-                                                                                        Frame = "{{0, 0}, {383, 428}}";
-                                                                                };
-                                                                                Split1 = {
-                                                                                        DebugVariablesTableConfiguration = (
-                                                                                                Name,
-                                                                                                123,
-                                                                                                Value,
-                                                                                                85,
-                                                                                                Summary,
-                                                                                                155.123,
-                                                                                        );
-                                                                                        Frame = "{{392, 0}, {389, 428}}";
-                                                                                };
-                                                                                SplitCount = 2;
-                                                                        };
-                                                                        SplitCount = 1;
-                                                                        Tab0 = {
-                                                                                Frame = "{{0, 0}, {100, 50}}";
-                                                                        };
-                                                                        Tab1 = {
-                                                                                Frame = "{{0, 0}, {100, 50}}";
-                                                                        };
-                                                                        TabCount = 2;
-                                                                        TabsVisible = YES;
-                                                                };
-                                                                Frame = "{{0, 0}, {781, 452}}";
-                                                                LauncherConfigVersion = 7;
-                                                        };
-                                                        Tab2 = {
-                                                                Frame = "{{0, 0}, {618, 228}}";
-                                                                LauncherConfigVersion = 3;
-                                                                Runner = {
-                                                                        Frame = "{{0, 0}, {618, 228}}";
-                                                                };
-                                                        };
-                                                        Tab3 = {
-                                                                BuildMessageFrame = "{{0, 0}, {620, 195}}";
-                                                                BuildTranscriptFrame = "{{0, 204}, {620, 2}}";
-                                                                BuildTranscriptFrameExpanded = YES;
-                                                                Frame = "{{0, 0}, {618, 228}}";
-                                                        };
-                                                        Tab4 = {
-                                                                Frame = "{{0, 0}, {612, 295}}";
-                                                        };
-                                                        TabCount = 5;
-                                                        TabsVisible = NO;
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Frame = "{{0, 0}, {300, 533}}";
-                                                        GroupTreeTableConfiguration = (
-                                                                TargetStatusColumn,
-                                                                18,
-                                                                MainColumn,
-                                                                267,
-                                                        );
-                                                };
-                                                Tab1 = {
-                                                        ClassesFrame = "{{0, 0}, {280, 398}}";
-                                                        ClassesTreeTableConfiguration = (
-                                                                PBXBookColumnIdentifier,
-                                                                20,
-                                                                PBXClassColumnIdentifier,
-                                                                237,
-                                                        );
-                                                        Frame = "{{0, 0}, {278, 659}}";
-                                                        MembersFrame = "{{0, 407}, {280, 252}}";
-                                                        MembersTreeTableConfiguration = (
-                                                                PBXBookColumnIdentifier,
-                                                                20,
-                                                                PBXMethodColumnIdentifier,
-                                                                236,
-                                                        );
-                                                };
-                                                Tab2 = {
-                                                        Frame = "{{0, 0}, {200, 100}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {200, 100}}";
-                                                        TargetTableConfiguration = (
-                                                                ActiveObject,
-                                                                16,
-                                                                ObjectNames,
-                                                                202.296,
-                                                        );
-                                                };
-                                                Tab4 = {
-                                                        BreakpointsTreeTableConfiguration = (
-                                                                breakpointColumn,
-                                                                197,
-                                                                enabledColumn,
-                                                                31,
-                                                        );
-                                                        Frame = "{{0, 0}, {250, 100}}";
-                                                };
-                                                TabCount = 5;
-                                                TabsVisible = NO;
-                                        };
-                                        NavBarShownByDefault = YES;
-                                        StatusViewVisible = YES;
-                                        Template = F5314676015831810DCA290F;
-                                        ToolbarVisible = YES;
-                                        WindowLocation = "{819, 244}";
-                                },
-                        );
-                        PBXWorkspaceStateSaveDate = 67398120;
+                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+                                Frame = "{{0, 0}, {480, 217}}";
+                                PBXModuleWindowStatusBarHidden = YES;
+                                RubberWindowFrame = "400 466 480 238 0 0 1280 832 ";
+                        };
+                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXDebugCLIModule" = {
+                                Frame = "{{0, 0}, {400, 201}}";
+                                PBXModuleWindowStatusBarHidden = YES;
+                                RubberWindowFrame = "50 804 400 222 0 0 1280 832 ";
+                        };
+                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXDebugSessionModule" = {
+                                DebugConsoleDrawerSize = "{100, 120}";
+                                DebugConsoleVisible = Drawer;
+                                DebugConsoleWindowFrame = "{{200, 200}, {500, 300}}";
+                                DebugSTDIOWindowFrame = "{{200, 200}, {500, 300}}";
+                                Frame = "{{0, 0}, {745, 422}}";
+                                RubberWindowFrame = "398 164 745 464 0 0 1280 832 ";
+                        };
+                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
+                                Frame = "{{0, 0}, {750, 481}}";
+                                PBXModuleWindowStatusBarHidden = YES;
+                                RubberWindowFrame = "15 325 750 502 0 0 1280 832 ";
+                        };
+                        "PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+                                Frame = "{{0, 0}, {753, 665}}";
+                                PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+                                };
+                                RubberWindowFrame = "46 125 753 707 0 0 1280 832 ";
+                        };
+                        PBXWorkspaceStateSaveDate = 104034524;
                 };
                 perUserProjectItems = {
-                        E16C83D103F83AD700050002 = E16C83D103F83AD700050002;
-                        E16C83D203F83AD700050002 = E16C83D203F83AD700050002;
-                        E16C83D303F83AD700050002 = E16C83D303F83AD700050002;
-                        E16C83D403F83AD700050002 = E16C83D403F83AD700050002;
-                        E16C83D503F83AD700050002 = E16C83D503F83AD700050002;
-                        E16C83D603F83AD700050002 = E16C83D603F83AD700050002;
-                        E16C83D703F83AD700050002 = E16C83D703F83AD700050002;
-                        E16C83D803F83AD700050002 = E16C83D803F83AD700050002;
-                        E16C83D903F83AD700050002 = E16C83D903F83AD700050002;
-                        E16C83DA03F83AD700050002 = E16C83DA03F83AD700050002;
-                        E16C83DB03F83AD700050002 = E16C83DB03F83AD700050002;
-                        E16C83DD03F83AD700050002 = E16C83DD03F83AD700050002;
-                        E16C83DE03F83AD700050002 = E16C83DE03F83AD700050002;
-                        E16C83E103F83AD700050002 = E16C83E103F83AD700050002;
-                        E16C83E203F83AD700050002 = E16C83E203F83AD700050002;
-                        E16C83E303F83AD700050002 = E16C83E303F83AD700050002;
-                        E16C83E403F83AD700050002 = E16C83E403F83AD700050002;
-                        E16C83E503F83AD700050002 = E16C83E503F83AD700050002;
-                        E16C83E603F83AD700050002 = E16C83E603F83AD700050002;
-                        E16C83E703F83AD700050002 = E16C83E703F83AD700050002;
-                        E16C83E803F83AD700050002 = E16C83E803F83AD700050002;
-                        E16C83E903F83AD700050002 = E16C83E903F83AD700050002;
-                        E16C83EA03F83AD700050002 = E16C83EA03F83AD700050002;
-                        E16C83EB03F83AD700050002 = E16C83EB03F83AD700050002;
-                        E16C83EC03F83AD700050002 = E16C83EC03F83AD700050002;
-                        E16C840303FB5E7100050002 = E16C840303FB5E7100050002;
-                        E16C842A03FB74A500050002 = E16C842A03FB74A500050002;
-                        E1B46F500404978A00050002 = E1B46F500404978A00050002;
-                        E1B46F510404978A00050002 = E1B46F510404978A00050002;
-                        E1B46F520404978A00050002 = E1B46F520404978A00050002;
-                        E1B46F530404978A00050002 = E1B46F530404978A00050002;
-                        E1B46F540404978A00050002 = E1B46F540404978A00050002;
-                };
-                projectwideBuildSettings = {
-                };
-                wantsIndex = 1;
-                wantsSCM = -1;
+                        E173740F063370F0002A81F1 = E173740F063370F0002A81F1;
+                        E1737410063370F0002A81F1 = E1737410063370F0002A81F1;
+                        E1737411063370F0002A81F1 = E1737411063370F0002A81F1;
+                        E18A0A3A06336491008DC67C = E18A0A3A06336491008DC67C;
+                        E18A0A3C06336491008DC67C = E18A0A3C06336491008DC67C;
+                        E18A0A500633657C008DC67C = E18A0A500633657C008DC67C;
+                        E18A0A5B0633660A008DC67C = E18A0A5B0633660A008DC67C;
+                        E18A0A6306336B3C008DC67C = E18A0A6306336B3C008DC67C;
+                        E18A0A6806336B3E008DC67C = E18A0A6806336B3E008DC67C;
+                        E18A0A6B06336B3F008DC67C = E18A0A6B06336B3F008DC67C;
+                        E18A0A6C06336B3F008DC67C = E18A0A6C06336B3F008DC67C;
+                        E18A0A6F06336B56008DC67C = E18A0A6F06336B56008DC67C;
+                };
+                sourceControlManager = E18A0A29063362FF008DC67C;
+                userBuildSettings = {
+                };
+        };
+        08FB7796FE84155DC02AAC07 = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {709, 5843}}";
+                        sepNavSelRange = "{14100, 30}";
+                        sepNavVisRect = "{{0, 4189}, {709, 443}}";
+                        sepNavWindowFrame = "{{15, 325}, {750, 502}}";
+                };
         };
         08FB779FFE84155DC02AAC07 = {
@@ -432 +504 @@
                 );
         };
-        E16C83D103F83AD700050002 = {
-                fRef = E16C83EF03F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "CoreGraphics.h: 1";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 1102;
-                vrLoc = 0;
-        };
-        E16C83D203F83AD700050002 = {
-                fRef = E16C83F003F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "CGBase.h: 1";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 712;
-                vrLoc = 0;
-        };
-        E16C83D303F83AD700050002 = {
-                fRef = E16C83F203F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "CGError.h: 21";
-                rLen = 23;
-                rLoc = 382;
-                rType = 0;
-                vrLen = 1002;
-                vrLoc = 0;
-        };
-        E16C83D403F83AD700050002 = {
-                fRef = E16C83F303F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "Processes.h: 48";
-                rLen = 15;
-                rLoc = 1115;
-                rType = 0;
-                vrLen = 1032;
-                vrLoc = 546;
-        };
-        E16C83D503F83AD700050002 = {
-                fRef = E16C83F403F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "MacErrors.h: 1476";
-                rLen = 3;
-                rLoc = 82842;
-                rType = 0;
-                vrLen = 1637;
-                vrLoc = 82130;
-        };
-        E16C83D603F83AD700050002 = {
-                fRef = E16C83F103F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "Quickdraw.h: 1974";
-                rLen = 105;
-                rLoc = 71385;
-                rType = 0;
-                vrLen = 1086;
-                vrLoc = 70825;
-        };
-        E16C83D703F83AD700050002 = {
-                fRef = E16C83F503F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "types.h: 102";
-                rLen = 42;
-                rLoc = 4351;
-                rType = 0;
-                vrLen = 1301;
-                vrLoc = 3647;
-        };
-        E16C83D803F83AD700050002 = {
-                fRef = E16C83F603F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "OpenTransportProtocol.h: 799";
-                rLen = 50;
-                rLoc = 35039;
-                rType = 0;
-                vrLen = 1534;
-                vrLoc = 34260;
-        };
-        E16C83D903F83AD700050002 = {
-                fRef = E16C83F703F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "stdio.h: 279";
-                rLen = 47;
-                rLoc = 10453;
-                rType = 0;
-                vrLen = 1370;
-                vrLoc = 9757;
-        };
-        E16C83DA03F83AD700050002 = {
-                fRef = E16C83F803F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "NSURL.h: 1";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 1617;
-                vrLoc = 856;
-        };
-        E16C83DB03F83AD700050002 = {
-                fRef = E16C83F903F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "NSFileManager.h: 7";
-                rLen = 0;
-                rLoc = 165;
-                rType = 0;
-                vrLen = 1400;
-                vrLoc = 0;
-        };
-        E16C83DD03F83AD700050002 = {
-                fRef = E16C83EE03F83AD700050002;
-                isa = PBXTextBookmark;
-                name = "unistd.h: 132";
-                rLen = 41;
-                rLoc = 5271;
-                rType = 0;
-                vrLen = 1423;
-                vrLoc = 4595;
-        };
-        E16C83DE03F83AD700050002 = {
-                fRef = E16C83CC03F7AF7B00050002;
-                isa = PBXTextBookmark;
-                name = "README: 34";
-                rLen = 56;
-                rLoc = 1201;
-                rType = 0;
-                vrLen = 1412;
-                vrLoc = 0;
-        };
-        E16C83E103F83AD700050002 = {
-                fRef = E1A0BD3203EFAD9E00050001;
-                isa = PBXTextBookmark;
-                name = "CPS.h: 273";
-                rLen = 0;
-                rLoc = 4618;
-                rType = 0;
-                vrLen = 1089;
-                vrLoc = 4030;
-        };
-        E16C83E203F83AD700050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: __VERSION__";
-                rLen = 0;
-                rLoc = 0;
-                rType = 0;
-                vrLen = 861;
-                vrLoc = 1740;
-        };
-        E16C83E303F83AD700050002 = {
-                fRef = E1A0BD3203EFAD9E00050001;
-                isa = PBXTextBookmark;
-                name = "CPS.h: CPSPostShowAllReq";
-                rLen = 17;
-                rLoc = 4768;
-                rType = 0;
-                vrLen = 1057;
-                vrLoc = 3979;
-        };
-        E16C83E403F83AD700050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: main";
-                rLen = 0;
-                rLoc = 16257;
-                rType = 0;
-                vrLen = 1650;
-                vrLoc = 10700;
-        };
-        E16C83E503F83AD700050002 = {
-                fRef = E1A0BD3203EFAD9E00050001;
-                isa = PBXTextBookmark;
-                name = "CPS.h: 80";
-                rLen = 0;
-                rLoc = 1183;
-                rType = 0;
-                vrLen = 810;
-                vrLoc = 825;
-        };
-        E16C83E603F83AD700050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: matchApplication";
-                rLen = 0;
-                rLoc = 12913;
-                rType = 0;
-                vrLen = 1426;
-                vrLoc = 8916;
-        };
-        E16C83E703F83AD700050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: 51";
-                rLen = 0;
-                rLoc = 2377;
-                rType = 0;
-                vrLen = 801;
-                vrLoc = 1590;
-        };
-        E16C83E803F83AD700050002 = {
-                fRef = E16C83CC03F7AF7B00050002;
-                isa = PBXTextBookmark;
-                name = "README: 35";
-                rLen = 0;
-                rLoc = 1258;
-                rType = 0;
-                vrLen = 1285;
-                vrLoc = 0;
-        };
-        E16C83E903F83AD700050002 = {
-                fRef = E1A0BD3203EFAD9E00050001;
-                isa = PBXTextBookmark;
-                name = "CPS.h: 80";
-                rLen = 0;
-                rLoc = 1183;
-                rType = 0;
-                vrLen = 832;
-                vrLoc = 741;
-        };
-        E16C83EA03F83AD700050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: 117";
-                rLen = 0;
-                rLoc = 5050;
-                rType = 0;
-                vrLen = 1813;
-                vrLoc = 0;
-        };
-        E16C83EB03F83AD700050002 = {
-                fRef = E16C83CC03F7AF7B00050002;
-                isa = PBXTextBookmark;
-                name = "README: 34";
-                rLen = 56;
-                rLoc = 1201;
-                rType = 0;
-                vrLen = 1412;
-                vrLoc = 0;
-        };
-        E16C83EC03F83AD700050002 = {
-                fRef = C6859E970290921104C91782;
-                isa = PBXTextBookmark;
-                name = "appswitch.1: 110";
-                rLen = 0;
-                rLoc = 4118;
-                rType = 0;
-                vrLen = 1732;
-                vrLoc = 2592;
-        };
-        E16C83EE03F83AD700050002 = {
-                isa = PBXFileReference;
-                name = unistd.h;
-                path = /usr/include/unistd.h;
-                refType = 0;
-        };
-        E16C83EF03F83AD700050002 = {
-                isa = PBXFileReference;
-                name = CoreGraphics.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CoreGraphics.h;
-                refType = 0;
-        };
-        E16C83F003F83AD700050002 = {
-                isa = PBXFileReference;
-                name = CGBase.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGBase.h;
-                refType = 0;
-        };
-        E16C83F103F83AD700050002 = {
-                isa = PBXFileReference;
-                name = Quickdraw.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/Headers/Quickdraw.h;
-                refType = 0;
-        };
-        E16C83F203F83AD700050002 = {
-                isa = PBXFileReference;
-                name = CGError.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGError.h;
-                refType = 0;
-        };
-        E16C83F303F83AD700050002 = {
-                isa = PBXFileReference;
-                name = Processes.h;
-                path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/Headers/Processes.h;
-                refType = 0;
-        };
-        E16C83F403F83AD700050002 = {
-                isa = PBXFileReference;
-                name = MacErrors.h;
-                path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h;
-                refType = 0;
-        };
-        E16C83F503F83AD700050002 = {
-                isa = PBXFileReference;
-                name = types.h;
-                path = /usr/include/sys/types.h;
-                refType = 0;
-        };
-        E16C83F603F83AD700050002 = {
-                isa = PBXFileReference;
-                name = OpenTransportProtocol.h;
-                path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/Headers/OpenTransportProtocol.h;
-                refType = 0;
-        };
-        E16C83F703F83AD700050002 = {
-                isa = PBXFileReference;
-                name = stdio.h;
-                path = /usr/include/stdio.h;
-                refType = 0;
-        };
-        E16C83F803F83AD700050002 = {
-                isa = PBXFileReference;
-                name = NSURL.h;
-                path = /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSURL.h;
-                refType = 0;
-        };
-        E16C83F903F83AD700050002 = {
-                isa = PBXFileReference;
-                name = NSFileManager.h;
-                path = /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSFileManager.h;
-                refType = 0;
-        };
-        E16C840303FB5E7100050002 = {
-                fRef = E1A0BD3203EFAD9E00050001;
-                isa = PBXTextBookmark;
-                name = "CPS.h: 156";
-                rLen = 13;
-                rLoc = 2465;
-                rType = 0;
-                vrLen = 622;
-                vrLoc = 2176;
-        };
-        E16C842A03FB74A500050002 = {
-                fRef = E16C842F03FB74A500050002;
-                isa = PBXTextBookmark;
-                name = "CFString.h: 252";
-                rLen = 142;
-                rLoc = 12196;
-                rType = 0;
-                vrLen = 2097;
-                vrLoc = 10692;
+        C6859E970290921104C91782 = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {530, 2027}}";
+                        sepNavSelRange = "{122, 0}";
+                        sepNavVisRect = "{{0, 1494}, {530, 533}}";
+                };
+        };
+        E16C83CC03F7AF7B00050002 = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {530, 1036}}";
+                        sepNavSelRange = "{0, 0}";
+                        sepNavVisRect = "{{0, 0}, {530, 533}}";
+                };
         };
         E16C842F03FB74A500050002 = {
                 isa = PBXFileReference;
+                lastKnownFileType = sourcecode.c.h;
                 name = CFString.h;
                 path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h;
                 refType = 0;
+                sourceTree = "<absolute>";
+        };
+        E173740F063370F0002A81F1 = {
+                fRef = C6859E970290921104C91782;
+                isa = PBXTextBookmark;
+                name = "appswitch.1: 4";
+                rLen = 0;
+                rLoc = 122;
+                rType = 0;
+                vrLen = 1440;
+                vrLoc = 4186;
+        };
+        E1737410063370F0002A81F1 = {
+                fRef = C6859E970290921104C91782;
+                isa = PBXTextBookmark;
+                name = "appswitch.1: 4";
+                rLen = 0;
+                rLoc = 122;
+                rType = 0;
+                vrLen = 1440;
+                vrLoc = 4186;
+        };
+        E1737411063370F0002A81F1 = {
+                exec = E1A0BD2C03EFAD1C00050001;
+                isa = PBXExecutableBookmark;
+                uiCtxt = {
+                        buildSettingsExpandedSubviews = (
+                                0,
+                                1,
+                                2,
+                                3,
+                                4,
+                                5,
+                        );
+                        buildSettingsVisRect = "{{0, 0}, {556, 498}}";
+                };
+        };
+        E18A0A29063362FF008DC67C = {
+                isa = PBXSourceControlManager;
+                scmConfiguration = {
+                };
+                scmType = scm.cvs;
+        };
+        E18A0A2A063362FF008DC67C = {
+                indexTemplatePath = "";
+                isa = PBXCodeSenseManager;
+                usesDefaults = 1;
+                wantsCodeCompletion = 1;
+                wantsCodeCompletionAutoPopup = 1;
+                wantsCodeCompletionAutoSuggestions = 1;
+                wantsCodeCompletionCaseSensitivity = 1;
+                wantsCodeCompletionOnlyMatchingItems = 1;
+                wantsCodeCompletionParametersIncluded = 1;
+                wantsCodeCompletionPlaceholdersInserted = 1;
+                wantsCodeCompletionTabCompletes = 1;
+                wantsIndex = 1;
+        };
+        E18A0A3006336368008DC67C = {
+                fileReference = 08FB7796FE84155DC02AAC07;
+                functionName = "matchApplication()";
+                isa = PBXFileBreakpoint;
+                lineNumber = 355;
+                state = 1;
+        };
+        E18A0A39063363B8008DC67C = {
+                fileReference = 08FB7796FE84155DC02AAC07;
+                functionName = "matchApplication()";
+                isa = PBXFileBreakpoint;
+                lineNumber = 353;
+                state = 1;
+        };
+        E18A0A3A06336491008DC67C = {
+                exec = E1A0BD2C03EFAD1C00050001;
+                isa = PBXExecutableBookmark;
+        };
+        E18A0A3C06336491008DC67C = {
+                exec = E1A0BD2C03EFAD1C00050001;
+                isa = PBXExecutableBookmark;
+        };
+        E18A0A500633657C008DC67C = {
+                fRef = E16C83CC03F7AF7B00050002;
+                isa = PBXTextBookmark;
+                name = "README: 76";
+                rLen = 0;
+                rLoc = 2574;
+                rType = 0;
+                vrLen = 1666;
+                vrLoc = 1642;
+        };
+        E18A0A5B0633660A008DC67C = {
+                fRef = E16C842F03FB74A500050002;
+                isa = PBXTextBookmark;
+                name = CFComparisonResult;
+                rLen = 18;
+                rLoc = 17127;
+                rType = 0;
+                vrLen = 2160;
+                vrLoc = 16209;
+        };
+        E18A0A6306336B3C008DC67C = {
+                fRef = 08FB7796FE84155DC02AAC07;
+                isa = PBXTextBookmark;
+                name = "main.c: 249";
+                rLen = 0;
+                rLoc = 10218;
+                rType = 0;
+                vrLen = 1331;
+                vrLoc = 9714;
+        };
+        E18A0A6806336B3E008DC67C = {
+                fRef = C6859E970290921104C91782;
+                isa = PBXTextBookmark;
+                name = "appswitch.1: 1";
+                rLen = 0;
+                rLoc = 0;
+                rType = 0;
+                vrLen = 1708;
+                vrLoc = 0;
+        };
+        E18A0A6B06336B3F008DC67C = {
+                fRef = E1A0BD3203EFAD9E00050001;
+                isa = PBXTextBookmark;
+                name = "CPS.h: 1";
+                rLen = 0;
+                rLoc = 0;
+                rType = 0;
+                vrLen = 570;
+                vrLoc = 0;
+        };
+        E18A0A6C06336B3F008DC67C = {
+                fRef = E1A0BD3203EFAD9E00050001;
+                isa = PBXTextBookmark;
+                name = "CPS.h: 1";
+                rLen = 0;
+                rLoc = 0;
+                rType = 0;
+                vrLen = 570;
+                vrLoc = 0;
+        };
+        E18A0A6F06336B56008DC67C = {
+                fRef = 08FB7796FE84155DC02AAC07;
+                isa = PBXTextBookmark;
+                name = "main.c: 463";
+                rLen = 0;
+                rLoc = 18890;
+                rType = 0;
+                vrLen = 1696;
+                vrLoc = 17194;
         };
         E1A0BD2C03EFAD1C00050001 = {
@@ -800 +693 @@
                 );
         };
-        E1B46F500404978A00050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: VERSION";
-                rLen = 0;
-                rLoc = 1695;
-                rType = 0;
-                vrLen = 1811;
-                vrLoc = 0;
-        };
-        E1B46F510404978A00050002 = {
-                fRef = C6859E970290921104C91782;
-                isa = PBXTextBookmark;
-                name = "appswitch.1: 123";
-                rLen = 0;
-                rLoc = 4118;
-                rType = 0;
-                vrLen = 1451;
-                vrLoc = 2587;
-        };
-        E1B46F520404978A00050002 = {
-                fRef = 08FB7796FE84155DC02AAC07;
-                isa = PBXTextBookmark;
-                name = "main.c: VERSION";
-                rLen = 0;
-                rLoc = 1695;
-                rType = 0;
-                vrLen = 1811;
-                vrLoc = 0;
-        };
-        E1B46F530404978A00050002 = {
-                fRef = C6859E970290921104C91782;
-                isa = PBXTextBookmark;
-                name = "appswitch.1: 123";
-                rLen = 0;
-                rLoc = 4118;
-                rType = 0;
-                vrLen = 1451;
-                vrLoc = 2587;
-        };
-        E1B46F540404978A00050002 = {
-                fRef = E16C83CC03F7AF7B00050002;
-                isa = PBXTextBookmark;
-                name = "README: 88";
-                rLen = 0;
-                rLoc = 3017;
-                rType = 0;
-                vrLen = 1583;
-                vrLoc = 1611;
+        E1A0BD3203EFAD9E00050001 = {
+                uiCtxt = {
+                        sepNavIntBoundsRect = "{{0, 0}, {530, 3532}}";
+                        sepNavSelRange = "{0, 0}";
+                        sepNavVisRect = "{{0, 0}, {530, 533}}";
+                };
         };
 }

trunk/appswitch/appswitch/appswitch.xcode/project.pbxproj

@@ -4 +4 @@
         classes = {
         };
-        objectVersion = 38;
+        objectVersion = 39;
         objects = {
                 014CEA490018CE3211CA2923 = {
@@ -11 +11 @@
                         buildSettings = {
                                 COPY_PHASE_STRIP = NO;
+                                GCC_DYNAMIC_NO_PIC = NO;
+                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                                GCC_OPTIMIZATION_LEVEL = 0;
                                 OPTIMIZATION_CFLAGS = "-O0";
+                                ZERO_LINK = YES;
                         };
                         isa = PBXBuildStyle;
@@ -21 +26 @@
                         buildSettings = {
                                 COPY_PHASE_STRIP = YES;
+                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                                ZERO_LINK = NO;
                         };
                         isa = PBXBuildStyle;
@@ -36 +43 @@
 //034
                 034768E2FF38A6DC11DB9C8B = {
+                        explicitFileType = "compiled.mach-o.executable";
+                        fallbackIsa = PBXFileReference;
                         isa = PBXExecutableFileReference;
                         path = appswitch;
                         refType = 3;
+                        sourceTree = BUILT_PRODUCTS_DIR;
                 };
 //030
@@ -51 +61 @@
 //084
                 08FB7793FE84155DC02AAC07 = {
+                        buildSettings = {
+                        };
                         buildStyles = (
                                 014CEA490018CE3211CA2923,
@@ -73 +85 @@
                         name = appswitch;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 08FB7795FE84155DC02AAC07 = {
@@ -82 +95 @@
                         name = Source;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 08FB7796FE84155DC02AAC07 = {
                         fileEncoding = 4;
+                        indentWidth = 4;
                         isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.c.c;
                         path = main.c;
                         refType = 4;
+                        sourceTree = "<group>";
+                        tabWidth = 8;
+                        usesTabs = 0;
                 };
                 08FB779DFE84155DC02AAC07 = {
@@ -96 +115 @@
                         name = "External Frameworks and Libraries";
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 08FB779FFE84155DC02AAC07 = {
@@ -182 +202 @@
                         name = Products;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
 //190
@@ -201 +222 @@
                         name = Documentation;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 C6859E970290921104C91782 = {
                         isa = PBXFileReference;
+                        lastKnownFileType = text.man;
                         path = appswitch.1;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 C6859E980290922304C91782 = {
@@ -237 +261 @@
                         fileEncoding = 4;
                         isa = PBXFileReference;
+                        lastKnownFileType = text;
                         path = README;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 E16C83CD03F7AF7B00050002 = {
@@ -249 +275 @@
                         fileEncoding = 30;
                         isa = PBXFileReference;
+                        lastKnownFileType = sourcecode.c.h;
                         path = CPS.h;
                         refType = 4;
+                        sourceTree = "<group>";
                 };
                 E1A0BD3303EFAD9E00050001 = {
@@ -259 +287 @@
                 };
                 E1A0BD4C03EFB64400050001 = {
+                        fallbackIsa = PBXFileReference;
                         isa = PBXFrameworkReference;
+                        lastKnownFileType = wrapper.framework;
                         name = ApplicationServices.framework;
                         path = /System/Library/Frameworks/ApplicationServices.framework;
                         refType = 0;
+                        sourceTree = "<absolute>";
                 };
                 E1A0BD4D03EFB64400050001 = {

trunk/appswitch/appswitch/main.c

@@ -3 +3 @@
  Nicholas Riley <appswitch@sabi.net>
 
- Copyright (c) 2003, Nicholas Riley
+ Copyright (c) 2003-04, Nicholas Riley
  All rights reserved.
 
@@ -250 +250 @@
     if (bundle != NULL) {
         *bundleID = CFBundleGetIdentifier(bundle);
+        if (*bundleID != NULL) {
+            CFRetain(*bundleID);
 #if DEBUG
-        CFShow(*bundleID);
+            CFShow(*bundleID);
 #endif
+        }
+        CFRelease(bundle);
+    } else {
+        *bundleID = NULL;
     }
     CFRelease(url);
@@ -346 +352 @@
                    if (!bundleIdentifierForApplication(&bundleID, path))
                        errexit("can't get bundle location for process '%s' (PSN %ld.%ld, pid %ld)", name, psn.hi, psn.lo, info->UnixPID);
-                   if (bundleID != NULL && CFStringCompare(OPTS.bundleID, bundleID, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
-                       break;
+                   if (bundleID != NULL) {
+                       CFComparisonResult result = CFStringCompare(OPTS.bundleID, bundleID, kCFCompareCaseInsensitive);
+                       if (result == kCFCompareEqualTo)
+                           break;
+                       CFRelease(bundleID);
+                   }
                    continue;
                }