From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 50B6521A07A82 for ; Wed, 24 Oct 2018 22:47:22 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2018 22:47:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,423,1534834800"; d="scan'208";a="84289736" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.11]) ([10.239.9.11]) by orsmga008.jf.intel.com with ESMTP; 24 Oct 2018 22:47:20 -0700 To: "Carsey, Jaben" , "Jim.Dailey@dell.com" , "edk2-devel@lists.01.org" References: <1185bb5068c0413794f299f573401b74@ausx13mps335.AMER.DELL.COM> From: "Ni, Ruiyu" Message-ID: <155260e4-a6ff-fe2e-c08c-91047edb89a8@Intel.com> Date: Thu, 25 Oct 2018 13:48:37 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: Subject: Re: [PATCH 2/2] ShellPkg-Shell App: Provide fully-qualified path to shell scripts X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 05:47:22 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/25/2018 2:03 AM, Carsey, Jaben wrote: > Looks good to me. > Ray? > > Reviewed-by: Jaben Carsey Reviewed-by: Ruiyu Ni > > p.s. Ray if you agree you can RB and I will handle the push. > >> -----Original Message----- >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >> Jim.Dailey@dell.com >> Sent: Wednesday, October 24, 2018 9:36 AM >> To: edk2-devel@lists.01.org >> Cc: Ni, Ruiyu ; Carsey, Jaben >> Subject: [edk2] [PATCH 2/2] ShellPkg-Shell App: Provide fully-qualified path >> to shell scripts >> Importance: High >> >> Section 3.6.2 of version 2.2 of the shell specification requires that >> the first positional argument (i.e. arg 0) of a shell script resolves >> to "the full path name of the script itself." >> >> Ensure that the startup script and any scripts launched by the shell >> meet this requirement. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Jim Dailey >> --- >> ShellPkg/Application/Shell/Shell.c | 12 ++++++++++-- >> 1 file changed, 10 insertions(+), 2 deletions(-) >> >> diff --git a/ShellPkg/Application/Shell/Shell.c >> b/ShellPkg/Application/Shell/Shell.c >> index 6185b6ac80..fe88177d57 100644 >> --- a/ShellPkg/Application/Shell/Shell.c >> +++ b/ShellPkg/Application/Shell/Shell.c >> @@ -3,6 +3,7 @@ >> >> Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
>> (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.
>> + Copyright 2018 Dell Technologies.
>> 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 >> @@ -1275,7 +1276,8 @@ DoStartupScript( >> >> FileStringPath = LocateStartupScript (ImagePath, FilePath); >> if (FileStringPath != NULL) { >> - Status = RunScriptFile (FileStringPath, NULL, L"", >> ShellInfoObject.NewShellParametersProtocol); >> + FileStringPath = FullyQualifyPath(&FileStringPath); >> + Status = RunScriptFile (FileStringPath, NULL, FileStringPath, >> ShellInfoObject.NewShellParametersProtocol); >> FreePool (FileStringPath); >> } else { >> // >> @@ -2474,6 +2476,7 @@ RunCommandOrFile( >> } >> switch (Type) { >> case Script_File_Name: >> + CommandWithPath = FullyQualifyPath(&CommandWithPath); >> Status = RunScriptFile (CommandWithPath, NULL, CmdLine, >> ParamProtocol); >> break; >> case Efi_Application: >> @@ -2812,7 +2815,12 @@ RunScriptFileHandle ( >> DeleteScriptFileStruct(NewScriptFile); >> return (EFI_OUT_OF_RESOURCES); >> } >> - for (LoopVar = 0 ; LoopVar < 10 && LoopVar < NewScriptFile->Argc; >> LoopVar++) { >> + // >> + // Put the full path of the script file into Argv[0] as required by section >> + // 3.6.2 of version 2.2 of the shell specification. >> + // >> + NewScriptFile->Argv[0] = StrnCatGrow(&NewScriptFile->Argv[0], NULL, >> NewScriptFile->ScriptName, 0); >> + for (LoopVar = 1 ; LoopVar < 10 && LoopVar < NewScriptFile->Argc; >> LoopVar++) { >> ASSERT(NewScriptFile->Argv[LoopVar] == NULL); >> NewScriptFile->Argv[LoopVar] = StrnCatGrow(&NewScriptFile- >>> Argv[LoopVar], NULL, ShellInfoObject.NewShellParametersProtocol- >>> Argv[LoopVar], 0); >> if (NewScriptFile->Argv[LoopVar] == NULL) { >> -- >> 2.17.0.windows.1 >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel -- Thanks, Ray