Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some scary fixes that came up at the last moment for ArmyOps 2.3.0's …
…patch.
  • Loading branch information
icculus committed Apr 22, 2005
1 parent b1a7cc1 commit c038a2c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions platform_unix.c
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion ui_carbon.c
Expand Up @@ -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");
Expand Down

0 comments on commit c038a2c

Please sign in to comment.