/** @file\r
Main file for endfor and for shell level 1 functions.\r
\r
- Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+ (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+ Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
ASSERT_EFI_ERROR(Status);\r
\r
if (!gEfiShellProtocol->BatchIsActive()) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"EndFor");\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"endfor");\r
return (SHELL_UNSUPPORTED);\r
}\r
\r
if (gEfiShellParametersProtocol->Argc > 1) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"endfor");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
SCRIPT_FILE *CurrentScriptFile;\r
CHAR16 *ArgSet;\r
CHAR16 *ArgSetWalker;\r
+ CHAR16 *Parameter;\r
UINTN ArgSize;\r
UINTN LoopVar;\r
SHELL_FOR_INFO *Info;\r
ShellStatus = SHELL_SUCCESS;\r
ArgSetWalker = NULL;\r
TempString = NULL;\r
+ Parameter = NULL;\r
FirstPass = FALSE;\r
\r
//\r
ASSERT_EFI_ERROR(Status);\r
\r
if (!gEfiShellProtocol->BatchIsActive()) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"For");\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"for");\r
return (SHELL_UNSUPPORTED);\r
}\r
\r
if (gEfiShellParametersProtocol->Argc < 4) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"for");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
CurrentScriptFile = ShellCommandGetCurrentScriptFile();\r
ASSERT(CurrentScriptFile != NULL);\r
\r
- if (CurrentScriptFile->CurrentCommand->Data == NULL) {\r
+ if ((CurrentScriptFile->CurrentCommand != NULL) && (CurrentScriptFile->CurrentCommand->Data == NULL)) {\r
FirstPass = TRUE;\r
\r
//\r
gShellLevel1HiiHandle, \r
L"EndFor", \r
L"For", \r
- CurrentScriptFile->CurrentCommand!=NULL\r
- ?CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
return (SHELL_DEVICE_ERROR);\r
}\r
\r
ShellCloseFileMetaArg(&FileList);\r
}\r
} else {\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" \"", 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
+ Parameter = gEfiShellParametersProtocol->Argv[LoopVar];\r
+ if (Parameter[0] == L'\"' && Parameter[StrLen(Parameter)-1] == L'\"') {\r
+ ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);\r
+ ArgSet = StrnCatGrow(&ArgSet, &ArgSize, Parameter, 0);\r
+ } else {\r
+ ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" \"", 0);\r
+ ArgSet = StrnCatGrow(&ArgSet, &ArgSize, Parameter, 0);\r
+ ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
+ }\r
}\r
}\r
if (ArgSet == NULL) {\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
ArgSet, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
TempSpot = StrStr(ArgSetWalker, L")");\r
NULL, \r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
*TempSpot = CHAR_NULL;\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
ArgSet, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
ArgSet, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
ArgSet, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (*ArgSetWalker == L')') {\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
gShellLevel1HiiHandle, \r
ArgSet, \r
- CurrentScriptFile!=NULL \r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile->CurrentCommand->Line);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
InternalUpdateAliasOnList(Info->ReplacementName, TempString, &CurrentScriptFile->SubstList);\r
Info->CurrentValue += StrLen(TempString);\r
\r
- if (Info->CurrentValue[0] == L'\"') {\r
- Info->CurrentValue++;\r
- }\r
- while (Info->CurrentValue[0] == L' ') {\r
- Info->CurrentValue++;\r
- }\r
if (Info->CurrentValue[0] == L'\"') {\r
Info->CurrentValue++;\r
}\r