From patchwork Mon Jun 30 03:54:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gui Hecheng X-Patchwork-Id: 4445511 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7D744BEEAA for ; Mon, 30 Jun 2014 03:59:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B60CB202DD for ; Mon, 30 Jun 2014 03:59:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C271B202C8 for ; Mon, 30 Jun 2014 03:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074AbaF3D7o (ORCPT ); Sun, 29 Jun 2014 23:59:44 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:38133 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754010AbaF3D7n (ORCPT ); Sun, 29 Jun 2014 23:59:43 -0400 X-IronPort-AV: E=Sophos;i="5.00,804,1396972800"; d="scan'208";a="32600495" Received: from localhost (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Jun 2014 11:56:56 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s5U3xZBG020262; Mon, 30 Jun 2014 11:59:35 +0800 Received: from localhost.localdomain (10.167.226.111) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 30 Jun 2014 11:59:41 +0800 From: Gui Hecheng To: CC: , Gui Hecheng Subject: [PATCH v2 2/2] btrfs-progs: limit minimal num of args for btrfs-image Date: Mon, 30 Jun 2014 11:54:12 +0800 Message-ID: <1404100452-8894-2-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1404100452-8894-1-git-send-email-guihc.fnst@cn.fujitsu.com> References: <20140627123528.GC1553@twin.jikos.cz> <1404100452-8894-1-git-send-email-guihc.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.111] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The btrfs-image requires at least 2 args to run, one for the source dev/file, the other for the target dev/file. This patch depends on patch: btrfs-progs: move the check_argc_* functions into utils.c Signed-off-by: Gui Hecheng --- changelog v1->v2: use check_argc_min instead --- btrfs-image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/btrfs-image.c b/btrfs-image.c index e0aabfd..3b27155 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -2521,6 +2521,10 @@ int main(int argc, char *argv[]) } argc = argc - optind; + set_argv0(argv); + if (check_argc_min(argc, 2)) + print_usage(); + dev_cnt = argc - 1; if (create) {