From patchwork Thu Dec 9 11:10:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 74920 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 08ED9B6F14 for ; Fri, 10 Dec 2010 02:59:06 +1100 (EST) Received: from localhost ([127.0.0.1]:39094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQitb-0007Mh-Bf for incoming@patchwork.ozlabs.org; Thu, 09 Dec 2010 10:59:03 -0500 Received: from [140.186.70.92] (port=44617 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQeNB-0006Hm-Aq for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQeN9-0000HH-Ts for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQeN9-0000H3-KK for qemu-devel@nongnu.org; Thu, 09 Dec 2010 06:09:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB9B9DSn012863 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 9 Dec 2010 06:09:14 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB9B91nt014178; Thu, 9 Dec 2010 06:09:13 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Thu, 9 Dec 2010 12:10:03 +0100 Message-Id: <1291893010-29223-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1291893010-29223-1-git-send-email-kwolf@redhat.com> References: <1291893010-29223-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option 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 From: Jes Sorensen This patch changes qemu-img to exit if an unknown option is detected, instead of trying to continue with a set of arguments which may be incorrect. Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf --- qemu-img.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index cc77048..6fd52e9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -309,6 +309,7 @@ static int img_create(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break; @@ -477,6 +478,7 @@ static int img_check(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break; @@ -555,6 +557,7 @@ static int img_commit(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break; @@ -693,6 +696,7 @@ static int img_convert(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break; @@ -1097,6 +1101,7 @@ static int img_info(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break; @@ -1174,6 +1179,7 @@ static int img_snapshot(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); return 0; @@ -1289,6 +1295,7 @@ static int img_rebase(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); return 0; @@ -1503,6 +1510,7 @@ static int img_resize(int argc, char **argv) break; } switch(c) { + case '?': case 'h': help(); break;