Reviewed-by: Jaben Carsey <[email protected]>
> -----Original Message----- > From: Bi, Dandan > Sent: Wednesday, August 31, 2016 6:09 PM > To: Carsey, Jaben <[email protected]>; [email protected] > Cc: Ni, Ruiyu <[email protected]> > Subject: RE: [edk2] [patch] ShellPkg: Add check for "dump" parameter in "bcfg" > command > Importance: High > > Our codes have already checked for "too few " case, and it will print " Too > few > arguments" in this situation. > > Thanks, > Dandan > > -----Original Message----- > From: Carsey, Jaben > Sent: Thursday, September 1, 2016 12:12 AM > To: Bi, Dandan <[email protected]>; [email protected] > Cc: Ni, Ruiyu <[email protected]>; Carsey, Jaben <[email protected]> > Subject: RE: [edk2] [patch] ShellPkg: Add check for "dump" parameter in "bcfg" > command > > Should we check for too few also? What if the user sends 2 params? > > > -----Original Message----- > > From: edk2-devel [mailto:[email protected]] On Behalf Of > > Dandan Bi > > Sent: Tuesday, August 30, 2016 10:27 PM > > To: [email protected] > > Cc: Ni, Ruiyu <[email protected]>; Carsey, Jaben > > <[email protected]> > > Subject: [edk2] [patch] ShellPkg: Add check for "dump" parameter in "bcfg" > > command > > Importance: High > > > > 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. > > > > Cc: Ruiyu Ni <[email protected]> > > Cc: Jaben Carsey <[email protected]> > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Dandan Bi <[email protected]> > > --- > > ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.c | > > 4 ++++ > > ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.uni > > | > > 3 ++- > > 2 files changed, 6 insertions(+), 1 deletion(-) > > > > 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 == SHELL_SUCCESS && CurrentOperation.Target < > > BcfgTargetMax) { > > for (ParamNumber = 2 ; ParamNumber < > > ShellCommandLineGetCount(Package) && ShellStatus == SHELL_SUCCESS; > > ParamNumber++) { > > CurrentParam = ShellCommandLineGetRawValue(Package, > > ParamNumber); > > if (gUnicodeCollation->StriColl(gUnicodeCollation, > > (CHAR16*)CurrentParam, L"dump") == 0) { > > CurrentOperation.Type = BcfgTypeDump; > > + if (ShellCommandLineGetCount(Package) > 3) { > > + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN > > + (STR_GEN_TOO_MANY), > > gShellBcfgHiiHandle, L"bcfg"); > > + ShellStatus = 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 = SHELL_INVALID_PARAMETER; > > } else if (gUnicodeCollation->StriColl(gUnicodeCollation, > > (CHAR16*)CurrentParam, L"add") == 0) { > > if ((ParamNumber + 3) >= 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.uni > > @@ -1,9 +1,9 @@ > > // /** > > // > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company, > > L.P.<BR> -// Copyright (c) 2010 - 2014, Intel Corporation. All rights > > reserved.<BR> > > +// Copyright (c) 2010 - 2016, Intel Corporation. All rights > > +reserved.<BR> > > // 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 found > > - '%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 > > > > _______________________________________________ > > edk2-devel mailing list > > [email protected] > > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
