sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg-ShellApp: Provide fully-qualified path to shell scripts

Browse Source 
Provide fully-qualified path to shell scripts

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 <jim_dailey@dell.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Jim.Dailey@dell.com
2018-10-30 05:14:51 +08:00
committed by Ruiyu Ni
parent 9ba404d664
commit 764c21f4aa
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ShellPkg/Application/Shell/Shell.c
View File

@ -3,6 +3,7 @@
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<BR>
Copyright 2015-2018 Dell Technologies.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1208,6 +1209,7 @@ DoStartupScript(
UINTN Delay; UINTN Delay;
EFI_INPUT_KEY Key; EFI_INPUT_KEY Key;
CHAR16 *FileStringPath; CHAR16 *FileStringPath;
CHAR16 *FullFileStringPath;
UINTN NewSize; UINTN NewSize;
Key.UnicodeChar = CHAR_NULL; Key.UnicodeChar = CHAR_NULL;
@ -1275,7 +1277,13 @@ DoStartupScript(
FileStringPath = LocateStartupScript (ImagePath, FilePath); FileStringPath = LocateStartupScript (ImagePath, FilePath);
if (FileStringPath != NULL) { if (FileStringPath != NULL) {
Status = RunScriptFile (FileStringPath, NULL, L"", ShellInfoObject.NewShellParametersProtocol); FullFileStringPath = FullyQualifyPath(FileStringPath);
if (FullFileStringPath == NULL) {
Status = RunScriptFile (FileStringPath, NULL, FileStringPath, ShellInfoObject.NewShellParametersProtocol);
} else {
Status = RunScriptFile (FullFileStringPath, NULL, FullFileStringPath, ShellInfoObject.NewShellParametersProtocol);
FreePool(FullFileStringPath);
}
FreePool (FileStringPath); FreePool (FileStringPath);
} else { } else {
// //
@ -2429,6 +2437,7 @@ RunCommandOrFile(
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS StartStatus; EFI_STATUS StartStatus;
CHAR16 *CommandWithPath; CHAR16 *CommandWithPath;
CHAR16 *FullCommandWithPath;
EFI_DEVICE_PATH_PROTOCOL *DevPath; EFI_DEVICE_PATH_PROTOCOL *DevPath;
SHELL_STATUS CalleeExitStatus; SHELL_STATUS CalleeExitStatus;
@ -2474,7 +2483,13 @@ RunCommandOrFile(
} }
switch (Type) { switch (Type) {
case Script_File_Name: case Script_File_Name:
Status = RunScriptFile (CommandWithPath, NULL, CmdLine, ParamProtocol); FullCommandWithPath = FullyQualifyPath(CommandWithPath);
if (FullCommandWithPath == NULL) {
Status = RunScriptFile (CommandWithPath, NULL, CmdLine, ParamProtocol);
} else {
Status = RunScriptFile (FullCommandWithPath, NULL, CmdLine, ParamProtocol);
FreePool(FullCommandWithPath);
}
break; break;
case Efi_Application: case Efi_Application:
// //
@ -2812,7 +2827,12 @@ RunScriptFileHandle (
DeleteScriptFileStruct(NewScriptFile); DeleteScriptFileStruct(NewScriptFile);
return (EFI_OUT_OF_RESOURCES); 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); ASSERT(NewScriptFile->Argv[LoopVar] == NULL);
NewScriptFile->Argv[LoopVar] = StrnCatGrow(&NewScriptFile->Argv[LoopVar], NULL, ShellInfoObject.NewShellParametersProtocol->Argv[LoopVar], 0); NewScriptFile->Argv[LoopVar] = StrnCatGrow(&NewScriptFile->Argv[LoopVar], NULL, ShellInfoObject.NewShellParametersProtocol->Argv[LoopVar], 0);
if (NewScriptFile->Argv[LoopVar] == NULL) { if (NewScriptFile->Argv[LoopVar] == NULL) {