From c038a2c427244e75af0448afcb7777a2d35be5bb Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Fri, 22 Apr 2005 09:59:45 +0000
Subject: [PATCH] Some scary fixes that came up at the last moment for ArmyOps
 2.3.0's patch.

---
 platform_unix.c | 4 ++--
 ui_carbon.c     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform_unix.c b/platform_unix.c
index dbb9903..8ff67f6 100644
--- a/platform_unix.c
+++ b/platform_unix.c
@@ -553,11 +553,11 @@ static void *spawn_thread(void *arg)
 int spawn_xdelta(const char *cmdline)
 {
     const char *binname = "xdelta";
-    char *cmd = alloca(strlen(cmdline) + strlen(basedir) + strlen(binname) + 2);
+    char *cmd = alloca(strlen(cmdline) + strlen(basedir) + strlen(binname) + 5);
     if (!cmd)
         return(0);
 
-    sprintf(cmd, "\"%s%s\" %s", basedir, binname, cmdline);
+    sprintf(cmd, "\"%s/%s\" %s", basedir, binname, cmdline);
 
 #if !USE_PTHREAD
     int rc = 0;
diff --git a/ui_carbon.c b/ui_carbon.c
index 8bcbd74..125373c 100644
--- a/ui_carbon.c
+++ b/ui_carbon.c
@@ -17,13 +17,14 @@ int ui_init(void)
 {
     ControlID statusID = { MOJOPATCH_SIG, MOJOPATCH_STATUS_ID };
     ControlID progressID = { MOJOPATCH_SIG, MOJOPATCH_PROGRESS_ID };
-    IBNibRef nibRef;
+    IBNibRef nibRef = NULL;
     OSStatus err;
     Boolean b = TRUE;
 
     if (carbon_ui_initialized)  /* already initialized? */
         return(1);
 
+    /* !!! FIXME: This is corrupting the "basedir" variable in platform_unix.c ! */
     if (CreateNibReference(CFSTR("mojopatch"), &nibRef) != noErr)
     {
         fprintf(stderr, "MOJOPATCH: You probably don't have a .nib file!\n");