From patchwork Mon Feb 3 18:18:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11363177 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2785A17E0 for ; Mon, 3 Feb 2020 18:19:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1E772086A for ; Mon, 3 Feb 2020 18:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580753954; bh=WU7BsIvYhoveOrZ4wNAlFXzim8ittcmhupEoatpr+No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I0ZRyEmOOD9bW5l8ywizgNZmU2/9r9w5VRDLFsjTODZI1QyF0myt9nkYp3c/CUmMy C5x5gNw0EQWYvsZl0Clx2VjBi3jLhnhD7A44OomfDxhR5OdHnNqhKVLbcBR29R9f3Z vtRtCUu+YaGFiSwHpI4bH3XpYcGlJq6lXtY2t91U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729584AbgBCSTN (ORCPT ); Mon, 3 Feb 2020 13:19:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:33398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728419AbgBCSTN (ORCPT ); Mon, 3 Feb 2020 13:19:13 -0500 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E8332086A; Mon, 3 Feb 2020 18:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580753952; bh=WU7BsIvYhoveOrZ4wNAlFXzim8ittcmhupEoatpr+No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x+50PF8SM+1VXw8cU2ohpVfjODhnlPAdHFzanHMvXTG13QO1Xai0rUzyIEv0xk2Sf 1DxpRqwYGmnbM64mEr68kcy86GS0ZmRmgh/xfcSBgkGQsWOeONhQGUTlIzH2kKIeP2 rtY7E9UlR2clxsJCMJo1dxCIR8HDOvTaXNOGIQH4= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, keyrings@vger.kernel.org Subject: [PATCH v2 1/3] common/rc: handle option with argument in _require_xfs_io_command() Date: Mon, 3 Feb 2020 10:18:53 -0800 Message-Id: <20200203181855.42987-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200203181855.42987-1-ebiggers@kernel.org> References: <20200203181855.42987-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: keyrings-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org From: Eric Biggers Fix _require_xfs_io_command() to handle options that take arguments when the argument is shown in the help text. E.g., it didn't work to run: _require_xfs_io_command "add_enckey" "-k" because the relevant line of the help text is: -k KEY_ID -- ID of fscrypt-provisioning key containing the raw key ... but the grep command only matched "-k --", not "-k KEY_ID --". Signed-off-by: Eric Biggers --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b4a77a21..0306e93c 100644 --- a/common/rc +++ b/common/rc @@ -2248,7 +2248,7 @@ _require_xfs_io_command() [ -n "$param" ] || return if [ -z "$param_checked" ]; then - $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \ + $XFS_IO_PROG -c "help $command" | grep -E -q "^ $param ([a-zA-Z_]+ )?--" || \ _notrun "xfs_io $command doesn't support $param" else # xfs_io could result in "command %c not supported" if it was