From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2Tta-0005m4-R1 for qemu-devel@nongnu.org; Sun, 12 Jan 2014 17:52:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2TtZ-000524-Hr for qemu-devel@nongnu.org; Sun, 12 Jan 2014 17:52:42 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:44742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2TtZ-00050Z-Ao for qemu-devel@nongnu.org; Sun, 12 Jan 2014 17:52:41 -0500 From: Peter Maydell Date: Sun, 12 Jan 2014 22:52:34 +0000 Message-Id: <1389567158-31066-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1389567158-31066-1-git-send-email-peter.maydell@linaro.org> References: <1389567158-31066-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 5/9] ui/cocoa: Fix code for starting QEMU via image file load dialog List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel@nongnu.org, Aurelien Jarno 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 Message-id: 1386543546-31919-6-git-send-email-peter.maydell@linaro.org --- ui/cocoa.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index fd55044..b90b782 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -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]; } -- 1.8.5