From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A7DF41A1E56 for ; Wed, 31 Aug 2016 18:58:27 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 31 Aug 2016 18:58:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,264,1470726000"; d="scan'208";a="755754967" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by FMSMGA003.fm.intel.com with ESMTP; 31 Aug 2016 18:58:27 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 18:58:26 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 18:58:26 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.102]) by shsmsx102.ccr.corp.intel.com ([169.254.2.109]) with mapi id 14.03.0248.002; Thu, 1 Sep 2016 09:58:23 +0800 From: "Ni, Ruiyu" To: "Bi, Dandan" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" Thread-Topic: [edk2] [patch] ShellPkg: Add check for "dump" parameter in "bcfg" command Thread-Index: AQHSA0hcMeRSbY1C30qa1OvKEi4haaBj4g2Q Date: Thu, 1 Sep 2016 01:58:23 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D58D45ACB@SHSMSX103.ccr.corp.intel.com> References: <1472621209-205768-1-git-send-email-dandan.bi@intel.com> In-Reply-To: <1472621209-205768-1-git-send-email-dandan.bi@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] ShellPkg: Add check for "dump" parameter in "bcfg" command X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2016 01:58:27 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ruiyu Ni > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Dandan Bi > Sent: Wednesday, August 31, 2016 1:27 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Carsey, Jaben > Subject: [edk2] [patch] ShellPkg: Add check for "dump" parameter in "bcfg= " > command >=20 > When user uses the command "bcfg driver|boot [dump [-v]]", the number > of command line value parameters (doesn't include the > flag) must be three. We can add this point to check whether using this > command correctly. >=20 > Cc: Ruiyu Ni > Cc: Jaben Carsey > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Dandan Bi > --- > ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | > 4 ++++ > ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.uni | > 3 ++- > 2 files changed, 6 insertions(+), 1 deletion(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > index 9baeecc..e2306bf 100644 > --- > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > +++ > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c > @@ -1294,10 +1294,14 @@ ShellCommandRunBcfg ( > if (ShellStatus =3D=3D SHELL_SUCCESS && CurrentOperation.Target < > BcfgTargetMax) { > for (ParamNumber =3D 2 ; ParamNumber < > ShellCommandLineGetCount(Package) && ShellStatus =3D=3D SHELL_SUCCESS; > ParamNumber++) { > CurrentParam =3D ShellCommandLineGetRawValue(Package, > ParamNumber); > if (gUnicodeCollation->StriColl(gUnicodeCollation, > (CHAR16*)CurrentParam, L"dump") =3D=3D 0) { > CurrentOperation.Type =3D BcfgTypeDump; > + if (ShellCommandLineGetCount(Package) > 3) { > + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY= ), > gShellBcfgHiiHandle, L"bcfg"); > + ShellStatus =3D SHELL_INVALID_PARAMETER; > + } > } else if (ShellCommandLineGetFlag(Package, L"-v")) { > ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV)= , > gShellBcfgHiiHandle, L"bcfg", L"-v (without dump)"); > ShellStatus =3D SHELL_INVALID_PARAMETER; > } else if (gUnicodeCollation->StriColl(gUnicodeCollation, > (CHAR16*)CurrentParam, L"add") =3D=3D 0) { > if ((ParamNumber + 3) >=3D ShellCommandLineGetCount(Package)) = { diff > --git > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.uni > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.uni > index 282494b..7668e49 100644 > --- > a/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.uni > +++ > b/ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.u > +++ ni > @@ -1,9 +1,9 @@ > // /** > // > // (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.
> -// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved. > +// Copyright (c) 2010 - 2016, Intel Corporation. All rights > +reserved.
> // This program and the accompanying materials // are licensed and made > available under the terms and conditions of the BSD License // which > accompanies this distribution. The full text of the license may be found = at // > http://opensource.org/licenses/bsd-license.php > // > @@ -30,10 +30,11 @@ > #string STR_GEN_NO_VALUE #language en-US "%H%s%N: Missing > argument for flag - '%H%s%N'\r\n" > #string STR_GEN_PARAM_INV #language en-US "%H%s%N: Invalid > argument - '%H%s%N'\r\n" > #string STR_GEN_NO_DRIVER_BOOT #language en-US "%H%s%N: Driver > or Boot must be selected.\r\n" > #string STR_GEN_BOOT_ONLY #language en-US "%H%s%N: Boot must > be selected for hot key options.\r\n" > #string STR_GEN_TOO_FEW #language en-US "%H%s%N: Too few > arguments.\r\n" > +#string STR_GEN_TOO_MANY #language en-US "%H%s%N: Too many > arguments\r\n" > #string STR_GEN_FILE_OPEN_FAIL #language en-US "%H%s%N: Cannot > open file - '%H%s%N'\r\n" > #string STR_GEN_FIND_FAIL #language en-US "%H%s%N: File not foun= d > - '%H%s%N'\r\n" > #string STR_GEN_OUT_MEM #language en-US "%H%s%N: Memory > allocation was not successful.\r\n" > #string STR_BCFG_WRITE_FAIL #language en-US "%H%s%N: Unable to > write to '%H%s%N'\r\n" > #string STR_BCFG_READ_FAIL #language en-US "%H%s%N: Unable to > read from '%H%s%N'\r\n" > -- > 1.9.5.msysgit.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel