From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9A40221AE30D9 for ; Thu, 1 Jun 2017 08:00:51 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jun 2017 08:01:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,280,1493708400"; d="scan'208";a="1155405372" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga001.fm.intel.com with ESMTP; 01 Jun 2017 08:01:52 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.37]) by fmsmsx107.amr.corp.intel.com ([169.254.6.237]) with mapi id 14.03.0319.002; Thu, 1 Jun 2017 08:01:52 -0700 From: "Carsey, Jaben" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" , "Shah, Tapan (tapandshah@hpe.com)" Thread-Topic: [PATCH] ShellPkg/alias: Fix bug to support upper-case alias Thread-Index: AQHS2uEDd7qCKkC6+USruCHnfaqC5qIQGazg Date: Thu, 1 Jun 2017 15:01:51 +0000 Message-ID: References: <20170601141136.145340-1-ruiyu.ni@intel.com> In-Reply-To: <20170601141136.145340-1-ruiyu.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTk3NDVmODItODgzMi00YzNlLTg3NTItNGJjMTdlZjIwNzg2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkhoRGVSSTVhR1haU3F5MXdDWHVZaWQ0K0R0TVNDbnZNOVZJM3lhQmYzZ2s9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Subject: Re: [PATCH] ShellPkg/alias: Fix bug to support upper-case alias X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2017 15:00:51 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Why not just use the AliasLower and make the overall change much smaller? = Looks like the old version did the conversion, but didn't use the result. Also, I notice that we are now checking the return value upon delete, which= was explicitly not done in the old version. There was this comment before= : "We dont check the error return on purpose since the variable may not exi= st." -Jaben > -----Original Message----- > From: Ni, Ruiyu > Sent: Thursday, June 01, 2017 7:12 AM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben ; Kinney, Michael D > > Subject: [PATCH] ShellPkg/alias: Fix bug to support upper-case alias > Importance: High >=20 > alias in UEFI Shell is case insensitive. > Old code saves the alias to variable storage without > converting the alias to lower-case, which results > upper case alias setting doesn't work. > The patch converts the alias to lower case before saving > to variable storage. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Jaben Carsey > Cc: Michael D Kinney > --- > ShellPkg/Application/Shell/ShellProtocol.c | 50 +++++++++++++++---------= --- > --- > 1 file changed, 25 insertions(+), 25 deletions(-) >=20 > diff --git a/ShellPkg/Application/Shell/ShellProtocol.c > b/ShellPkg/Application/Shell/ShellProtocol.c > index 347e162e62..b3b8acc0d0 100644 > --- a/ShellPkg/Application/Shell/ShellProtocol.c > +++ b/ShellPkg/Application/Shell/ShellProtocol.c > @@ -3463,40 +3463,40 @@ InternalSetAlias( > { > EFI_STATUS Status; > CHAR16 *AliasLower; > + BOOLEAN DeleteAlias; >=20 > - // Convert to lowercase to make aliases case-insensitive > - if (Alias !=3D NULL) { > - AliasLower =3D AllocateCopyPool (StrSize (Alias), Alias); > - if (AliasLower =3D=3D NULL) { > - return EFI_OUT_OF_RESOURCES; > - } > - ToLower (AliasLower); > - } else { > - AliasLower =3D NULL; > - } > - > - // > - // We must be trying to remove one if Alias is NULL > - // > + DeleteAlias =3D FALSE; > if (Alias =3D=3D NULL) { > // > + // We must be trying to remove one if Alias is NULL > // remove an alias (but passed in COMMAND parameter) > // > - Status =3D (gRT->SetVariable((CHAR16*)Command, &gShellAliasGuid, 0, = 0, > NULL)); > - } else { > - // > - // Add and replace are the same > - // > - > - // We dont check the error return on purpose since the variable may = not > exist. > - gRT->SetVariable((CHAR16*)Command, &gShellAliasGuid, 0, 0, NULL); > + Alias =3D Command; > + DeleteAlias =3D TRUE; > + } > + ASSERT (Alias !=3D NULL); >=20 > - Status =3D (gRT->SetVariable((CHAR16*)Alias, &gShellAliasGuid, > EFI_VARIABLE_BOOTSERVICE_ACCESS|(Volatile?0:EFI_VARIABLE_NON_VOL > ATILE), StrSize(Command), (VOID*)Command)); > + // > + // Convert to lowercase to make aliases case-insensitive > + // > + AliasLower =3D AllocateCopyPool (StrSize (Alias), Alias); > + if (AliasLower =3D=3D NULL) { > + return EFI_OUT_OF_RESOURCES; > } > + ToLower (AliasLower); >=20 > - if (Alias !=3D NULL) { > - FreePool (AliasLower); > + if (DeleteAlias) { > + Status =3D gRT->SetVariable (AliasLower, &gShellAliasGuid, 0, 0, NUL= L); > + } else { > + Status =3D gRT->SetVariable ( > + AliasLower, &gShellAliasGuid, > + EFI_VARIABLE_BOOTSERVICE_ACCESS | (Volatile ? 0 : > EFI_VARIABLE_NON_VOLATILE), > + StrSize (Command), (VOID *) Command > + ); > } > + > + FreePool (AliasLower); > + > return Status; > } >=20 > -- > 2.12.2.windows.2