From patchwork Tue Mar 15 13:18:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 86983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 98443B700A for ; Wed, 16 Mar 2011 00:24:42 +1100 (EST) Received: from localhost ([127.0.0.1]:51359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzUEZ-0003TS-4v for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 09:24:23 -0400 Received: from [140.186.70.92] (port=37384 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzU8p-0007oO-Dg for qemu-devel@nongnu.org; Tue, 15 Mar 2011 09:18:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzU8o-0006R2-AI for qemu-devel@nongnu.org; Tue, 15 Mar 2011 09:18:27 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:38092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzU8n-0006Qh-St for qemu-devel@nongnu.org; Tue, 15 Mar 2011 09:18:26 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 34DD6CB028D for ; Tue, 15 Mar 2011 14:18:25 +0100 (CET) X-Virus-Scanned: amavisd-new at eu.adacore.com Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J3GdQSA6-3HE for ; Tue, 15 Mar 2011 14:18:22 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) by mel.act-europe.fr (Postfix) with ESMTP id 36517CB0282 for ; Tue, 15 Mar 2011 14:18:22 +0100 (CET) Received: by ulanbator.act-europe.fr (Postfix, from userid 501) id 39F3CCD8F34; Tue, 15 Mar 2011 14:18:22 +0100 (CET) From: Tristan Gingold To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2011 14:18:22 +0100 Message-Id: <1300195102-52156-1-git-send-email-gingold@adacore.com> X-Mailer: git-send-email 1.7.3.GIT X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH] cocoa: do not create a spurious window for -version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When invoked with -version, qemu will exit just after displaying the version, so there is no need to create a window. Also handles --XXX options. Signed-off-by: Tristan Gingold --- ui/cocoa.m | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 20f91bc..1ff1ac6 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -865,10 +865,19 @@ int main (int argc, const char * argv[]) { /* In case we don't need to display a window, let's not do that */ for (i = 1; i < argc; i++) { - if (!strcmp(argv[i], "-vnc") || - !strcmp(argv[i], "-nographic") || - !strcmp(argv[i], "-curses")) { + const char *opt = argv[i]; + + if (opt[0] == '-') { + /* Treat --foo the same as -foo. */ + if (opt[1] == '-') { + opt++; + } + if (!strcmp(opt, "-vnc") || + !strcmp(opt, "-nographic") || + !strcmp(opt, "-version") || + !strcmp(opt, "-curses")) { return qemu_main(gArgc, gArgv); + } } }