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

ShellPkg: refactor out leading and trailing space trimming 

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@14972 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey 2013-12-12 18:42:18 +00:00 committed by jcarsey
parent 321a8d494f
commit ad2bc85412
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,36 @@ 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";
/**
Cleans off leading and trailing spaces and tabs
@param[in] String pointer to the string to trim them off
**/
EFI_STATUS
EFIAPI
TrimSpaces(
IN CHAR16 **String
)
{
ASSERT(String != NULL);
ASSERT(*String!= NULL);
//
// Remove any spaces and tabs at the beginning of the (*String).
//
while (((*String)[0] == L' ') || ((*String)[0] == L'\t')) {
CopyMem((*String), (*String)+1, StrSize((*String)) - sizeof((*String)[0]));
}
//
// Remove any spaces at the end of the (*String).
//
while ((*String)[StrLen((*String))-1] == L' ') {
(*String)[StrLen((*String))-1] = CHAR_NULL;
}
return (EFI_SUCCESS);
}
/** /**
Find a command line contains a split operation Find a command line contains a split operation
@ -1460,12 +1490,7 @@ RunCommand(
return (EFI_OUT_OF_RESOURCES); return (EFI_OUT_OF_RESOURCES);
} }
// TrimSpaces(&CleanOriginal);
// Remove any spaces and tabs at the beginning of the string.
//
while ((CleanOriginal[0] == L' ') || (CleanOriginal[0] == L'\t')) {
CopyMem(CleanOriginal, CleanOriginal+1, StrSize(CleanOriginal) - sizeof(CleanOriginal[0]));
}
// //
// Handle case that passed in command line is just 1 or more " " characters. // Handle case that passed in command line is just 1 or more " " characters.
@ -1478,13 +1503,6 @@ RunCommand(
return (EFI_SUCCESS); return (EFI_SUCCESS);
} }
//
// Remove any spaces at the end of the string.
//
while (CleanOriginal[StrLen(CleanOriginal)-1] == L' ') {
CleanOriginal[StrLen(CleanOriginal)-1] = CHAR_NULL;
}
CommandName = NULL; CommandName = NULL;
if (StrStr(CleanOriginal, L" ") == NULL){ if (StrStr(CleanOriginal, L" ") == NULL){
StrnCatGrow(&CommandName, NULL, CleanOriginal, 0); StrnCatGrow(&CommandName, NULL, CleanOriginal, 0);
@ -1530,12 +1548,7 @@ RunCommand(
return (EFI_OUT_OF_RESOURCES); return (EFI_OUT_OF_RESOURCES);
} }
while (PostVariableCmdLine[StrLen(PostVariableCmdLine)-1] == L' ') { TrimSpaces(&PostVariableCmdLine);
PostVariableCmdLine[StrLen(PostVariableCmdLine)-1] = CHAR_NULL;
}
while (PostVariableCmdLine[0] == L' ') {
CopyMem(PostVariableCmdLine, PostVariableCmdLine+1, StrSize(PostVariableCmdLine) - sizeof(PostVariableCmdLine[0]));
}
// //
// 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)
@ -1583,13 +1596,8 @@ RunCommand(
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_REDIR), ShellInfoObject.HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_REDIR), ShellInfoObject.HiiHandle);
} }
} else { } else {
while (PostVariableCmdLine[StrLen(PostVariableCmdLine)-1] == L' ') { TrimSpaces(&PostVariableCmdLine);
PostVariableCmdLine[StrLen(PostVariableCmdLine)-1] = CHAR_NULL;
}
while (PostVariableCmdLine[0] == L' ') {
CopyMem(PostVariableCmdLine, PostVariableCmdLine+1, StrSize(PostVariableCmdLine) - sizeof(PostVariableCmdLine[0]));
}
// //
// get the argc and argv updated for internal commands // get the argc and argv updated for internal commands
// //