falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui/cocoa: Fix code for starting QEMU via image file load dialog 

Fix a number of bugs in the code for starting QEMU via the image
file load dialog:
 * use the actual argv[0] rather than "qemu": this avoids failures to
   find BIOS image files caused by not looking in the correct directory
   relative to the executable path
 * allocate a large enough argv array to NULL terminate it
 * use g_strdup(X) rather than g_strdup_printf("%s", X) or
   g_strdup_printf(X)
 * disable the printing of the simulated command line argument
   (which is presumably intended for debug only)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1386543546-31919-6-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-12-08 22:59:06 +00:00
parent 5342f990f4
commit 98db429d2c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/cocoa.m
View File

@ -833,18 +833,18 @@ QemuCocoaView *cocoaView;
if(returnCode == NSCancelButton) {
exit(0);
} else if(returnCode == NSOKButton) {
const char *bin = "qemu";
char *img = (char*)[ [ [ sheet URL ] path ] cStringUsingEncoding:NSASCIIStringEncoding];
char **argv = (char**)malloc( sizeof(char*)*3 );
char **argv = g_new(char *, 4);
[sheet close];
argv[0] = g_strdup_printf("%s", bin);
argv[1] = g_strdup_printf("-hda");
argv[2] = g_strdup_printf("%s", img);
argv[0] = g_strdup(gArgv[0]);
argv[1] = g_strdup("-hda");
argv[2] = g_strdup(img);
argv[3] = NULL;
printf("Using argc %d argv %s -hda %s\n", 3, bin, img);
// printf("Using argc %d argv %s -hda %s\n", 3, gArgv[0], img);
[self startEmulationWithArgc:3 argv:(char**)argv];
}