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

ShellPkg: Refactor Pipe handling

Browse Source 
This moves some logic for handling command lines with pipe ‘|’ into a separate function.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14958 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey 2013-12-10 18:41:35 +00:00 committed by jcarsey
parent b2ce4a3961
commit 19a4497259
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,34 @@ STATIC CONST CHAR16 mScriptExtension[] = L".NSH";
STATIC CONST CHAR16 mExecutableExtensions[] = L".NSH;.EFI"; STATIC CONST CHAR16 mExecutableExtensions[] = L".NSH;.EFI";
STATIC CONST CHAR16 mStartupScript[] = L"startup.nsh"; STATIC CONST CHAR16 mStartupScript[] = L"startup.nsh";
/**
Determine if a command line contains a valid split operation
@param[in] CmdLine The command line to parse.
@retval TRUE CmdLine has a valid split.
@retval FALSE CmdLine does not have a valid split.
**/
BOOLEAN
EFIAPI
ContainsSplit(
IN CONST CHAR16 *CmdLine
)
{
CONST CHAR16 *TempSpot;
TempSpot = NULL;
if (StrStr(CmdLine, L"|") != NULL) {
for (TempSpot = CmdLine ; TempSpot != NULL && *TempSpot != CHAR_NULL ; TempSpot++) {
if (*TempSpot == L'^' && *(TempSpot+1) == L'|') {
TempSpot++;
} else if (*TempSpot == L'|') {
break;
}
}
}
return (TempSpot != NULL && *TempSpot != CHAR_NULL);
}
/** /**
Function to start monitoring for CTRL-S using SimpleTextInputEx. This Function to start monitoring for CTRL-S using SimpleTextInputEx. This
feature's enabled state was not known when the shell initially launched. feature's enabled state was not known when the shell initially launched.
@ -1389,7 +1417,6 @@ RunCommand(
SHELL_FILE_HANDLE OriginalStdOut; SHELL_FILE_HANDLE OriginalStdOut;
SHELL_FILE_HANDLE OriginalStdErr; SHELL_FILE_HANDLE OriginalStdErr;
SYSTEM_TABLE_INFO OriginalSystemTableInfo; SYSTEM_TABLE_INFO OriginalSystemTableInfo;
CHAR16 *TempLocation3;
UINTN Count; UINTN Count;
UINTN Count2; UINTN Count2;
CHAR16 *CleanOriginal; CHAR16 *CleanOriginal;
@ -1494,17 +1521,7 @@ RunCommand(
// //
// We dont do normal processing with a split command line (output from one command input to another) // We dont do normal processing with a split command line (output from one command input to another)
// //
TempLocation3 = NULL; if (ContainsSplit(PostVariableCmdLine)) {
if (StrStr(PostVariableCmdLine, L"|") != NULL) {
for (TempLocation3 = PostVariableCmdLine ; TempLocation3 != NULL && *TempLocation3 != CHAR_NULL ; TempLocation3++) {
if (*TempLocation3 == L'^' && *(TempLocation3+1) == L'|') {
TempLocation3++;
} else if (*TempLocation3 == L'|') {
break;
}
}
}
if (TempLocation3 != NULL && *TempLocation3 != CHAR_NULL) {
// //
// are we in an existing split??? // are we in an existing split???
// //