From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) (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 40B4420945531 for ; Thu, 8 Jun 2017 09:13:43 -0700 (PDT) Received: from G9W8453.americas.hpqcorp.net (exchangepmrr1.us.hpecorp.net [16.216.160.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5009.houston.hpe.com (Postfix) with ESMTPS id BC15E8C for ; Thu, 8 Jun 2017 16:14:51 +0000 (UTC) Received: from G4W9119.americas.hpqcorp.net (2002:10d2:14d6::10d2:14d6) by G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Thu, 8 Jun 2017 16:14:24 +0000 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (15.241.52.11) by G4W9119.americas.hpqcorp.net (16.210.20.214) with Microsoft SMTP Server (TLS) id 15.0.1178.4 via Frontend Transport; Thu, 8 Jun 2017 16:14:24 +0000 Received: from CS1PR84MB0024.NAMPRD84.PROD.OUTLOOK.COM (10.162.189.142) by CS1PR84MB0024.NAMPRD84.PROD.OUTLOOK.COM (10.162.189.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1157.12; Thu, 8 Jun 2017 16:14:21 +0000 Received: from CS1PR84MB0024.NAMPRD84.PROD.OUTLOOK.COM ([10.162.189.142]) by CS1PR84MB0024.NAMPRD84.PROD.OUTLOOK.COM ([10.162.189.142]) with mapi id 15.01.1157.012; Thu, 8 Jun 2017 16:14:21 +0000 From: "Shah, Tapan" To: "Carsey, Jaben" , "Ni, Ruiyu" CC: "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH] ShellPkg/alias: Return status for alias deletion Thread-Index: AQHS3p8FvY0wpi4uv0yFy8KbBoSum6IXhMCAgADVC4CAAAMFAIAABn9wgAEmdbCAAG/KgIABKNHQgAAD1ACAAAC9wA== Date: Thu, 8 Jun 2017 16:14:21 +0000 Message-ID: References: <20170606082904.195040-1-ruiyu.ni@intel.com>, <734D49CCEBEEF84792F5B80ED585239D5B988FB6@SHSMSX104.ccr.corp.intel.com> <3DAAB008-D40F-48B1-B8AA-0F418CA19FE3@intel.com> , In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=hpe.com; x-originating-ip: [76.187.64.133] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CS1PR84MB0024; 7:WUxBFrapJcb/peBl8ZipCT81jIVDUUKlMFf5kFcgnknkE7MQKGLzPIi1urTEbKMP4OtcrlH91c7G8ETE8CbkDKt6wDe+gUqNADvC+q0yJmQJEm8X+k0NbVJJljSe4KFQoenxld5wgHszEt/MReYZD41msEUQ9xGd7lxnizEomF1Jo+aKcRpGN7FLi805BZUE/9XXGEZgjTehknRDQxhkqfWySEvtF7HFXrWZMcC6ydBsMr9IwWWE9TD/cqAoRbZ6KfouMj+nuBTiPKXmQrt1qC8Zd2lUI9vAem0W3riPo1eS4T4Ih6nUigrwY1hlUohbYVAKfWSSHfi1rthUtX/+hA== x-ms-traffictypediagnostic: CS1PR84MB0024: x-ms-office365-filtering-correlation-id: d1936ec7-7dfe-4abc-f876-08d4ae896c57 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081)(201702281549075); SRVR:CS1PR84MB0024; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(227479698468861)(162533806227266)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CS1PR84MB0024; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CS1PR84MB0024; x-forefront-prvs: 0332AACBC3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(39450400003)(39840400002)(39860400002)(39850400002)(39400400002)(39410400002)(377454003)(13464003)(25786009)(122556002)(7696004)(93886004)(305945005)(6436002)(7736002)(3846002)(6246003)(9686003)(55016002)(53936002)(38730400002)(3660700001)(74316002)(102836003)(6306002)(66066001)(229853002)(53546009)(2950100002)(3280700002)(2906002)(86362001)(77096006)(6506006)(76176999)(189998001)(2900100001)(4326008)(54356999)(50986999)(14454004)(966005)(81166006)(8676002)(33656002)(478600001)(5660300001)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:CS1PR84MB0024; H:CS1PR84MB0024.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jun 2017 16:14:21.5558 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR84MB0024 X-OriginatorOrg: hpe.com Subject: Re: [PATCH] ShellPkg/alias: Return status for alias deletion 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, 08 Jun 2017 16:13:43 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Correct.=20 STR_GEN_ERR_NOT_FOUND should be "alias: '' does not exist." -----Original Message----- From: Carsey, Jaben [mailto:jaben.carsey@intel.com]=20 Sent: Thursday, June 08, 2017 11:10 AM To: Shah, Tapan ; Ni, Ruiyu Cc: edk2-devel@lists.01.org Subject: RE: [edk2] [PATCH] ShellPkg/alias: Return status for alias deletio= n Tapa, Is your thinking like this: if (EFI_ERROR(Status)) { if (Status =3D=3D EFI_ACCESS_DENIED) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLeve= l3HiiHandle, L"alias"); ShellStatus =3D SHELL_ACCESS_DENIED; } else if (Status =3D=3D EFI_NOT_FOUND) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_NOT_FOUND), gSh= ellLevel3HiiHandle, L"alias"); ShellStatus =3D SHELL_NOT_FOUND; } else { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), = gShellLevel3HiiHandle, L"alias", Status); ShellStatus =3D SHELL_DEVICE_ERROR; } } Then add a STR_GEN_ERR_NOT_FOUND string? > -----Original Message----- > From: Shah, Tapan [mailto:tapandshah@hpe.com] > Sent: Thursday, June 08, 2017 9:01 AM > To: Ni, Ruiyu > Cc: Carsey, Jaben ; edk2-devel@lists.01.org > Subject: RE: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > deletion > Importance: High >=20 > EFI_NOT_FOUND should be handled with the token I mentioned for a clear=20 > message. All other errors should be printed using STR_GEN_ERR_UK. >=20 > -----Original Message----- > From: Ni, Ruiyu [mailto:ruiyu.ni@intel.com] > Sent: Wednesday, June 07, 2017 5:14 PM > To: Shah, Tapan > Cc: Carsey, Jaben ; edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > deletion >=20 > I did think about changing as you suggested. But other errors also may=20 > be DEVICE_ERROR in case the NV storage has some problem. So I did not=20 > change it. > Sorry for not replying to you before checking in the code. >=20 > Send from mobile phone >=20 > > =1B$B:_=1B(B 2017=1B$BG/=1B(B6=1B$B7n=1B(B7=1B$BF|!$2<8a=1B(B11:35=1B$B= !$=1B(BShah, Tapan =1B$B =1B$BF;!'=1B(B > > > > Ray, > > I don't see your check-in includes the change I proposed below. > > > > Tapan > > > > > > -----Original Message----- > > From: Shah, Tapan > > Sent: Tuesday, June 06, 2017 5:03 PM > > To: 'Carsey, Jaben' ; Ni, Ruiyu=20 > > ; edk2-devel@lists.01.org > > Subject: RE: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > > deletion > > > > Instead of using STR_GEN_ERR_UK here, it would be better to define=20 > > a > new string token as "alias: '' does not exist." > > > >>>> + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN=20 > >>>> + (STR_GEN_ERR_UK), > >>>> gShellLevel3HiiHandle, L"alias", Status); > > > > Reviewed-by: Tapan Shah > > > > -----Original Message----- > > From: Carsey, Jaben [mailto:jaben.carsey@intel.com] > > Sent: Tuesday, June 06, 2017 4:37 PM > > To: Ni, Ruiyu ; edk2-devel@lists.01.org > > Cc: Shah, Tapan > > Subject: RE: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > > deletion > > > > I am good with more clear error information coming to the user. > > Reviewed-by: Jaben Carsey > > > >> -----Original Message----- > >> From: Ni, Ruiyu > >> Sent: Tuesday, June 06, 2017 2:26 PM > >> To: Ni, Ruiyu ; edk2-devel@lists.01.org > >> Cc: Tapan Shah ; Carsey, Jaben=20 > >> > >> Subject: Re: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > >> deletion > >> Importance: High > >> > >> Including Jaben for review. > >> > >> Send from mobile phone > >> > >>> =1B$B:_=1B(B 2017=1B$BG/=1B(B6=1B$B7n=1B(B6=1B$BF|!$2<8a=1B(B4:43=1B$= B!$=1B(BNi, Ruiyu =1B$B >>> > >>> Including Tapan. > >>> > >>> Thanks/Ray > >>> > >>>> -----Original Message----- > >>>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On=20 > >>>> Behalf Of > >> Ruiyu > >>>> Ni > >>>> Sent: Tuesday, June 6, 2017 4:29 PM > >>>> To: edk2-devel@lists.01.org > >>>> Subject: [edk2] [PATCH] ShellPkg/alias: Return status for alias=20 > >>>> deletion > >>>> > >>>> Contributed-under: TianoCore Contribution Agreement 1.0 > >>>> Signed-off-by: Ruiyu Ni > >>>> Cc: Tapan Shah > >>>> --- > >>>> ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c | 11 > >>>> ++++++++++- > >>>> 1 file changed, 10 insertions(+), 1 deletion(-) > >>>> > >>>> diff --git a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c > >>>> b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c > >>>> index 5a3b7e5913..7277bd4b90 100644 > >>>> --- a/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c > >>>> +++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/Alias.c > >>>> @@ -2,7 +2,7 @@ > >>>> Main file for Alias shell level 3 function. > >>>> > >>>> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
> >>>> - Copyright (c) 2009 - 2016, Intel Corporation. All rights=20 > >>>> reserved.
> >>>> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved= . > >>>> +
> >>>> This program and the accompanying materials are licensed and=20 > >>>> made available under the terms and conditions of the > >> BSD > >>>> License > >>>> which accompanies this distribution. The full text of the=20 > >>>> license may be > >> found > >>>> at @@ -151,6 +151,15 @@ ShellCommandRunAlias ( > >>>> // delete an alias > >>>> // > >>>> Status =3D gEfiShellProtocol->SetAlias(Param1, NULL, TRUE,=20 > >>>> FALSE); > >>>> + if (EFI_ERROR(Status)) { > >>>> + if (Status =3D=3D EFI_ACCESS_DENIED) { > >>>> + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN=20 > >>>> + (STR_GEN_ERR_AD), > >>>> gShellLevel3HiiHandle, L"alias"); > >>>> + ShellStatus =3D SHELL_ACCESS_DENIED; > >>>> + } else { > >>>> + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN=20 > >>>> + (STR_GEN_ERR_UK), > >>>> gShellLevel3HiiHandle, L"alias", Status); > >>>> + ShellStatus =3D SHELL_DEVICE_ERROR; > >>>> + } > >>>> + } > >>>> } else if (ShellCommandLineGetCount(Package) =3D=3D 3) { > >>>> // > >>>> // must be adding an alias > >>>> -- > >>>> 2.12.2.windows.2 > >>>> > >>>> _______________________________________________ > >>>> edk2-devel mailing list > >>>> edk2-devel@lists.01.org > >>>> https://lists.01.org/mailman/listinfo/edk2-devel