tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Fix the support for command line comments. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Chris Phillips <chrisp@hp.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16126 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2014-09-18 01:21:01 +00:00 committed by shenshushi
parent 9d66ee4d17
commit 4b6b543e77
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2139,11 +2139,24 @@ RunInternalCommand(
CHAR16 **Argv; CHAR16 **Argv;
SHELL_STATUS CommandReturnedStatus; SHELL_STATUS CommandReturnedStatus;
BOOLEAN LastError; BOOLEAN LastError;
CHAR16 *Walker;
CHAR16 *NewCmdLine;
NewCmdLine = AllocateCopyPool (StrSize (CmdLine), CmdLine);
if (NewCmdLine == NULL) {
return EFI_OUT_OF_RESOURCES;
}
for (Walker = NewCmdLine; Walker != NULL && *Walker != CHAR_NULL ; Walker++) {
if (*Walker == L'^' && *(Walker+1) == L'#') {
CopyMem(Walker, Walker+1, StrSize(Walker) - sizeof(Walker[0]));
}
}
// //
// get the argc and argv updated for internal commands // get the argc and argv updated for internal commands
// //
Status = UpdateArgcArgv(ParamProtocol, CmdLine, &Argv, &Argc); Status = UpdateArgcArgv(ParamProtocol, NewCmdLine, &Argv, &Argc);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
// //
// Run the internal command. // Run the internal command.
@ -2204,6 +2217,7 @@ RunInternalCommand(
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
} }
FreePool (NewCmdLine);
return (Status); return (Status);
} }
@ -2466,7 +2480,7 @@ RunCommand(
for (TempWalker = CleanOriginal; TempWalker != NULL && *TempWalker != CHAR_NULL; TempWalker++) { for (TempWalker = CleanOriginal; TempWalker != NULL && *TempWalker != CHAR_NULL; TempWalker++) {
if (*TempWalker == L'^') { if (*TempWalker == L'^') {
if (*(TempWalker + 1) == L'#') { if (*(TempWalker + 1) == L'#') {
CopyMem (TempWalker, TempWalker + 1, StrSize (TempWalker) - sizeof (TempWalker[0])); TempWalker++;
} }
} else if (*TempWalker == L'#') { } else if (*TempWalker == L'#') {
*TempWalker = CHAR_NULL; *TempWalker = CHAR_NULL;
@ -2710,8 +2724,10 @@ RunScriptFileHandle (
// //
for (CommandLine3 = CommandLine2 ; CommandLine3 != NULL && *CommandLine3 != CHAR_NULL ; CommandLine3++) { for (CommandLine3 = CommandLine2 ; CommandLine3 != NULL && *CommandLine3 != CHAR_NULL ; CommandLine3++) {
if (*CommandLine3 == L'^') { if (*CommandLine3 == L'^') {
if (*(CommandLine3+1) == L'#' || *(CommandLine3+1) == L':') { if ( *(CommandLine3+1) == L':') {
CopyMem(CommandLine3, CommandLine3+1, StrSize(CommandLine3) - sizeof(CommandLine3[0])); CopyMem(CommandLine3, CommandLine3+1, StrSize(CommandLine3) - sizeof(CommandLine3[0]));
} else if (*(CommandLine3+1) == L'#') {
CommandLine3++;
} }
} else if (*CommandLine3 == L'#') { } else if (*CommandLine3 == L'#') {
*CommandLine3 = CHAR_NULL; *CommandLine3 = CHAR_NULL;

23
ShellPkg/Application/Shell/ShellProtocol.c
View File

@ -1433,6 +1433,8 @@ InternalShellExecuteDevicePath(
UINTN *ExitDataSizePtr; UINTN *ExitDataSizePtr;
CHAR16 *ImagePath; CHAR16 *ImagePath;
UINTN Index; UINTN Index;
CHAR16 *Walker;
CHAR16 *NewCmdLine;
// ExitDataSize is not OPTIONAL for gBS->BootServices, provide somewhere for // ExitDataSize is not OPTIONAL for gBS->BootServices, provide somewhere for
// it to be dumped if the caller doesn't want it. // it to be dumped if the caller doesn't want it.
@ -1450,6 +1452,17 @@ InternalShellExecuteDevicePath(
NewHandle = NULL; NewHandle = NULL;
NewCmdLine = AllocateCopyPool (StrSize (CommandLine), CommandLine);
if (NewCmdLine == NULL) {
return EFI_OUT_OF_RESOURCES;
}
for (Walker = NewCmdLine; Walker != NULL && *Walker != CHAR_NULL ; Walker++) {
if (*Walker == L'^' && *(Walker+1) == L'#') {
CopyMem(Walker, Walker+1, StrSize(Walker) - sizeof(Walker[0]));
}
}
// //
// Load the image with: // Load the image with:
// FALSE - not from boot manager and NULL, 0 being not already in memory // FALSE - not from boot manager and NULL, 0 being not already in memory
@ -1478,9 +1491,9 @@ InternalShellExecuteDevicePath(
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
ASSERT(LoadedImage->LoadOptionsSize == 0); ASSERT(LoadedImage->LoadOptionsSize == 0);
if (CommandLine != NULL) { if (NewCmdLine != NULL) {
LoadedImage->LoadOptionsSize = (UINT32)StrSize(CommandLine); LoadedImage->LoadOptionsSize = (UINT32)StrSize(NewCmdLine);
LoadedImage->LoadOptions = (VOID*)CommandLine; LoadedImage->LoadOptions = (VOID*)NewCmdLine;
} }
// //
@ -1499,7 +1512,7 @@ InternalShellExecuteDevicePath(
ShellParamsProtocol.StdIn = ShellInfoObject.NewShellParametersProtocol->StdIn; ShellParamsProtocol.StdIn = ShellInfoObject.NewShellParametersProtocol->StdIn;
ShellParamsProtocol.StdOut = ShellInfoObject.NewShellParametersProtocol->StdOut; ShellParamsProtocol.StdOut = ShellInfoObject.NewShellParametersProtocol->StdOut;
ShellParamsProtocol.StdErr = ShellInfoObject.NewShellParametersProtocol->StdErr; ShellParamsProtocol.StdErr = ShellInfoObject.NewShellParametersProtocol->StdErr;
Status = UpdateArgcArgv(&ShellParamsProtocol, CommandLine, NULL, NULL); Status = UpdateArgcArgv(&ShellParamsProtocol, NewCmdLine, NULL, NULL);
ASSERT_EFI_ERROR(Status); ASSERT_EFI_ERROR(Status);
// //
// Replace Argv[0] with the full path of the binary we're executing: // Replace Argv[0] with the full path of the binary we're executing:
@ -1578,6 +1591,8 @@ FreeAlloc:
ASSERT_EFI_ERROR (CleanupStatus); ASSERT_EFI_ERROR (CleanupStatus);
} }
FreePool (NewCmdLine);
return(Status); return(Status);
} }
/** /**