From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 AB14821A02920 for ; Thu, 1 Jun 2017 19:30:58 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 01 Jun 2017 19:32:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,282,1493708400"; d="scan'208";a="109942899" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga006.fm.intel.com with ESMTP; 01 Jun 2017 19:32:00 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 1 Jun 2017 19:32:00 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 1 Jun 2017 19:32:00 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.151]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.56]) with mapi id 14.03.0319.002; Fri, 2 Jun 2017 10:31:56 +0800 From: "Ni, Ruiyu" To: "Carsey, Jaben" , "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: AQHS2ugEjO2x3Mjf7U+DDAKW7Lk49qIQGazggAB6rQD//4/SIIAAAP/wgAC1fNA= Date: Fri, 2 Jun 2017 02:31:55 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5B982AEF@SHSMSX104.ccr.corp.intel.com> References: <20170601141136.145340-1-ruiyu.ni@intel.com> <734D49CCEBEEF84792F5B80ED585239D5B982065@SHSMSX104.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTk3NDVmODItODgzMi00YzNlLTg3NTItNGJjMTdlZjIwNzg2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkhoRGVSSTVhR1haU3F5MXdDWHVZaWQ0K0R0TVNDbnZNOVZJM3lhQmYzZ2s9In0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] 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: Fri, 02 Jun 2017 02:30:58 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jaben, Old code also honors the returning status when delete an alias. Please check the line I marked as "<----------" in below. // // We must be trying to remove one if Alias is NULL // if (Alias =3D=3D 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); Status =3D (gRT->SetVariable((CHAR16*)Alias, &gShellAliasGuid, EFI_VARI= ABLE_BOOTSERVICE_ACCESS|(Volatile?0:EFI_VARIABLE_NON_VOLATILE), StrSize(Com= mand), (VOID*)Command)); } Regards, Ray >-----Original Message----- >From: Carsey, Jaben >Sent: Thursday, June 1, 2017 11:42 PM >To: Ni, Ruiyu ; edk2-devel@lists.01.org >Cc: Kinney, Michael D ; Shah, Tapan (tapandsha= h@hpe.com) >Subject: RE: [PATCH] ShellPkg/alias: Fix bug to support upper-case alias > >I think we have to leave the behavior the same. The spec says this: " If = the environment variable does not exist and the >Value is an empty string, there is no action." > >I do not think we can change that to an error return without a spec change= . > >-Jaben > >> -----Original Message----- >> From: Carsey, Jaben >> Sent: Thursday, June 01, 2017 8:40 AM >> To: Ni, Ruiyu ; edk2-devel@lists.01.org >> Cc: Kinney, Michael D ; Shah, Tapan >> (tapandshah@hpe.com) >> Subject: RE: [PATCH] ShellPkg/alias: Fix bug to support upper-case alias >> >> I just think we may want to have the behavior act the same as it does to= day >> for delete. >> >> > -----Original Message----- >> > From: Ni, Ruiyu >> > Sent: Thursday, June 01, 2017 8:19 AM >> > To: Carsey, Jaben ; edk2-devel@lists.01.org >> > Cc: Kinney, Michael D ; Shah, Tapan >> > (tapandshah@hpe.com) >> > Subject: RE: [PATCH] ShellPkg/alias: Fix bug to support upper-case ali= as >> > Importance: High >> > >> > I was using AliasLower. >> > I am not sure whether the change is smallest. But I tried best to make= the >> > new implementation cleaner. I think that's what we really need. >> > >> > Did you see any issue if we return EFI_NOT_FOUND (when variable doesn'= t >> > exist)? >> > >> > Regards, >> > Ray >> > >> > >-----Original Message----- >> > >From: Carsey, Jaben >> > >Sent: Thursday, June 1, 2017 11:02 PM >> > >To: Ni, Ruiyu ; edk2-devel@lists.01.org >> > >Cc: Kinney, Michael D ; Shah, Tapan >> > (tapandshah@hpe.com) >> > >Subject: RE: [PATCH] ShellPkg/alias: Fix bug to support upper-case al= ias >> > > >> > >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 exist." >> > > >> > >-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 alia= s >> > >> Importance: High >> > >> >> > >> 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. >> > >> >> > >> 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(-) >> > >> >> > >> 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; >> > >> >> > >> - // 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, &gShellAliasGui= d, >> 0, >> > 0, >> > >> NULL)); >> > >> - } else { >> > >> - // >> > >> - // Add and replace are the same >> > >> - // >> > >> - >> > >> - // We dont check the error return on purpose since the variabl= e may >> > not >> > >> exist. >> > >> - gRT->SetVariable((CHAR16*)Command, &gShellAliasGuid, 0, 0, >> NULL); >> > >> + Alias =3D Command; >> > >> + DeleteAlias =3D TRUE; >> > >> + } >> > >> + ASSERT (Alias !=3D NULL); >> > >> >> > >> - 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); >> > >> >> > >> - if (Alias !=3D NULL) { >> > >> - FreePool (AliasLower); >> > >> + if (DeleteAlias) { >> > >> + Status =3D gRT->SetVariable (AliasLower, &gShellAliasGuid, 0, = 0, NULL); >> > >> + } 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; >> > >> } >> > >> >> > >> -- >> > >> 2.12.2.windows.2