}\r
ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
}\r
- //\r
- // set up for an 'in' for loop\r
- //\r
- NewSize = StrSize(ArgSet);\r
- NewSize += sizeof(SHELL_FOR_INFO)+StrSize(gEfiShellParametersProtocol->Argv[1]);\r
- Info = AllocateZeroPool(NewSize);\r
- ASSERT(Info != NULL);\r
- Info->Signature = SHELL_FOR_INFO_SIGNATURE;\r
- CopyMem(Info->Set, ArgSet, StrSize(ArgSet));\r
- NewSize = StrSize(gEfiShellParametersProtocol->Argv[1]);\r
- CopyMem(Info->Set+(StrSize(ArgSet)/sizeof(Info->Set[0])), gEfiShellParametersProtocol->Argv[1], NewSize);\r
- Info->ReplacementName = Info->Set+StrSize(ArgSet)/sizeof(Info->Set[0]);\r
- Info->CurrentValue = (CHAR16*)Info->Set;\r
- Info->Step = 0;\r
- Info->Current = 0;\r
- Info->End = 0;\r
-\r
- if (InternalIsAliasOnList(Info->ReplacementName, &CurrentScriptFile->SubstList)) {\r
- Info->RemoveSubstAlias = FALSE;\r
+ if (ArgSet == NULL) {\r
+ ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
- Info->RemoveSubstAlias = TRUE;\r
+ //\r
+ // set up for an 'in' for loop\r
+ //\r
+ NewSize = StrSize(ArgSet);\r
+ NewSize += sizeof(SHELL_FOR_INFO)+StrSize(gEfiShellParametersProtocol->Argv[1]);\r
+ Info = AllocateZeroPool(NewSize);\r
+ ASSERT(Info != NULL);\r
+ Info->Signature = SHELL_FOR_INFO_SIGNATURE;\r
+ CopyMem(Info->Set, ArgSet, StrSize(ArgSet));\r
+ NewSize = StrSize(gEfiShellParametersProtocol->Argv[1]);\r
+ CopyMem(Info->Set+(StrSize(ArgSet)/sizeof(Info->Set[0])), gEfiShellParametersProtocol->Argv[1], NewSize);\r
+ Info->ReplacementName = Info->Set+StrSize(ArgSet)/sizeof(Info->Set[0]);\r
+ Info->CurrentValue = (CHAR16*)Info->Set;\r
+ Info->Step = 0;\r
+ Info->Current = 0;\r
+ Info->End = 0;\r
+\r
+ if (InternalIsAliasOnList(Info->ReplacementName, &CurrentScriptFile->SubstList)) {\r
+ Info->RemoveSubstAlias = FALSE;\r
+ } else {\r
+ Info->RemoveSubstAlias = TRUE;\r
+ }\r
+ CurrentScriptFile->CurrentCommand->Data = Info;\r
}\r
- CurrentScriptFile->CurrentCommand->Data = Info;\r
} else if (gUnicodeCollation->StriColl(\r
gUnicodeCollation,\r
L"run",\r
ArgSet = StrnCatGrow(&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
// ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);\r
}\r
- //\r
- // set up for a 'run' for loop\r
- //\r
- Info = AllocateZeroPool(sizeof(SHELL_FOR_INFO)+StrSize(gEfiShellParametersProtocol->Argv[1]));\r
- ASSERT(Info != NULL);\r
- CopyMem(Info->Set, gEfiShellParametersProtocol->Argv[1], StrSize(gEfiShellParametersProtocol->Argv[1]));\r
- Info->ReplacementName = Info->Set;\r
- Info->CurrentValue = NULL;\r
- ArgSetWalker = ArgSet;\r
- if (ArgSetWalker[0] != L'(') {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- 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
- ShellStatus = SHELL_INVALID_PARAMETER;\r
+ if (ArgSet == NULL) {\r
+ ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
- TempSpot = StrStr(ArgSetWalker, L")");\r
- if (TempSpot != NULL) {\r
- TempString = TempSpot+1;\r
- if (*(TempString) != CHAR_NULL) {\r
- while(TempString != NULL && *TempString == L' ') {\r
- TempString++;\r
- }\r
- if (StrLen(TempString) > 0) {\r
- TempSpot = NULL;\r
- }\r
- }\r
- }\r
- if (TempSpot == NULL) {\r
+ //\r
+ // set up for a 'run' for loop\r
+ //\r
+ Info = AllocateZeroPool(sizeof(SHELL_FOR_INFO)+StrSize(gEfiShellParametersProtocol->Argv[1]));\r
+ ASSERT(Info != NULL);\r
+ CopyMem(Info->Set, gEfiShellParametersProtocol->Argv[1], StrSize(gEfiShellParametersProtocol->Argv[1]));\r
+ Info->ReplacementName = Info->Set;\r
+ Info->CurrentValue = NULL;\r
+ ArgSetWalker = ArgSet;\r
+ if (ArgSetWalker[0] != L'(') {\r
ShellPrintHiiEx(\r
-1, \r
-1, \r
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
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- *TempSpot = CHAR_NULL;\r
- ArgSetWalker++;\r
- while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
- ArgSetWalker++;\r
+ TempSpot = StrStr(ArgSetWalker, L")");\r
+ if (TempSpot != NULL) {\r
+ TempString = TempSpot+1;\r
+ if (*(TempString) != CHAR_NULL) {\r
+ while(TempString != NULL && *TempString == L' ') {\r
+ TempString++;\r
+ }\r
+ if (StrLen(TempString) > 0) {\r
+ TempSpot = NULL;\r
+ }\r
+ }\r
}\r
- if (!ShellIsValidForNumber(ArgSetWalker)) {\r
+ if (TempSpot == NULL) {\r
ShellPrintHiiEx(\r
-1, \r
-1, \r
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
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- if (ArgSetWalker[0] == L'-') {\r
- Info->Current = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
- } else {\r
- Info->Current = (INTN)ShellStrToUintn(ArgSetWalker);\r
- }\r
- ArgSetWalker = StrStr(ArgSetWalker, L" ");\r
+ *TempSpot = CHAR_NULL;\r
+ ArgSetWalker++;\r
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
ArgSetWalker++;\r
}\r
- if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
+ if (!ShellIsValidForNumber(ArgSetWalker)) {\r
ShellPrintHiiEx(\r
-1, \r
-1, \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->End = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
- } else {\r
- Info->End = (INTN)ShellStrToUintn(ArgSetWalker);\r
- }\r
- if (Info->Current < Info->End) {\r
- Info->Step = 1;\r
+ Info->Current = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
} else {\r
- Info->Step = -1;\r
+ Info->Current = (INTN)ShellStrToUintn(ArgSetWalker);\r
}\r
-\r
ArgSetWalker = StrStr(ArgSetWalker, L" ");\r
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
ArgSetWalker++;\r
}\r
- if (ArgSetWalker != NULL && *ArgSetWalker != CHAR_NULL) {\r
- if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- 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
- ShellStatus = SHELL_INVALID_PARAMETER;\r
+ if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
+ ShellPrintHiiEx(\r
+ -1, \r
+ -1, \r
+ 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
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ } else {\r
+ if (ArgSetWalker[0] == L'-') {\r
+ Info->End = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
} else {\r
- if (*ArgSetWalker == L')') {\r
- ASSERT(Info->Step == 1 || Info->Step == -1);\r
+ Info->End = (INTN)ShellStrToUintn(ArgSetWalker);\r
+ }\r
+ if (Info->Current < Info->End) {\r
+ Info->Step = 1;\r
+ } else {\r
+ Info->Step = -1;\r
+ }\r
+\r
+ ArgSetWalker = StrStr(ArgSetWalker, L" ");\r
+ while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
+ ArgSetWalker++;\r
+ }\r
+ if (ArgSetWalker != NULL && *ArgSetWalker != CHAR_NULL) {\r
+ if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
+ ShellPrintHiiEx(\r
+ -1, \r
+ -1, \r
+ 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
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- if (ArgSetWalker[0] == L'-') {\r
- Info->Step = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
+ if (*ArgSetWalker == L')') {\r
+ ASSERT(Info->Step == 1 || Info->Step == -1);\r
} else {\r
- Info->Step = (INTN)ShellStrToUintn(ArgSetWalker);\r
- }\r
-\r
- if (StrStr(ArgSetWalker, L" ") != NULL) {\r
- ShellPrintHiiEx(\r
- -1, \r
- -1, \r
- 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
- ShellStatus = SHELL_INVALID_PARAMETER;\r
+ if (ArgSetWalker[0] == L'-') {\r
+ Info->Step = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
+ } else {\r
+ Info->Step = (INTN)ShellStrToUintn(ArgSetWalker);\r
+ }\r
+\r
+ if (StrStr(ArgSetWalker, L" ") != NULL) {\r
+ ShellPrintHiiEx(\r
+ -1, \r
+ -1, \r
+ 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
+ ShellStatus = SHELL_INVALID_PARAMETER;\r
+ }\r
}\r
}\r
+ \r
}\r
- \r
}\r
}\r
}\r
}\r
- }\r
- if (ShellStatus == SHELL_SUCCESS) {\r
- if (InternalIsAliasOnList(Info->ReplacementName, &CurrentScriptFile->SubstList)) {\r
- Info->RemoveSubstAlias = FALSE;\r
- } else {\r
- Info->RemoveSubstAlias = TRUE;\r
+ if (ShellStatus == SHELL_SUCCESS) {\r
+ if (InternalIsAliasOnList(Info->ReplacementName, &CurrentScriptFile->SubstList)) {\r
+ Info->RemoveSubstAlias = FALSE;\r
+ } else {\r
+ Info->RemoveSubstAlias = TRUE;\r
+ }\r
+ }\r
+ if (CurrentScriptFile->CurrentCommand != NULL) {\r
+ CurrentScriptFile->CurrentCommand->Data = Info;\r
}\r
- }\r
- if (CurrentScriptFile->CurrentCommand != NULL) {\r
- CurrentScriptFile->CurrentCommand->Data = Info;\r
}\r
} else {\r
ShellPrintHiiEx(\r
//\r
ASSERT(TempString == NULL);\r
TempString = StrnCatGrow(&TempString, NULL, Info->CurrentValue, 0);\r
- TempSpot = StrStr(TempString, L"\" \"");\r
- if (TempSpot != NULL) {\r
- *TempSpot = CHAR_NULL;\r
- }\r
- while (TempString[StrLen(TempString)-1] == L'\"') {\r
- TempString[StrLen(TempString)-1] = CHAR_NULL;\r
- }\r
- InternalUpdateAliasOnList(Info->ReplacementName, TempString, &CurrentScriptFile->SubstList);\r
- Info->CurrentValue += StrLen(TempString);\r
+ if (TempString == NULL) {\r
+ ShellStatus = SHELL_OUT_OF_RESOURCES;\r
+ } else {\r
+ TempSpot = StrStr(TempString, L"\" \"");\r
+ if (TempSpot != NULL) {\r
+ *TempSpot = CHAR_NULL;\r
+ }\r
+ while (TempString[StrLen(TempString)-1] == L'\"') {\r
+ TempString[StrLen(TempString)-1] = CHAR_NULL;\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
+ 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
+ FreePool(TempString);\r
}\r
- FreePool(TempString);\r
-\r
} else {\r
CurrentScriptFile->CurrentCommand->Data = NULL;\r
//\r
projects / mirror_edk2.git / blobdiff