**/\r
BOOLEAN\r
ShellIsValidForNumber (\r
- IN CONST CHAR16 *Number\r
+ IN CONST CHAR16 *Number\r
)\r
{\r
- if (Number == NULL || *Number == CHAR_NULL) {\r
+ if ((Number == NULL) || (*Number == CHAR_NULL)) {\r
return (FALSE);\r
}\r
\r
Number++;\r
}\r
\r
- if (StrLen(Number) == 0) {\r
+ if (StrLen (Number) == 0) {\r
return (FALSE);\r
}\r
\r
- if (StrLen(Number) >= 7) {\r
- if ((StrStr(Number, L" ") == NULL) || (((StrStr(Number, L" ") != NULL) && (StrStr(Number, L" ") - Number) >= 7))) {\r
+ if (StrLen (Number) >= 7) {\r
+ if ((StrStr (Number, L" ") == NULL) || (((StrStr (Number, L" ") != NULL) && ((StrStr (Number, L" ") - Number) >= 7)))) {\r
return (FALSE);\r
}\r
}\r
\r
- if (!ShellIsDecimalDigitCharacter(*Number)) {\r
+ if (!ShellIsDecimalDigitCharacter (*Number)) {\r
return (FALSE);\r
}\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- BOOLEAN Found;\r
- SCRIPT_FILE *CurrentScriptFile;\r
+ EFI_STATUS Status;\r
+ BOOLEAN Found;\r
+ SCRIPT_FILE *CurrentScriptFile;\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- if (!gEfiShellProtocol->BatchIsActive()) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"endfor");\r
+ if (!gEfiShellProtocol->BatchIsActive ()) {\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, L"endfor");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"endfor");\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- Found = MoveToTag(GetPreviousNode, L"for", L"endfor", NULL, ShellCommandGetCurrentScriptFile(), FALSE, FALSE, FALSE);\r
+ Found = MoveToTag (GetPreviousNode, L"for", L"endfor", NULL, ShellCommandGetCurrentScriptFile (), FALSE, FALSE, FALSE);\r
\r
if (!Found) {\r
- CurrentScriptFile = ShellCommandGetCurrentScriptFile();\r
- ShellPrintHiiEx(\r
+ CurrentScriptFile = ShellCommandGetCurrentScriptFile ();\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
gShellLevel1HiiHandle,\r
L"For",\r
L"EndFor",\r
- CurrentScriptFile!=NULL\r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile != NULL\r
+ && CurrentScriptFile->CurrentCommand != NULL\r
+ ? CurrentScriptFile->CurrentCommand->Line : 0\r
+ );\r
return (SHELL_NOT_FOUND);\r
}\r
+\r
return (SHELL_SUCCESS);\r
}\r
\r
typedef struct {\r
- UINT32 Signature;\r
- INTN Current;\r
- INTN End;\r
- INTN Step;\r
- CHAR16 *ReplacementName;\r
- CHAR16 *CurrentValue;\r
- BOOLEAN RemoveSubstAlias;\r
- CHAR16 Set[1];\r
- } SHELL_FOR_INFO;\r
-#define SIZE_OF_SHELL_FOR_INFO OFFSET_OF (SHELL_FOR_INFO, Set)\r
-#define SHELL_FOR_INFO_SIGNATURE SIGNATURE_32 ('S', 'F', 'I', 's')\r
+ UINT32 Signature;\r
+ INTN Current;\r
+ INTN End;\r
+ INTN Step;\r
+ CHAR16 *ReplacementName;\r
+ CHAR16 *CurrentValue;\r
+ BOOLEAN RemoveSubstAlias;\r
+ CHAR16 Set[1];\r
+} SHELL_FOR_INFO;\r
+#define SIZE_OF_SHELL_FOR_INFO OFFSET_OF (SHELL_FOR_INFO, Set)\r
+#define SHELL_FOR_INFO_SIGNATURE SIGNATURE_32 ('S', 'F', 'I', 's')\r
\r
/**\r
Update the value of a given alias on the list. If the alias is not there then add it.\r
@retval EFI_OUT_OF_RESOURCES There was not enough free memory.\r
**/\r
EFI_STATUS\r
-InternalUpdateAliasOnList(\r
- IN CONST CHAR16 *Alias,\r
- IN CONST CHAR16 *CommandString,\r
- IN OUT LIST_ENTRY *List\r
+InternalUpdateAliasOnList (\r
+ IN CONST CHAR16 *Alias,\r
+ IN CONST CHAR16 *CommandString,\r
+ IN OUT LIST_ENTRY *List\r
)\r
{\r
- ALIAS_LIST *Node;\r
- BOOLEAN Found;\r
+ ALIAS_LIST *Node;\r
+ BOOLEAN Found;\r
\r
//\r
// assert for NULL parameter\r
//\r
- ASSERT(Alias != NULL);\r
+ ASSERT (Alias != NULL);\r
\r
//\r
// check for the Alias\r
//\r
- for ( Node = (ALIAS_LIST *)GetFirstNode(List), Found = FALSE\r
- ; !IsNull(List, &Node->Link)\r
- ; Node = (ALIAS_LIST *)GetNextNode(List, &Node->Link)\r
- ){\r
- ASSERT(Node->CommandString != NULL);\r
- ASSERT(Node->Alias != NULL);\r
- if (StrCmp(Node->Alias, Alias)==0) {\r
- FreePool(Node->CommandString);\r
+ for ( Node = (ALIAS_LIST *)GetFirstNode (List), Found = FALSE\r
+ ; !IsNull (List, &Node->Link)\r
+ ; Node = (ALIAS_LIST *)GetNextNode (List, &Node->Link)\r
+ )\r
+ {\r
+ ASSERT (Node->CommandString != NULL);\r
+ ASSERT (Node->Alias != NULL);\r
+ if (StrCmp (Node->Alias, Alias) == 0) {\r
+ FreePool (Node->CommandString);\r
Node->CommandString = NULL;\r
- Node->CommandString = StrnCatGrow(&Node->CommandString, NULL, CommandString, 0);\r
- Found = TRUE;\r
+ Node->CommandString = StrnCatGrow (&Node->CommandString, NULL, CommandString, 0);\r
+ Found = TRUE;\r
break;\r
}\r
}\r
+\r
if (!Found) {\r
- Node = AllocateZeroPool(sizeof(ALIAS_LIST));\r
+ Node = AllocateZeroPool (sizeof (ALIAS_LIST));\r
if (Node == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- ASSERT(Node->Alias == NULL);\r
- Node->Alias = StrnCatGrow(&Node->Alias, NULL, Alias, 0);\r
- ASSERT(Node->CommandString == NULL);\r
- Node->CommandString = StrnCatGrow(&Node->CommandString, NULL, CommandString, 0);\r
- InsertTailList(List, &Node->Link);\r
+\r
+ ASSERT (Node->Alias == NULL);\r
+ Node->Alias = StrnCatGrow (&Node->Alias, NULL, Alias, 0);\r
+ ASSERT (Node->CommandString == NULL);\r
+ Node->CommandString = StrnCatGrow (&Node->CommandString, NULL, CommandString, 0);\r
+ InsertTailList (List, &Node->Link);\r
}\r
+\r
return (EFI_SUCCESS);\r
}\r
\r
@retval FALSE The alias is not on the list.\r
**/\r
BOOLEAN\r
-InternalIsAliasOnList(\r
- IN CONST CHAR16 *Alias,\r
- IN CONST LIST_ENTRY *List\r
+InternalIsAliasOnList (\r
+ IN CONST CHAR16 *Alias,\r
+ IN CONST LIST_ENTRY *List\r
)\r
{\r
- ALIAS_LIST *Node;\r
+ ALIAS_LIST *Node;\r
\r
//\r
// assert for NULL parameter\r
//\r
- ASSERT(Alias != NULL);\r
+ ASSERT (Alias != NULL);\r
\r
//\r
// check for the Alias\r
//\r
- for ( Node = (ALIAS_LIST *)GetFirstNode(List)\r
- ; !IsNull(List, &Node->Link)\r
- ; Node = (ALIAS_LIST *)GetNextNode(List, &Node->Link)\r
- ){\r
- ASSERT(Node->CommandString != NULL);\r
- ASSERT(Node->Alias != NULL);\r
- if (StrCmp(Node->Alias, Alias)==0) {\r
+ for ( Node = (ALIAS_LIST *)GetFirstNode (List)\r
+ ; !IsNull (List, &Node->Link)\r
+ ; Node = (ALIAS_LIST *)GetNextNode (List, &Node->Link)\r
+ )\r
+ {\r
+ ASSERT (Node->CommandString != NULL);\r
+ ASSERT (Node->Alias != NULL);\r
+ if (StrCmp (Node->Alias, Alias) == 0) {\r
return (TRUE);\r
}\r
}\r
+\r
return (FALSE);\r
}\r
\r
@param[in, out] List The list to search.\r
**/\r
BOOLEAN\r
-InternalRemoveAliasFromList(\r
- IN CONST CHAR16 *Alias,\r
- IN OUT LIST_ENTRY *List\r
+InternalRemoveAliasFromList (\r
+ IN CONST CHAR16 *Alias,\r
+ IN OUT LIST_ENTRY *List\r
)\r
{\r
- ALIAS_LIST *Node;\r
+ ALIAS_LIST *Node;\r
\r
//\r
// assert for NULL parameter\r
//\r
- ASSERT(Alias != NULL);\r
+ ASSERT (Alias != NULL);\r
\r
//\r
// check for the Alias\r
//\r
- for ( Node = (ALIAS_LIST *)GetFirstNode(List)\r
- ; !IsNull(List, &Node->Link)\r
- ; Node = (ALIAS_LIST *)GetNextNode(List, &Node->Link)\r
- ){\r
- ASSERT(Node->CommandString != NULL);\r
- ASSERT(Node->Alias != NULL);\r
- if (StrCmp(Node->Alias, Alias)==0) {\r
- RemoveEntryList(&Node->Link);\r
- FreePool(Node->Alias);\r
- FreePool(Node->CommandString);\r
- FreePool(Node);\r
+ for ( Node = (ALIAS_LIST *)GetFirstNode (List)\r
+ ; !IsNull (List, &Node->Link)\r
+ ; Node = (ALIAS_LIST *)GetNextNode (List, &Node->Link)\r
+ )\r
+ {\r
+ ASSERT (Node->CommandString != NULL);\r
+ ASSERT (Node->Alias != NULL);\r
+ if (StrCmp (Node->Alias, Alias) == 0) {\r
+ RemoveEntryList (&Node->Link);\r
+ FreePool (Node->Alias);\r
+ FreePool (Node->CommandString);\r
+ FreePool (Node);\r
return (TRUE);\r
}\r
}\r
+\r
return (FALSE);\r
}\r
\r
@retval (UINTN)(-1) An error ocurred.\r
**/\r
UINTN\r
-ReturnUintn(\r
- IN CONST CHAR16 *String\r
+ReturnUintn (\r
+ IN CONST CHAR16 *String\r
)\r
{\r
- UINT64 RetVal;\r
+ UINT64 RetVal;\r
\r
- if (!EFI_ERROR(ShellConvertStringToUint64(String, &RetVal, FALSE, TRUE))) {\r
+ if (!EFI_ERROR (ShellConvertStringToUint64 (String, &RetVal, FALSE, TRUE))) {\r
return ((UINTN)RetVal);\r
}\r
+\r
return ((UINTN)(-1));\r
}\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- SHELL_STATUS ShellStatus;\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
- CHAR16 *TempString;\r
- CHAR16 *TempSpot;\r
- BOOLEAN FirstPass;\r
- EFI_SHELL_FILE_INFO *Node;\r
- EFI_SHELL_FILE_INFO *FileList;\r
- UINTN NewSize;\r
-\r
- ArgSet = NULL;\r
- ArgSize = 0;\r
- ShellStatus = SHELL_SUCCESS;\r
- ArgSetWalker = NULL;\r
- TempString = NULL;\r
- Parameter = NULL;\r
- FirstPass = FALSE;\r
+ EFI_STATUS Status;\r
+ SHELL_STATUS ShellStatus;\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
+ CHAR16 *TempString;\r
+ CHAR16 *TempSpot;\r
+ BOOLEAN FirstPass;\r
+ EFI_SHELL_FILE_INFO *Node;\r
+ EFI_SHELL_FILE_INFO *FileList;\r
+ UINTN NewSize;\r
+\r
+ ArgSet = NULL;\r
+ ArgSize = 0;\r
+ ShellStatus = SHELL_SUCCESS;\r
+ ArgSetWalker = NULL;\r
+ TempString = NULL;\r
+ Parameter = NULL;\r
+ FirstPass = FALSE;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- if (!gEfiShellProtocol->BatchIsActive()) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"for");\r
+ if (!gEfiShellProtocol->BatchIsActive ()) {\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, L"for");\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
+ CurrentScriptFile = ShellCommandGetCurrentScriptFile ();\r
+ ASSERT (CurrentScriptFile != NULL);\r
\r
if ((CurrentScriptFile->CurrentCommand != NULL) && (CurrentScriptFile->CurrentCommand->Data == NULL)) {\r
FirstPass = TRUE;\r
//\r
// Make sure that an End exists.\r
//\r
- if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {\r
- ShellPrintHiiEx(\r
+ if (!MoveToTag (GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
gShellLevel1HiiHandle,\r
L"EndFor",\r
L"For",\r
- CurrentScriptFile->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
return (SHELL_DEVICE_ERROR);\r
}\r
\r
//\r
// Process the line.\r
//\r
- if (gEfiShellParametersProtocol->Argv[1][0] != L'%' || gEfiShellParametersProtocol->Argv[1][2] != CHAR_NULL\r
- ||!((gEfiShellParametersProtocol->Argv[1][1] >= L'a' && gEfiShellParametersProtocol->Argv[1][1] <= L'z')\r
- ||(gEfiShellParametersProtocol->Argv[1][1] >= L'A' && gEfiShellParametersProtocol->Argv[1][1] <= L'Z'))\r
- ) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_VAR), gShellLevel1HiiHandle, gEfiShellParametersProtocol->Argv[1]);\r
+ if ( (gEfiShellParametersProtocol->Argv[1][0] != L'%') || (gEfiShellParametersProtocol->Argv[1][2] != CHAR_NULL)\r
+ || !( ((gEfiShellParametersProtocol->Argv[1][1] >= L'a') && (gEfiShellParametersProtocol->Argv[1][1] <= L'z'))\r
+ || ((gEfiShellParametersProtocol->Argv[1][1] >= L'A') && (gEfiShellParametersProtocol->Argv[1][1] <= L'Z')))\r
+ )\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_VAR), gShellLevel1HiiHandle, gEfiShellParametersProtocol->Argv[1]);\r
return (SHELL_INVALID_PARAMETER);\r
}\r
\r
- if (gUnicodeCollation->StriColl(\r
- gUnicodeCollation,\r
- L"in",\r
- gEfiShellParametersProtocol->Argv[2]) == 0) {\r
- for (LoopVar = 0x3 ; LoopVar < gEfiShellParametersProtocol->Argc ; LoopVar++) {\r
- ASSERT((ArgSet == NULL && ArgSize == 0) || (ArgSet != NULL));\r
- if (StrStr(gEfiShellParametersProtocol->Argv[LoopVar], L"*") != NULL\r
- ||StrStr(gEfiShellParametersProtocol->Argv[LoopVar], L"?") != NULL\r
- ||StrStr(gEfiShellParametersProtocol->Argv[LoopVar], L"[") != NULL\r
- ||StrStr(gEfiShellParametersProtocol->Argv[LoopVar], L"]") != NULL) {\r
+ if (gUnicodeCollation->StriColl (\r
+ gUnicodeCollation,\r
+ L"in",\r
+ gEfiShellParametersProtocol->Argv[2]\r
+ ) == 0)\r
+ {\r
+ for (LoopVar = 0x3; LoopVar < gEfiShellParametersProtocol->Argc; LoopVar++) {\r
+ ASSERT ((ArgSet == NULL && ArgSize == 0) || (ArgSet != NULL));\r
+ if ( (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L"*") != NULL)\r
+ || (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L"?") != NULL)\r
+ || (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L"[") != NULL)\r
+ || (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L"]") != NULL))\r
+ {\r
FileList = NULL;\r
- Status = ShellOpenFileMetaArg ((CHAR16*)gEfiShellParametersProtocol->Argv[LoopVar], EFI_FILE_MODE_READ, &FileList);\r
- if (EFI_ERROR(Status) || FileList == NULL || IsListEmpty(&FileList->Link)) {\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" \"", 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
+ Status = ShellOpenFileMetaArg ((CHAR16 *)gEfiShellParametersProtocol->Argv[LoopVar], EFI_FILE_MODE_READ, &FileList);\r
+ if (EFI_ERROR (Status) || (FileList == NULL) || IsListEmpty (&FileList->Link)) {\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L" \"", 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L"\"", 0);\r
} else {\r
- for (Node = (EFI_SHELL_FILE_INFO *)GetFirstNode(&FileList->Link)\r
- ; !IsNull(&FileList->Link, &Node->Link)\r
- ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode(&FileList->Link, &Node->Link)\r
- ){\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" \"", 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, Node->FullName, 0);\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
+ for (Node = (EFI_SHELL_FILE_INFO *)GetFirstNode (&FileList->Link)\r
+ ; !IsNull (&FileList->Link, &Node->Link)\r
+ ; Node = (EFI_SHELL_FILE_INFO *)GetNextNode (&FileList->Link, &Node->Link)\r
+ )\r
+ {\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L" \"", 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, Node->FullName, 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L"\"", 0);\r
}\r
- ShellCloseFileMetaArg(&FileList);\r
+\r
+ ShellCloseFileMetaArg (&FileList);\r
}\r
} else {\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
+ 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
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L" \"", 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, Parameter, 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L"\"", 0);\r
}\r
}\r
}\r
+\r
if (ArgSet == NULL) {\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\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
+ NewSize = StrSize (ArgSet);\r
+ NewSize += sizeof (SHELL_FOR_INFO)+StrSize (gEfiShellParametersProtocol->Argv[1]);\r
+ Info = AllocateZeroPool (NewSize);\r
if (Info == NULL) {\r
FreePool (ArgSet);\r
return SHELL_OUT_OF_RESOURCES;\r
}\r
+\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
+ 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
+ Info->RemoveSubstAlias = TRUE;\r
}\r
+\r
CurrentScriptFile->CurrentCommand->Data = Info;\r
}\r
- } else if (gUnicodeCollation->StriColl(\r
- gUnicodeCollation,\r
- L"run",\r
- gEfiShellParametersProtocol->Argv[2]) == 0) {\r
- for (LoopVar = 0x3 ; LoopVar < gEfiShellParametersProtocol->Argc ; LoopVar++) {\r
- ASSERT((ArgSet == NULL && ArgSize == 0) || (ArgSet != NULL));\r
- if (StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L")") != NULL &&\r
- (LoopVar + 1) < gEfiShellParametersProtocol->Argc\r
- ) {\r
+ } else if (gUnicodeCollation->StriColl (\r
+ gUnicodeCollation,\r
+ L"run",\r
+ gEfiShellParametersProtocol->Argv[2]\r
+ ) == 0)\r
+ {\r
+ for (LoopVar = 0x3; LoopVar < gEfiShellParametersProtocol->Argc; LoopVar++) {\r
+ ASSERT ((ArgSet == NULL && ArgSize == 0) || (ArgSet != NULL));\r
+ if ((StrStr (gEfiShellParametersProtocol->Argv[LoopVar], L")") != NULL) &&\r
+ ((LoopVar + 1) < gEfiShellParametersProtocol->Argc)\r
+ )\r
+ {\r
return (SHELL_INVALID_PARAMETER);\r
}\r
+\r
if (ArgSet == NULL) {\r
-// ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
+ // ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L"\"", 0);\r
} else {\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, L" ", 0);\r
}\r
- ArgSet = StrnCatGrow(&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
-// ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);\r
+\r
+ ArgSet = StrnCatGrow (&ArgSet, &ArgSize, gEfiShellParametersProtocol->Argv[LoopVar], 0);\r
+ // ArgSet = StrnCatGrow(&ArgSet, &ArgSize, L" ", 0);\r
}\r
+\r
if (ArgSet == NULL) {\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
//\r
// set up for a 'run' for loop\r
//\r
- Info = AllocateZeroPool(sizeof(SHELL_FOR_INFO)+StrSize(gEfiShellParametersProtocol->Argv[1]));\r
+ Info = AllocateZeroPool (sizeof (SHELL_FOR_INFO)+StrSize (gEfiShellParametersProtocol->Argv[1]));\r
if (Info == NULL) {\r
FreePool (ArgSet);\r
return SHELL_OUT_OF_RESOURCES;\r
}\r
+\r
Info->Signature = SHELL_FOR_INFO_SIGNATURE;\r
- CopyMem(Info->Set, gEfiShellParametersProtocol->Argv[1], StrSize(gEfiShellParametersProtocol->Argv[1]));\r
+ CopyMem (Info->Set, gEfiShellParametersProtocol->Argv[1], StrSize (gEfiShellParametersProtocol->Argv[1]));\r
Info->ReplacementName = Info->Set;\r
Info->CurrentValue = NULL;\r
- ArgSetWalker = ArgSet;\r
+ ArgSetWalker = ArgSet;\r
if (ArgSetWalker[0] != L'(') {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),\r
gShellLevel1HiiHandle,\r
ArgSet,\r
- CurrentScriptFile->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- TempSpot = StrStr(ArgSetWalker, L")");\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
+ while (TempString != NULL && *TempString == L' ') {\r
TempString++;\r
}\r
- if (StrLen(TempString) > 0) {\r
+\r
+ if (StrLen (TempString) > 0) {\r
TempSpot = NULL;\r
}\r
}\r
}\r
+\r
if (TempSpot == NULL) {\r
- ShellPrintHiiEx(\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),\r
gShellLevel1HiiHandle,\r
- CurrentScriptFile->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
*TempSpot = CHAR_NULL;\r
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
ArgSetWalker++;\r
}\r
- if (!ShellIsValidForNumber(ArgSetWalker)) {\r
- ShellPrintHiiEx(\r
+\r
+ if (!ShellIsValidForNumber (ArgSetWalker)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),\r
gShellLevel1HiiHandle,\r
ArgSet,\r
- CurrentScriptFile->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->Current = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
+ Info->Current = 0 - (INTN)ReturnUintn (ArgSetWalker+1);\r
} else {\r
- Info->Current = (INTN)ReturnUintn(ArgSetWalker);\r
+ Info->Current = (INTN)ReturnUintn (ArgSetWalker);\r
}\r
- ArgSetWalker = StrStr(ArgSetWalker, L" ");\r
+\r
+ ArgSetWalker = StrStr (ArgSetWalker, L" ");\r
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
ArgSetWalker++;\r
}\r
- if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
- ShellPrintHiiEx(\r
+\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->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->End = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
+ Info->End = 0 - (INTN)ReturnUintn (ArgSetWalker+1);\r
} else {\r
- Info->End = (INTN)ReturnUintn(ArgSetWalker);\r
+ Info->End = (INTN)ReturnUintn (ArgSetWalker);\r
}\r
+\r
if (Info->Current < Info->End) {\r
- Info->Step = 1;\r
+ Info->Step = 1;\r
} else {\r
- Info->Step = -1;\r
+ Info->Step = -1;\r
}\r
\r
- ArgSetWalker = StrStr(ArgSetWalker, L" ");\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
+\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->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (*ArgSetWalker == L')') {\r
- ASSERT(Info->Step == 1 || Info->Step == -1);\r
+ ASSERT (Info->Step == 1 || Info->Step == -1);\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->Step = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
+ Info->Step = 0 - (INTN)ReturnUintn (ArgSetWalker+1);\r
} else {\r
- Info->Step = (INTN)ReturnUintn(ArgSetWalker);\r
+ Info->Step = (INTN)ReturnUintn (ArgSetWalker);\r
}\r
\r
- if (StrStr(ArgSetWalker, L" ") != NULL) {\r
- ShellPrintHiiEx(\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->CurrentCommand->Line);\r
+ CurrentScriptFile->CurrentCommand->Line\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\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
+ if (InternalIsAliasOnList (Info->ReplacementName, &CurrentScriptFile->SubstList)) {\r
+ Info->RemoveSubstAlias = FALSE;\r
} else {\r
- Info->RemoveSubstAlias = TRUE;\r
+ Info->RemoveSubstAlias = TRUE;\r
}\r
}\r
+\r
if (CurrentScriptFile->CurrentCommand != NULL) {\r
CurrentScriptFile->CurrentCommand->Data = Info;\r
}\r
}\r
} else {\r
- ShellPrintHiiEx(\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
+ CurrentScriptFile != NULL\r
+ && CurrentScriptFile->CurrentCommand != NULL\r
+ ? CurrentScriptFile->CurrentCommand->Line : 0\r
+ );\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
} else {\r
//\r
// These need to be NULL since they are used to determine if this is the first pass later on...\r
//\r
- ASSERT(ArgSetWalker == NULL);\r
- ASSERT(ArgSet == NULL);\r
+ ASSERT (ArgSetWalker == NULL);\r
+ ASSERT (ArgSet == NULL);\r
}\r
\r
- if (CurrentScriptFile != NULL && CurrentScriptFile->CurrentCommand != NULL) {\r
- Info = (SHELL_FOR_INFO*)CurrentScriptFile->CurrentCommand->Data;\r
+ if ((CurrentScriptFile != NULL) && (CurrentScriptFile->CurrentCommand != NULL)) {\r
+ Info = (SHELL_FOR_INFO *)CurrentScriptFile->CurrentCommand->Data;\r
if (CurrentScriptFile->CurrentCommand->Reset) {\r
if (Info != NULL) {\r
- Info->CurrentValue = (CHAR16*)Info->Set;\r
+ Info->CurrentValue = (CHAR16 *)Info->Set;\r
}\r
- FirstPass = TRUE;\r
+\r
+ FirstPass = TRUE;\r
CurrentScriptFile->CurrentCommand->Reset = FALSE;\r
}\r
} else {\r
ShellStatus = SHELL_UNSUPPORTED;\r
- Info = NULL;\r
+ Info = NULL;\r
}\r
+\r
if (ShellStatus == SHELL_SUCCESS) {\r
- ASSERT(Info != NULL);\r
+ ASSERT (Info != NULL);\r
if (Info->Step != 0) {\r
//\r
// only advance if not the first pass\r
Info->Current += Info->Step;\r
}\r
\r
- TempString = AllocateZeroPool(50*sizeof(CHAR16));\r
- UnicodeSPrint(TempString, 50*sizeof(CHAR16), L"%d", Info->Current);\r
- InternalUpdateAliasOnList(Info->ReplacementName, TempString, &CurrentScriptFile->SubstList);\r
- FreePool(TempString);\r
+ TempString = AllocateZeroPool (50*sizeof (CHAR16));\r
+ UnicodeSPrint (TempString, 50*sizeof (CHAR16), L"%d", Info->Current);\r
+ InternalUpdateAliasOnList (Info->ReplacementName, TempString, &CurrentScriptFile->SubstList);\r
+ FreePool (TempString);\r
\r
- if ((Info->Step > 0 && Info->Current > Info->End) || (Info->Step < 0 && Info->Current < Info->End)) {\r
+ if (((Info->Step > 0) && (Info->Current > Info->End)) || ((Info->Step < 0) && (Info->Current < Info->End))) {\r
CurrentScriptFile->CurrentCommand->Data = NULL;\r
//\r
// find the matching endfor (we're done with the loop)\r
//\r
- if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
- ShellPrintHiiEx(\r
+ if (!MoveToTag (GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
gShellLevel1HiiHandle,\r
L"EndFor",\r
L"For",\r
- CurrentScriptFile!=NULL\r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile != NULL\r
+ && CurrentScriptFile->CurrentCommand != NULL\r
+ ? CurrentScriptFile->CurrentCommand->Line : 0\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
+\r
if (Info->RemoveSubstAlias) {\r
//\r
// remove item from list\r
//\r
- InternalRemoveAliasFromList(Info->ReplacementName, &CurrentScriptFile->SubstList);\r
+ InternalRemoveAliasFromList (Info->ReplacementName, &CurrentScriptFile->SubstList);\r
}\r
- FreePool(Info);\r
+\r
+ FreePool (Info);\r
}\r
} else {\r
//\r
// Must be in 'in' version of for loop...\r
//\r
- ASSERT(Info->Set != NULL);\r
- if (Info->CurrentValue != NULL && *Info->CurrentValue != CHAR_NULL) {\r
+ ASSERT (Info->Set != NULL);\r
+ if ((Info->CurrentValue != NULL) && (*Info->CurrentValue != CHAR_NULL)) {\r
if (Info->CurrentValue[0] == L' ') {\r
Info->CurrentValue++;\r
}\r
+\r
if (Info->CurrentValue[0] == L'\"') {\r
Info->CurrentValue++;\r
}\r
+\r
//\r
// do the next one of the set\r
//\r
- ASSERT(TempString == NULL);\r
- TempString = StrnCatGrow(&TempString, NULL, Info->CurrentValue, 0);\r
+ ASSERT (TempString == NULL);\r
+ TempString = StrnCatGrow (&TempString, NULL, Info->CurrentValue, 0);\r
if (TempString == NULL) {\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
- TempSpot = StrStr(TempString, L"\" \"");\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
+ 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
+ InternalUpdateAliasOnList (Info->ReplacementName, TempString, &CurrentScriptFile->SubstList);\r
+ Info->CurrentValue += StrLen (TempString);\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
// find the matching endfor (we're done with the loop)\r
//\r
- if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
- ShellPrintHiiEx(\r
+ if (!MoveToTag (GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
+ ShellPrintHiiEx (\r
-1,\r
-1,\r
NULL,\r
gShellLevel1HiiHandle,\r
L"EndFor",\r
L"For",\r
- CurrentScriptFile!=NULL\r
- && CurrentScriptFile->CurrentCommand!=NULL\r
- ? CurrentScriptFile->CurrentCommand->Line:0);\r
+ CurrentScriptFile != NULL\r
+ && CurrentScriptFile->CurrentCommand != NULL\r
+ ? CurrentScriptFile->CurrentCommand->Line : 0\r
+ );\r
ShellStatus = SHELL_DEVICE_ERROR;\r
}\r
+\r
if (Info->RemoveSubstAlias) {\r
//\r
// remove item from list\r
//\r
- InternalRemoveAliasFromList(Info->ReplacementName, &CurrentScriptFile->SubstList);\r
+ InternalRemoveAliasFromList (Info->ReplacementName, &CurrentScriptFile->SubstList);\r
}\r
- FreePool(Info);\r
+\r
+ FreePool (Info);\r
}\r
}\r
}\r
+\r
if (ArgSet != NULL) {\r
- FreePool(ArgSet);\r
+ FreePool (ArgSet);\r
}\r
+\r
return (ShellStatus);\r
}\r
-\r
projects / mirror_edk2.git / blobdiff