\r
#include "Shell.h"\r
\r
-BOOLEAN AsciiRedirection = FALSE;\r
+BOOLEAN AsciiRedirection = FALSE;\r
\r
/**\r
Return the next parameter's end from a command line string.\r
\r
@param[in] String the string to parse\r
**/\r
-CONST CHAR16*\r
-FindEndOfParameter(\r
- IN CONST CHAR16 *String\r
+CONST CHAR16 *\r
+FindEndOfParameter (\r
+ IN CONST CHAR16 *String\r
)\r
{\r
- CONST CHAR16 *First;\r
- CONST CHAR16 *CloseQuote;\r
+ CONST CHAR16 *First;\r
+ CONST CHAR16 *CloseQuote;\r
\r
- First = FindFirstCharacter(String, L" \"", L'^');\r
+ First = FindFirstCharacter (String, L" \"", L'^');\r
\r
//\r
// nothing, all one parameter remaining\r
@return EFI_NOT_FOUND A closing " could not be found on the specified string\r
**/\r
EFI_STATUS\r
-GetNextParameter(\r
+GetNextParameter (\r
IN OUT CHAR16 **Walker,\r
IN OUT CHAR16 **TempParameter,\r
IN CONST UINTN Length,\r
IN BOOLEAN StripQuotation\r
)\r
{\r
- CONST CHAR16 *NextDelim;\r
-\r
- if (Walker == NULL\r
- ||*Walker == NULL\r
- ||TempParameter == NULL\r
- ||*TempParameter == NULL\r
- ){\r
+ CONST CHAR16 *NextDelim;\r
+\r
+ if ( (Walker == NULL)\r
+ || (*Walker == NULL)\r
+ || (TempParameter == NULL)\r
+ || (*TempParameter == NULL)\r
+ )\r
+ {\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
-\r
//\r
// make sure we dont have any leading spaces\r
//\r
while ((*Walker)[0] == L' ') {\r
- (*Walker)++;\r
+ (*Walker)++;\r
}\r
\r
//\r
// make sure we still have some params now...\r
//\r
- if (StrLen(*Walker) == 0) {\r
-DEBUG_CODE_BEGIN();\r
- *Walker = NULL;\r
-DEBUG_CODE_END();\r
+ if (StrLen (*Walker) == 0) {\r
+ DEBUG_CODE_BEGIN ();\r
+ *Walker = NULL;\r
+ DEBUG_CODE_END ();\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
- NextDelim = FindEndOfParameter(*Walker);\r
+ NextDelim = FindEndOfParameter (*Walker);\r
\r
- if (NextDelim == NULL){\r
-DEBUG_CODE_BEGIN();\r
- *Walker = NULL;\r
-DEBUG_CODE_END();\r
+ if (NextDelim == NULL) {\r
+ DEBUG_CODE_BEGIN ();\r
+ *Walker = NULL;\r
+ DEBUG_CODE_END ();\r
return (EFI_NOT_FOUND);\r
}\r
\r
- StrnCpyS(*TempParameter, Length / sizeof(CHAR16), (*Walker), NextDelim - *Walker);\r
+ StrnCpyS (*TempParameter, Length / sizeof (CHAR16), (*Walker), NextDelim - *Walker);\r
\r
//\r
// Add a CHAR_NULL if we didn't get one via the copy\r
//\r
// Update Walker for the next iteration through the function\r
//\r
- *Walker = (CHAR16*)NextDelim;\r
+ *Walker = (CHAR16 *)NextDelim;\r
\r
//\r
// Remove any non-escaped quotes in the string\r
// Remove any remaining escape characters in the string\r
//\r
- for (NextDelim = FindFirstCharacter(*TempParameter, L"\"^", CHAR_NULL)\r
- ; *NextDelim != CHAR_NULL\r
- ; NextDelim = FindFirstCharacter(NextDelim, L"\"^", CHAR_NULL)\r
- ) {\r
+ for (NextDelim = FindFirstCharacter (*TempParameter, L"\"^", CHAR_NULL)\r
+ ; *NextDelim != CHAR_NULL\r
+ ; NextDelim = FindFirstCharacter (NextDelim, L"\"^", CHAR_NULL)\r
+ )\r
+ {\r
if (*NextDelim == L'^') {\r
-\r
//\r
// eliminate the escape ^\r
//\r
- CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
+ CopyMem ((CHAR16 *)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
NextDelim++;\r
} else if (*NextDelim == L'\"') {\r
-\r
//\r
// eliminate the unescaped quote\r
//\r
if (StripQuotation) {\r
- CopyMem ((CHAR16*)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
- } else{\r
+ CopyMem ((CHAR16 *)NextDelim, NextDelim + 1, StrSize (NextDelim + 1));\r
+ } else {\r
NextDelim++;\r
- }\r
+ }\r
}\r
}\r
\r
@return EFI_OUT_OF_RESOURCES a memory allocation failed.\r
**/\r
EFI_STATUS\r
-ParseCommandLineToArgs(\r
- IN CONST CHAR16 *CommandLine,\r
- IN BOOLEAN StripQuotation,\r
- IN OUT CHAR16 ***Argv,\r
- IN OUT UINTN *Argc\r
+ParseCommandLineToArgs (\r
+ IN CONST CHAR16 *CommandLine,\r
+ IN BOOLEAN StripQuotation,\r
+ IN OUT CHAR16 ***Argv,\r
+ IN OUT UINTN *Argc\r
)\r
{\r
UINTN Count;\r
UINTN Size;\r
EFI_STATUS Status;\r
\r
- ASSERT(Argc != NULL);\r
- ASSERT(Argv != NULL);\r
+ ASSERT (Argc != NULL);\r
+ ASSERT (Argv != NULL);\r
\r
- if (CommandLine == NULL || StrLen(CommandLine)==0) {\r
+ if ((CommandLine == NULL) || (StrLen (CommandLine) == 0)) {\r
(*Argc) = 0;\r
(*Argv) = NULL;\r
return (EFI_SUCCESS);\r
}\r
\r
- NewCommandLine = AllocateCopyPool(StrSize(CommandLine), CommandLine);\r
- if (NewCommandLine == NULL){\r
+ NewCommandLine = AllocateCopyPool (StrSize (CommandLine), CommandLine);\r
+ if (NewCommandLine == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
\r
- TrimSpaces(&NewCommandLine);\r
- Size = StrSize(NewCommandLine);\r
- TempParameter = AllocateZeroPool(Size);\r
+ TrimSpaces (&NewCommandLine);\r
+ Size = StrSize (NewCommandLine);\r
+ TempParameter = AllocateZeroPool (Size);\r
if (TempParameter == NULL) {\r
- SHELL_FREE_NON_NULL(NewCommandLine);\r
+ SHELL_FREE_NON_NULL (NewCommandLine);\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
\r
- for ( Count = 0\r
- , Walker = (CHAR16*)NewCommandLine\r
- ; Walker != NULL && *Walker != CHAR_NULL\r
- ; Count++\r
- ) {\r
- if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size, TRUE))) {\r
+ for ( Count = 0,\r
+ Walker = (CHAR16 *)NewCommandLine\r
+ ; Walker != NULL && *Walker != CHAR_NULL\r
+ ; Count++\r
+ )\r
+ {\r
+ if (EFI_ERROR (GetNextParameter (&Walker, &TempParameter, Size, TRUE))) {\r
break;\r
}\r
}\r
//\r
// lets allocate the pointer array\r
//\r
- (*Argv) = AllocateZeroPool((Count)*sizeof(CHAR16*));\r
+ (*Argv) = AllocateZeroPool ((Count)*sizeof (CHAR16 *));\r
if (*Argv == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
\r
- *Argc = 0;\r
- Walker = (CHAR16*)NewCommandLine;\r
- while(Walker != NULL && *Walker != CHAR_NULL) {\r
- SetMem16(TempParameter, Size, CHAR_NULL);\r
- if (EFI_ERROR(GetNextParameter(&Walker, &TempParameter, Size, StripQuotation))) {\r
+ *Argc = 0;\r
+ Walker = (CHAR16 *)NewCommandLine;\r
+ while (Walker != NULL && *Walker != CHAR_NULL) {\r
+ SetMem16 (TempParameter, Size, CHAR_NULL);\r
+ if (EFI_ERROR (GetNextParameter (&Walker, &TempParameter, Size, StripQuotation))) {\r
Status = EFI_INVALID_PARAMETER;\r
goto Done;\r
}\r
\r
- NewParam = AllocateCopyPool(StrSize(TempParameter), TempParameter);\r
- if (NewParam == NULL){\r
+ NewParam = AllocateCopyPool (StrSize (TempParameter), TempParameter);\r
+ if (NewParam == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
- ((CHAR16**)(*Argv))[(*Argc)] = NewParam;\r
+\r
+ ((CHAR16 **)(*Argv))[(*Argc)] = NewParam;\r
(*Argc)++;\r
}\r
- ASSERT(Count >= (*Argc));\r
+\r
+ ASSERT (Count >= (*Argc));\r
Status = EFI_SUCCESS;\r
\r
Done:\r
- SHELL_FREE_NON_NULL(TempParameter);\r
- SHELL_FREE_NON_NULL(NewCommandLine);\r
+ SHELL_FREE_NON_NULL (TempParameter);\r
+ SHELL_FREE_NON_NULL (NewCommandLine);\r
return (Status);\r
}\r
\r
IN OUT BOOLEAN *RootShellInstance\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
- CHAR16 *FullCommandLine;\r
- UINTN Size;\r
+ EFI_STATUS Status;\r
+ EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
+ CHAR16 *FullCommandLine;\r
+ UINTN Size;\r
\r
- Size = 0;\r
+ Size = 0;\r
FullCommandLine = NULL;\r
- LoadedImage = NULL;\r
+ LoadedImage = NULL;\r
\r
//\r
// Assert for valid parameters\r
//\r
- ASSERT(NewShellParameters != NULL);\r
- ASSERT(RootShellInstance != NULL);\r
+ ASSERT (NewShellParameters != NULL);\r
+ ASSERT (RootShellInstance != NULL);\r
\r
//\r
// See if we have a shell parameters placed on us\r
//\r
Status = gBS->OpenProtocol (\r
- gImageHandle,\r
- &gEfiShellParametersProtocolGuid,\r
- (VOID **) &ShellInfoObject.OldShellParameters,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
+ gImageHandle,\r
+ &gEfiShellParametersProtocolGuid,\r
+ (VOID **)&ShellInfoObject.OldShellParameters,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
//\r
// if we don't then we must be the root shell (error is expected)\r
//\r
//\r
// Allocate the new structure\r
//\r
- *NewShellParameters = AllocateZeroPool(sizeof(EFI_SHELL_PARAMETERS_PROTOCOL));\r
+ *NewShellParameters = AllocateZeroPool (sizeof (EFI_SHELL_PARAMETERS_PROTOCOL));\r
if ((*NewShellParameters) == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
// get loaded image protocol\r
//\r
Status = gBS->OpenProtocol (\r
- gImageHandle,\r
- &gEfiLoadedImageProtocolGuid,\r
- (VOID **) &LoadedImage,\r
- gImageHandle,\r
- NULL,\r
- EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
- );\r
- ASSERT_EFI_ERROR(Status);\r
+ gImageHandle,\r
+ &gEfiLoadedImageProtocolGuid,\r
+ (VOID **)&LoadedImage,\r
+ gImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
//\r
// Build the full command line\r
//\r
- Status = SHELL_GET_ENVIRONMENT_VARIABLE(L"ShellOpt", &Size, FullCommandLine);\r
+ Status = SHELL_GET_ENVIRONMENT_VARIABLE (L"ShellOpt", &Size, FullCommandLine);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
- FullCommandLine = AllocateZeroPool(Size + LoadedImage->LoadOptionsSize);\r
- Status = SHELL_GET_ENVIRONMENT_VARIABLE(L"ShellOpt", &Size, FullCommandLine);\r
+ FullCommandLine = AllocateZeroPool (Size + LoadedImage->LoadOptionsSize);\r
+ Status = SHELL_GET_ENVIRONMENT_VARIABLE (L"ShellOpt", &Size, FullCommandLine);\r
}\r
+\r
if (Status == EFI_NOT_FOUND) {\r
//\r
// no parameters via environment... ok\r
//\r
} else {\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return (Status);\r
}\r
}\r
- if (Size == 0 && LoadedImage->LoadOptionsSize != 0) {\r
- ASSERT(FullCommandLine == NULL);\r
+\r
+ if ((Size == 0) && (LoadedImage->LoadOptionsSize != 0)) {\r
+ ASSERT (FullCommandLine == NULL);\r
//\r
// Now we need to include a NULL terminator in the size.\r
//\r
- Size = LoadedImage->LoadOptionsSize + sizeof(FullCommandLine[0]);\r
- FullCommandLine = AllocateZeroPool(Size);\r
+ Size = LoadedImage->LoadOptionsSize + sizeof (FullCommandLine[0]);\r
+ FullCommandLine = AllocateZeroPool (Size);\r
}\r
+\r
if (FullCommandLine != NULL) {\r
CopyMem (FullCommandLine, LoadedImage->LoadOptions, LoadedImage->LoadOptionsSize);\r
//\r
// Populate Argc and Argv\r
//\r
- Status = ParseCommandLineToArgs(FullCommandLine,\r
- TRUE,\r
- &(*NewShellParameters)->Argv,\r
- &(*NewShellParameters)->Argc);\r
+ Status = ParseCommandLineToArgs (\r
+ FullCommandLine,\r
+ TRUE,\r
+ &(*NewShellParameters)->Argv,\r
+ &(*NewShellParameters)->Argc\r
+ );\r
\r
- FreePool(FullCommandLine);\r
+ FreePool (FullCommandLine);\r
\r
- ASSERT_EFI_ERROR(Status);\r
+ ASSERT_EFI_ERROR (Status);\r
} else {\r
(*NewShellParameters)->Argv = NULL;\r
(*NewShellParameters)->Argc = 0;\r
(*NewShellParameters)->StdIn = &FileInterfaceStdIn;\r
(*NewShellParameters)->StdOut = &FileInterfaceStdOut;\r
(*NewShellParameters)->StdErr = &FileInterfaceStdErr;\r
- Status = gBS->InstallProtocolInterface(&gImageHandle,\r
+ Status = gBS->InstallProtocolInterface (\r
+ &gImageHandle,\r
&gEfiShellParametersProtocolGuid,\r
EFI_NATIVE_INTERFACE,\r
- (VOID*)(*NewShellParameters));\r
+ (VOID *)(*NewShellParameters)\r
+ );\r
} else {\r
//\r
// copy from the existing ones\r
(*NewShellParameters)->StdIn = ShellInfoObject.OldShellParameters->StdIn;\r
(*NewShellParameters)->StdOut = ShellInfoObject.OldShellParameters->StdOut;\r
(*NewShellParameters)->StdErr = ShellInfoObject.OldShellParameters->StdErr;\r
- Status = gBS->ReinstallProtocolInterface(gImageHandle,\r
- &gEfiShellParametersProtocolGuid,\r
- (VOID*)ShellInfoObject.OldShellParameters,\r
- (VOID*)(*NewShellParameters));\r
+ Status = gBS->ReinstallProtocolInterface (\r
+ gImageHandle,\r
+ &gEfiShellParametersProtocolGuid,\r
+ (VOID *)ShellInfoObject.OldShellParameters,\r
+ (VOID *)(*NewShellParameters)\r
+ );\r
}\r
\r
return (Status);\r
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *NewShellParameters\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN LoopCounter;\r
+ EFI_STATUS Status;\r
+ UINTN LoopCounter;\r
\r
//\r
// If the old exists we need to restore it\r
//\r
if (ShellInfoObject.OldShellParameters != NULL) {\r
- Status = gBS->ReinstallProtocolInterface(gImageHandle,\r
- &gEfiShellParametersProtocolGuid,\r
- (VOID*)NewShellParameters,\r
- (VOID*)ShellInfoObject.OldShellParameters);\r
- DEBUG_CODE(ShellInfoObject.OldShellParameters = NULL;);\r
+ Status = gBS->ReinstallProtocolInterface (\r
+ gImageHandle,\r
+ &gEfiShellParametersProtocolGuid,\r
+ (VOID *)NewShellParameters,\r
+ (VOID *)ShellInfoObject.OldShellParameters\r
+ );\r
+ DEBUG_CODE (\r
+ ShellInfoObject.OldShellParameters = NULL;\r
+ );\r
} else {\r
//\r
// No old one, just uninstall us...\r
//\r
- Status = gBS->UninstallProtocolInterface(gImageHandle,\r
- &gEfiShellParametersProtocolGuid,\r
- (VOID*)NewShellParameters);\r
+ Status = gBS->UninstallProtocolInterface (\r
+ gImageHandle,\r
+ &gEfiShellParametersProtocolGuid,\r
+ (VOID *)NewShellParameters\r
+ );\r
}\r
+\r
if (NewShellParameters->Argv != NULL) {\r
for ( LoopCounter = 0\r
- ; LoopCounter < NewShellParameters->Argc\r
- ; LoopCounter++\r
- ){\r
- FreePool(NewShellParameters->Argv[LoopCounter]);\r
+ ; LoopCounter < NewShellParameters->Argc\r
+ ; LoopCounter++\r
+ )\r
+ {\r
+ FreePool (NewShellParameters->Argv[LoopCounter]);\r
}\r
- FreePool(NewShellParameters->Argv);\r
+\r
+ FreePool (NewShellParameters->Argv);\r
}\r
- FreePool(NewShellParameters);\r
+\r
+ FreePool (NewShellParameters);\r
return (Status);\r
}\r
\r
@return An error upon failure.\r
**/\r
EFI_STATUS\r
-IsUnicodeFile(\r
- IN CONST CHAR16 *FileName\r
+IsUnicodeFile (\r
+ IN CONST CHAR16 *FileName\r
)\r
{\r
- SHELL_FILE_HANDLE Handle;\r
- EFI_STATUS Status;\r
- UINT64 OriginalFilePosition;\r
- UINTN CharSize;\r
- CHAR16 CharBuffer;\r
-\r
- Status = gEfiShellProtocol->OpenFileByName(FileName, &Handle, EFI_FILE_MODE_READ);\r
- if (EFI_ERROR(Status)) {\r
+ SHELL_FILE_HANDLE Handle;\r
+ EFI_STATUS Status;\r
+ UINT64 OriginalFilePosition;\r
+ UINTN CharSize;\r
+ CHAR16 CharBuffer;\r
+\r
+ Status = gEfiShellProtocol->OpenFileByName (FileName, &Handle, EFI_FILE_MODE_READ);\r
+ if (EFI_ERROR (Status)) {\r
return (Status);\r
}\r
- gEfiShellProtocol->GetFilePosition(Handle, &OriginalFilePosition);\r
- gEfiShellProtocol->SetFilePosition(Handle, 0);\r
- CharSize = sizeof(CHAR16);\r
- Status = gEfiShellProtocol->ReadFile(Handle, &CharSize, &CharBuffer);\r
- if (EFI_ERROR(Status) || CharBuffer != gUnicodeFileTag) {\r
+\r
+ gEfiShellProtocol->GetFilePosition (Handle, &OriginalFilePosition);\r
+ gEfiShellProtocol->SetFilePosition (Handle, 0);\r
+ CharSize = sizeof (CHAR16);\r
+ Status = gEfiShellProtocol->ReadFile (Handle, &CharSize, &CharBuffer);\r
+ if (EFI_ERROR (Status) || (CharBuffer != gUnicodeFileTag)) {\r
Status = EFI_BUFFER_TOO_SMALL;\r
}\r
- gEfiShellProtocol->SetFilePosition(Handle, OriginalFilePosition);\r
- gEfiShellProtocol->CloseFile(Handle);\r
+\r
+ gEfiShellProtocol->SetFilePosition (Handle, OriginalFilePosition);\r
+ gEfiShellProtocol->CloseFile (Handle);\r
return (Status);\r
}\r
\r
**/\r
VOID\r
StripQuotes (\r
- IN OUT CHAR16 *TheString\r
+ IN OUT CHAR16 *TheString\r
)\r
{\r
- BOOLEAN RemoveNow;\r
+ BOOLEAN RemoveNow;\r
\r
- for (RemoveNow = FALSE ; TheString != NULL && *TheString != CHAR_NULL ; TheString++) {\r
- if (*TheString == L'^' && *(TheString + 1) == L'\"') {\r
+ for (RemoveNow = FALSE; TheString != NULL && *TheString != CHAR_NULL; TheString++) {\r
+ if ((*TheString == L'^') && (*(TheString + 1) == L'\"')) {\r
TheString++;\r
} else if (*TheString == L'\"') {\r
- RemoveNow = (BOOLEAN)!RemoveNow;\r
+ RemoveNow = (BOOLEAN) !RemoveNow;\r
} else if (RemoveNow) {\r
*TheString = L' ';\r
}\r
**/\r
VOID\r
CalculateEfiHdrCrc (\r
- IN OUT EFI_TABLE_HEADER *Hdr\r
+ IN OUT EFI_TABLE_HEADER *Hdr\r
)\r
{\r
- UINT32 Crc;\r
+ UINT32 Crc;\r
\r
Hdr->CRC32 = 0;\r
\r
@retval NULL FileName was invalid.\r
@return The modified FileName.\r
**/\r
-CHAR16*\r
+CHAR16 *\r
FixFileName (\r
- IN CHAR16 *FileName\r
+ IN CHAR16 *FileName\r
)\r
{\r
CHAR16 *Copy;\r
\r
if (FileName[0] == L'\"') {\r
Copy = FileName+1;\r
- if ((TempLocation = StrStr(Copy , L"\"")) != NULL) {\r
+ if ((TempLocation = StrStr (Copy, L"\"")) != NULL) {\r
TempLocation[0] = CHAR_NULL;\r
}\r
} else {\r
Copy = FileName;\r
- while(Copy[0] == L' ') {\r
+ while (Copy[0] == L' ') {\r
Copy++;\r
}\r
- if ((TempLocation = StrStr(Copy , L" ")) != NULL) {\r
+\r
+ if ((TempLocation = StrStr (Copy, L" ")) != NULL) {\r
TempLocation[0] = CHAR_NULL;\r
}\r
}\r
@retval NULL FileName was invalid.\r
@return The modified FileName.\r
**/\r
-CHAR16*\r
+CHAR16 *\r
FixVarName (\r
- IN CHAR16 *FileName\r
+ IN CHAR16 *FileName\r
)\r
{\r
CHAR16 *Copy;\r
\r
if (FileName[0] == L'%') {\r
Copy = FileName+1;\r
- if ((TempLocation = StrStr(Copy , L"%")) != NULL) {\r
+ if ((TempLocation = StrStr (Copy, L"%")) != NULL) {\r
TempLocation[0] = CHAR_NULL;\r
}\r
}\r
\r
- return (FixFileName(Copy));\r
+ return (FixFileName (Copy));\r
}\r
\r
-\r
/**\r
Write the unicode file tag to the specified file.\r
\r
**/\r
EFI_STATUS\r
WriteFileTag (\r
- IN SHELL_FILE_HANDLE FileHandle\r
+ IN SHELL_FILE_HANDLE FileHandle\r
)\r
{\r
- CHAR16 FileTag;\r
- UINTN Size;\r
- EFI_STATUS Status;\r
+ CHAR16 FileTag;\r
+ UINTN Size;\r
+ EFI_STATUS Status;\r
\r
FileTag = gUnicodeFileTag;\r
- Size = sizeof FileTag;\r
- Status = ShellInfoObject.NewEfiShellProtocol->WriteFile (FileHandle, &Size,\r
- &FileTag);\r
+ Size = sizeof FileTag;\r
+ Status = ShellInfoObject.NewEfiShellProtocol->WriteFile (\r
+ FileHandle,\r
+ &Size,\r
+ &FileTag\r
+ );\r
ASSERT (EFI_ERROR (Status) || Size == sizeof FileTag);\r
return Status;\r
}\r
\r
-\r
/**\r
Function will replace the current StdIn and StdOut in the ShellParameters protocol\r
structure by parsing NewCommandLine. The current values are returned to the\r
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.\r
**/\r
EFI_STATUS\r
-UpdateStdInStdOutStdErr(\r
+UpdateStdInStdOutStdErr (\r
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,\r
IN CHAR16 *NewCommandLine,\r
OUT SHELL_FILE_HANDLE *OldStdIn,\r
OUT SYSTEM_TABLE_INFO *SystemTableInfo\r
)\r
{\r
- CHAR16 *CommandLineCopy;\r
- CHAR16 *CommandLineWalker;\r
- CHAR16 *StdErrFileName;\r
- CHAR16 *StdOutFileName;\r
- CHAR16 *StdInFileName;\r
- CHAR16 *StdInVarName;\r
- CHAR16 *StdOutVarName;\r
- CHAR16 *StdErrVarName;\r
- EFI_STATUS Status;\r
- SHELL_FILE_HANDLE TempHandle;\r
- UINT64 FileSize;\r
- BOOLEAN OutUnicode;\r
- BOOLEAN InUnicode;\r
- BOOLEAN ErrUnicode;\r
- BOOLEAN OutAppend;\r
- BOOLEAN ErrAppend;\r
- UINTN Size;\r
- SPLIT_LIST *Split;\r
- CHAR16 *FirstLocation;\r
- BOOLEAN Volatile;\r
-\r
- OutUnicode = TRUE;\r
- InUnicode = TRUE;\r
+ CHAR16 *CommandLineCopy;\r
+ CHAR16 *CommandLineWalker;\r
+ CHAR16 *StdErrFileName;\r
+ CHAR16 *StdOutFileName;\r
+ CHAR16 *StdInFileName;\r
+ CHAR16 *StdInVarName;\r
+ CHAR16 *StdOutVarName;\r
+ CHAR16 *StdErrVarName;\r
+ EFI_STATUS Status;\r
+ SHELL_FILE_HANDLE TempHandle;\r
+ UINT64 FileSize;\r
+ BOOLEAN OutUnicode;\r
+ BOOLEAN InUnicode;\r
+ BOOLEAN ErrUnicode;\r
+ BOOLEAN OutAppend;\r
+ BOOLEAN ErrAppend;\r
+ UINTN Size;\r
+ SPLIT_LIST *Split;\r
+ CHAR16 *FirstLocation;\r
+ BOOLEAN Volatile;\r
+\r
+ OutUnicode = TRUE;\r
+ InUnicode = TRUE;\r
AsciiRedirection = FALSE;\r
- ErrUnicode = TRUE;\r
- StdInVarName = NULL;\r
- StdOutVarName = NULL;\r
- StdErrVarName = NULL;\r
- StdErrFileName = NULL;\r
- StdInFileName = NULL;\r
- StdOutFileName = NULL;\r
- ErrAppend = FALSE;\r
- OutAppend = FALSE;\r
- CommandLineCopy = NULL;\r
- FirstLocation = NULL;\r
-\r
- if (ShellParameters == NULL || SystemTableInfo == NULL || OldStdIn == NULL || OldStdOut == NULL || OldStdErr == NULL) {\r
+ ErrUnicode = TRUE;\r
+ StdInVarName = NULL;\r
+ StdOutVarName = NULL;\r
+ StdErrVarName = NULL;\r
+ StdErrFileName = NULL;\r
+ StdInFileName = NULL;\r
+ StdOutFileName = NULL;\r
+ ErrAppend = FALSE;\r
+ OutAppend = FALSE;\r
+ CommandLineCopy = NULL;\r
+ FirstLocation = NULL;\r
+\r
+ if ((ShellParameters == NULL) || (SystemTableInfo == NULL) || (OldStdIn == NULL) || (OldStdOut == NULL) || (OldStdErr == NULL)) {\r
return (EFI_INVALID_PARAMETER);\r
}\r
\r
- SystemTableInfo->ConIn = gST->ConIn;\r
- SystemTableInfo->ConInHandle = gST->ConsoleInHandle;\r
- SystemTableInfo->ConOut = gST->ConOut;\r
- SystemTableInfo->ConOutHandle = gST->ConsoleOutHandle;\r
- SystemTableInfo->ErrOut = gST->StdErr;\r
- SystemTableInfo->ErrOutHandle = gST->StandardErrorHandle;\r
- *OldStdIn = ShellParameters->StdIn;\r
- *OldStdOut = ShellParameters->StdOut;\r
- *OldStdErr = ShellParameters->StdErr;\r
+ SystemTableInfo->ConIn = gST->ConIn;\r
+ SystemTableInfo->ConInHandle = gST->ConsoleInHandle;\r
+ SystemTableInfo->ConOut = gST->ConOut;\r
+ SystemTableInfo->ConOutHandle = gST->ConsoleOutHandle;\r
+ SystemTableInfo->ErrOut = gST->StdErr;\r
+ SystemTableInfo->ErrOutHandle = gST->StandardErrorHandle;\r
+ *OldStdIn = ShellParameters->StdIn;\r
+ *OldStdOut = ShellParameters->StdOut;\r
+ *OldStdErr = ShellParameters->StdErr;\r
\r
if (NewCommandLine == NULL) {\r
return (EFI_SUCCESS);\r
}\r
\r
- CommandLineCopy = StrnCatGrow(&CommandLineCopy, NULL, NewCommandLine, 0);\r
+ CommandLineCopy = StrnCatGrow (&CommandLineCopy, NULL, NewCommandLine, 0);\r
if (CommandLineCopy == NULL) {\r
return (EFI_OUT_OF_RESOURCES);\r
}\r
- Status = EFI_SUCCESS;\r
- Split = NULL;\r
- FirstLocation = CommandLineCopy + StrLen(CommandLineCopy);\r
\r
- StripQuotes(CommandLineCopy);\r
+ Status = EFI_SUCCESS;\r
+ Split = NULL;\r
+ FirstLocation = CommandLineCopy + StrLen (CommandLineCopy);\r
+\r
+ StripQuotes (CommandLineCopy);\r
\r
- if (!IsListEmpty(&ShellInfoObject.SplitList.Link)) {\r
- Split = (SPLIT_LIST*)GetFirstNode(&ShellInfoObject.SplitList.Link);\r
- if (Split != NULL && Split->SplitStdIn != NULL) {\r
- ShellParameters->StdIn = Split->SplitStdIn;\r
+ if (!IsListEmpty (&ShellInfoObject.SplitList.Link)) {\r
+ Split = (SPLIT_LIST *)GetFirstNode (&ShellInfoObject.SplitList.Link);\r
+ if ((Split != NULL) && (Split->SplitStdIn != NULL)) {\r
+ ShellParameters->StdIn = Split->SplitStdIn;\r
}\r
- if (Split != NULL && Split->SplitStdOut != NULL) {\r
+\r
+ if ((Split != NULL) && (Split->SplitStdOut != NULL)) {\r
ShellParameters->StdOut = Split->SplitStdOut;\r
}\r
}\r
\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 2>>v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 12, L' ');\r
- StdErrVarName = CommandLineWalker += 6;\r
- ErrAppend = TRUE;\r
- if (StrStr(CommandLineWalker, L" 2>>v ") != NULL) {\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 2>>v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 12, L' ');\r
+ StdErrVarName = CommandLineWalker += 6;\r
+ ErrAppend = TRUE;\r
+ if (StrStr (CommandLineWalker, L" 2>>v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>>v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 12, L' ');\r
- StdOutVarName = CommandLineWalker += 6;\r
- OutAppend = TRUE;\r
- if (StrStr(CommandLineWalker, L" 1>>v ") != NULL) {\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1>>v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 12, L' ');\r
+ StdOutVarName = CommandLineWalker += 6;\r
+ OutAppend = TRUE;\r
+ if (StrStr (CommandLineWalker, L" 1>>v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
- } else if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >>v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
- StdOutVarName = CommandLineWalker += 5;\r
- OutAppend = TRUE;\r
- if (StrStr(CommandLineWalker, L" >>v ") != NULL) {\r
+ } else if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" >>v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
+ StdOutVarName = CommandLineWalker += 5;\r
+ OutAppend = TRUE;\r
+ if (StrStr (CommandLineWalker, L" >>v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
- } else if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
- StdOutVarName = CommandLineWalker += 4;\r
- OutAppend = FALSE;\r
- if (StrStr(CommandLineWalker, L" >v ") != NULL) {\r
+ } else if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" >v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
+ StdOutVarName = CommandLineWalker += 4;\r
+ OutAppend = FALSE;\r
+ if (StrStr (CommandLineWalker, L" >v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>>a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 12, L' ');\r
- StdOutFileName = CommandLineWalker += 6;\r
- OutAppend = TRUE;\r
- OutUnicode = FALSE;\r
- if (StrStr(CommandLineWalker, L" 1>>a ") != NULL) {\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1>>a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 12, L' ');\r
+ StdOutFileName = CommandLineWalker += 6;\r
+ OutAppend = TRUE;\r
+ OutUnicode = FALSE;\r
+ if (StrStr (CommandLineWalker, L" 1>>a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>> ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1>> ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 5;\r
- OutAppend = TRUE;\r
+ StdOutFileName = CommandLineWalker += 5;\r
+ OutAppend = TRUE;\r
}\r
- if (StrStr(CommandLineWalker, L" 1>> ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 1>> ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >> ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" >> ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 4;\r
- OutAppend = TRUE;\r
+ StdOutFileName = CommandLineWalker += 4;\r
+ OutAppend = TRUE;\r
}\r
- if (StrStr(CommandLineWalker, L" >> ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" >> ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >>a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" >>a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 5;\r
- OutAppend = TRUE;\r
- OutUnicode = FALSE;\r
+ StdOutFileName = CommandLineWalker += 5;\r
+ OutAppend = TRUE;\r
+ OutUnicode = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" >>a ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" >>a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1>a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 5;\r
- OutAppend = FALSE;\r
- OutUnicode = FALSE;\r
+ StdOutFileName = CommandLineWalker += 5;\r
+ OutAppend = FALSE;\r
+ OutUnicode = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 1>a ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 1>a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" >a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" >a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 4;\r
- OutAppend = FALSE;\r
- OutUnicode = FALSE;\r
+ StdOutFileName = CommandLineWalker += 4;\r
+ OutAppend = FALSE;\r
+ OutUnicode = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" >a ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" >a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 2>> ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 2>> ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdErrFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdErrFileName = CommandLineWalker += 5;\r
- ErrAppend = TRUE;\r
+ StdErrFileName = CommandLineWalker += 5;\r
+ ErrAppend = TRUE;\r
}\r
- if (StrStr(CommandLineWalker, L" 2>> ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 2>> ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 2>v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 2>v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdErrVarName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdErrVarName = CommandLineWalker += 5;\r
- ErrAppend = FALSE;\r
+ StdErrVarName = CommandLineWalker += 5;\r
+ ErrAppend = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 2>v ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 2>v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1>v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1>v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdOutVarName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutVarName = CommandLineWalker += 5;\r
- OutAppend = FALSE;\r
+ StdOutVarName = CommandLineWalker += 5;\r
+ OutAppend = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 1>v ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 1>v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 2>a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 10, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 2>a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 10, L' ');\r
if (StdErrFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdErrFileName = CommandLineWalker += 5;\r
- ErrAppend = FALSE;\r
- ErrUnicode = FALSE;\r
+ StdErrFileName = CommandLineWalker += 5;\r
+ ErrAppend = FALSE;\r
+ ErrUnicode = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 2>a ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 2>a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 2> ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 2> ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdErrFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdErrFileName = CommandLineWalker += 4;\r
- ErrAppend = FALSE;\r
+ StdErrFileName = CommandLineWalker += 4;\r
+ ErrAppend = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 2> ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 2> ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" 1> ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" 1> ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 4;\r
- OutAppend = FALSE;\r
+ StdOutFileName = CommandLineWalker += 4;\r
+ OutAppend = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" 1> ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" 1> ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" > ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 6, L' ');\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" > ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 6, L' ');\r
if (StdOutFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdOutFileName = CommandLineWalker += 3;\r
- OutAppend = FALSE;\r
+ StdOutFileName = CommandLineWalker += 3;\r
+ OutAppend = FALSE;\r
}\r
- if (StrStr(CommandLineWalker, L" > ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" > ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" < ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 6, L' ');\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" < ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 6, L' ');\r
if (StdInFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdInFileName = CommandLineWalker += 3;\r
+ StdInFileName = CommandLineWalker += 3;\r
}\r
- if (StrStr(CommandLineWalker, L" < ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" < ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" <a ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" <a ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdInFileName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdInFileName = CommandLineWalker += 4;\r
- InUnicode = FALSE;\r
+ StdInFileName = CommandLineWalker += 4;\r
+ InUnicode = FALSE;\r
AsciiRedirection = TRUE;\r
}\r
- if (StrStr(CommandLineWalker, L" <a ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" <a ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
- if (!EFI_ERROR(Status) && (CommandLineWalker = StrStr(CommandLineCopy, L" <v ")) != NULL) {\r
- FirstLocation = MIN(CommandLineWalker, FirstLocation);\r
- SetMem16(CommandLineWalker, 8, L' ');\r
+\r
+ if (!EFI_ERROR (Status) && ((CommandLineWalker = StrStr (CommandLineCopy, L" <v ")) != NULL)) {\r
+ FirstLocation = MIN (CommandLineWalker, FirstLocation);\r
+ SetMem16 (CommandLineWalker, 8, L' ');\r
if (StdInVarName != NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
- StdInVarName = CommandLineWalker += 4;\r
+ StdInVarName = CommandLineWalker += 4;\r
}\r
- if (StrStr(CommandLineWalker, L" <v ") != NULL) {\r
+\r
+ if (StrStr (CommandLineWalker, L" <v ") != NULL) {\r
Status = EFI_NOT_FOUND;\r
}\r
}\r
//\r
// re-populate the string to support any filenames that were in quotes.\r
//\r
- StrnCpyS(CommandLineCopy, StrSize(CommandLineCopy)/sizeof(CHAR16), NewCommandLine, StrLen(NewCommandLine));\r
+ StrnCpyS (CommandLineCopy, StrSize (CommandLineCopy)/sizeof (CHAR16), NewCommandLine, StrLen (NewCommandLine));\r
\r
- if (FirstLocation != CommandLineCopy + StrLen(CommandLineCopy)\r
- && (((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof(CHAR16) < StrLen(NewCommandLine))\r
- ){\r
- *(NewCommandLine + ((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof(CHAR16)) = CHAR_NULL;\r
+ if ( (FirstLocation != CommandLineCopy + StrLen (CommandLineCopy))\r
+ && (((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof (CHAR16) < StrLen (NewCommandLine))\r
+ )\r
+ {\r
+ *(NewCommandLine + ((UINTN)FirstLocation - (UINTN)CommandLineCopy)/sizeof (CHAR16)) = CHAR_NULL;\r
}\r
\r
- if (!EFI_ERROR(Status)) {\r
-\r
+ if (!EFI_ERROR (Status)) {\r
if (StdErrFileName != NULL) {\r
- if ((StdErrFileName = FixFileName(StdErrFileName)) == NULL) {\r
+ if ((StdErrFileName = FixFileName (StdErrFileName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
if (StdOutFileName != NULL) {\r
- if ((StdOutFileName = FixFileName(StdOutFileName)) == NULL) {\r
+ if ((StdOutFileName = FixFileName (StdOutFileName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
if (StdInFileName != NULL) {\r
- if ((StdInFileName = FixFileName(StdInFileName)) == NULL) {\r
+ if ((StdInFileName = FixFileName (StdInFileName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
if (StdErrVarName != NULL) {\r
- if ((StdErrVarName = FixVarName(StdErrVarName)) == NULL) {\r
+ if ((StdErrVarName = FixVarName (StdErrVarName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
if (StdOutVarName != NULL) {\r
- if ((StdOutVarName = FixVarName(StdOutVarName)) == NULL) {\r
+ if ((StdOutVarName = FixVarName (StdOutVarName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
+\r
if (StdInVarName != NULL) {\r
- if ((StdInVarName = FixVarName(StdInVarName)) == NULL) {\r
+ if ((StdInVarName = FixVarName (StdInVarName)) == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
}\r
// Verify not the same and not duplicating something from a split\r
//\r
if (\r
- //\r
- // Check that no 2 filenames are the same\r
- //\r
- (StdErrFileName != NULL && StdOutFileName!= NULL && StringNoCaseCompare(&StdErrFileName, &StdOutFileName) == 0)\r
- ||(StdErrFileName != NULL && StdInFileName != NULL && StringNoCaseCompare(&StdErrFileName, &StdInFileName ) == 0)\r
- ||(StdOutFileName != NULL && StdInFileName != NULL && StringNoCaseCompare(&StdOutFileName, &StdInFileName ) == 0)\r
- //\r
- // Check that no 2 variable names are the same\r
- //\r
- ||(StdErrVarName != NULL && StdInVarName != NULL && StringNoCaseCompare(&StdErrVarName , &StdInVarName ) == 0)\r
- ||(StdOutVarName != NULL && StdInVarName != NULL && StringNoCaseCompare(&StdOutVarName , &StdInVarName ) == 0)\r
- ||(StdErrVarName != NULL && StdOutVarName != NULL && StringNoCaseCompare(&StdErrVarName , &StdOutVarName ) == 0)\r
- //\r
- // When a split (using | operator) is in place some are not allowed\r
- //\r
- ||(Split != NULL && Split->SplitStdIn != NULL && (StdInVarName != NULL || StdInFileName != NULL))\r
- ||(Split != NULL && Split->SplitStdOut != NULL && (StdOutVarName != NULL || StdOutFileName != NULL))\r
- //\r
- // Check that nothing is trying to be output to 2 locations.\r
- //\r
- ||(StdErrFileName != NULL && StdErrVarName != NULL)\r
- ||(StdOutFileName != NULL && StdOutVarName != NULL)\r
- ||(StdInFileName != NULL && StdInVarName != NULL)\r
- //\r
- // Check for no volatile environment variables\r
- //\r
- ||(StdErrVarName != NULL && !EFI_ERROR (IsVolatileEnv (StdErrVarName, &Volatile)) && !Volatile)\r
- ||(StdOutVarName != NULL && !EFI_ERROR (IsVolatileEnv (StdOutVarName, &Volatile)) && !Volatile)\r
- //\r
- // Cant redirect during a reconnect operation.\r
- //\r
- ||(StrStr(NewCommandLine, L"connect -r") != NULL\r
- && (StdOutVarName != NULL || StdOutFileName != NULL || StdErrFileName != NULL || StdErrVarName != NULL))\r
- //\r
- // Check that filetypes (Unicode/Ascii) do not change during an append\r
- //\r
- ||(StdOutFileName != NULL && OutUnicode && OutAppend && (!EFI_ERROR(ShellFileExists(StdOutFileName)) && EFI_ERROR(IsUnicodeFile(StdOutFileName))))\r
- ||(StdErrFileName != NULL && ErrUnicode && ErrAppend && (!EFI_ERROR(ShellFileExists(StdErrFileName)) && EFI_ERROR(IsUnicodeFile(StdErrFileName))))\r
- ||(StdOutFileName != NULL && !OutUnicode && OutAppend && (!EFI_ERROR(ShellFileExists(StdOutFileName)) && !EFI_ERROR(IsUnicodeFile(StdOutFileName))))\r
- ||(StdErrFileName != NULL && !ErrUnicode && ErrAppend && (!EFI_ERROR(ShellFileExists(StdErrFileName)) && !EFI_ERROR(IsUnicodeFile(StdErrFileName))))\r
- ){\r
- Status = EFI_INVALID_PARAMETER;\r
+ //\r
+ // Check that no 2 filenames are the same\r
+ //\r
+ ((StdErrFileName != NULL) && (StdOutFileName != NULL) && (StringNoCaseCompare (&StdErrFileName, &StdOutFileName) == 0))\r
+ || ((StdErrFileName != NULL) && (StdInFileName != NULL) && (StringNoCaseCompare (&StdErrFileName, &StdInFileName) == 0))\r
+ || ((StdOutFileName != NULL) && (StdInFileName != NULL) && (StringNoCaseCompare (&StdOutFileName, &StdInFileName) == 0))\r
+ //\r
+ // Check that no 2 variable names are the same\r
+ //\r
+ || ((StdErrVarName != NULL) && (StdInVarName != NULL) && (StringNoCaseCompare (&StdErrVarName, &StdInVarName) == 0))\r
+ || ((StdOutVarName != NULL) && (StdInVarName != NULL) && (StringNoCaseCompare (&StdOutVarName, &StdInVarName) == 0))\r
+ || ((StdErrVarName != NULL) && (StdOutVarName != NULL) && (StringNoCaseCompare (&StdErrVarName, &StdOutVarName) == 0))\r
+ //\r
+ // When a split (using | operator) is in place some are not allowed\r
+ //\r
+ || ((Split != NULL) && (Split->SplitStdIn != NULL) && ((StdInVarName != NULL) || (StdInFileName != NULL)))\r
+ || ((Split != NULL) && (Split->SplitStdOut != NULL) && ((StdOutVarName != NULL) || (StdOutFileName != NULL)))\r
+ //\r
+ // Check that nothing is trying to be output to 2 locations.\r
+ //\r
+ || ((StdErrFileName != NULL) && (StdErrVarName != NULL))\r
+ || ((StdOutFileName != NULL) && (StdOutVarName != NULL))\r
+ || ((StdInFileName != NULL) && (StdInVarName != NULL))\r
+ //\r
+ // Check for no volatile environment variables\r
+ //\r
+ || ((StdErrVarName != NULL) && !EFI_ERROR (IsVolatileEnv (StdErrVarName, &Volatile)) && !Volatile)\r
+ || ((StdOutVarName != NULL) && !EFI_ERROR (IsVolatileEnv (StdOutVarName, &Volatile)) && !Volatile)\r
+ //\r
+ // Cant redirect during a reconnect operation.\r
+ //\r
+ || ( (StrStr (NewCommandLine, L"connect -r") != NULL)\r
+ && ((StdOutVarName != NULL) || (StdOutFileName != NULL) || (StdErrFileName != NULL) || (StdErrVarName != NULL)))\r
+ //\r
+ // Check that filetypes (Unicode/Ascii) do not change during an append\r
+ //\r
+ || ((StdOutFileName != NULL) && OutUnicode && OutAppend && (!EFI_ERROR (ShellFileExists (StdOutFileName)) && EFI_ERROR (IsUnicodeFile (StdOutFileName))))\r
+ || ((StdErrFileName != NULL) && ErrUnicode && ErrAppend && (!EFI_ERROR (ShellFileExists (StdErrFileName)) && EFI_ERROR (IsUnicodeFile (StdErrFileName))))\r
+ || ((StdOutFileName != NULL) && !OutUnicode && OutAppend && (!EFI_ERROR (ShellFileExists (StdOutFileName)) && !EFI_ERROR (IsUnicodeFile (StdOutFileName))))\r
+ || ((StdErrFileName != NULL) && !ErrUnicode && ErrAppend && (!EFI_ERROR (ShellFileExists (StdErrFileName)) && !EFI_ERROR (IsUnicodeFile (StdErrFileName))))\r
+ )\r
+ {\r
+ Status = EFI_INVALID_PARAMETER;\r
ShellParameters->StdIn = *OldStdIn;\r
ShellParameters->StdOut = *OldStdOut;\r
ShellParameters->StdErr = *OldStdErr;\r
- } else if (!EFI_ERROR(Status)){\r
+ } else if (!EFI_ERROR (Status)) {\r
//\r
// Open the Std<Whatever> and we should not have conflicts here...\r
//\r
//\r
// delete existing file.\r
//\r
- ShellInfoObject.NewEfiShellProtocol->DeleteFileByName(StdErrFileName);\r
+ ShellInfoObject.NewEfiShellProtocol->DeleteFileByName (StdErrFileName);\r
}\r
- Status = ShellOpenFileByName(StdErrFileName, &TempHandle, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE,0);\r
- if (!ErrAppend && ErrUnicode && !EFI_ERROR(Status)) {\r
+\r
+ Status = ShellOpenFileByName (StdErrFileName, &TempHandle, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, 0);\r
+ if (!ErrAppend && ErrUnicode && !EFI_ERROR (Status)) {\r
Status = WriteFileTag (TempHandle);\r
}\r
- if (!ErrUnicode && !EFI_ERROR(Status)) {\r
- TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);\r
- ASSERT(TempHandle != NULL);\r
+\r
+ if (!ErrUnicode && !EFI_ERROR (Status)) {\r
+ TempHandle = CreateFileInterfaceFile (TempHandle, FALSE);\r
+ ASSERT (TempHandle != NULL);\r
}\r
- if (!EFI_ERROR(Status)) {\r
+\r
+ if (!EFI_ERROR (Status)) {\r
ShellParameters->StdErr = TempHandle;\r
- gST->StdErr = CreateSimpleTextOutOnFile(TempHandle, &gST->StandardErrorHandle, gST->StdErr);\r
+ gST->StdErr = CreateSimpleTextOutOnFile (TempHandle, &gST->StandardErrorHandle, gST->StdErr);\r
}\r
}\r
\r
//\r
// StdOut to a file\r
//\r
- if (!EFI_ERROR(Status) && StdOutFileName != NULL) {\r
+ if (!EFI_ERROR (Status) && (StdOutFileName != NULL)) {\r
if (!OutAppend) {\r
//\r
// delete existing file.\r
//\r
- ShellInfoObject.NewEfiShellProtocol->DeleteFileByName(StdOutFileName);\r
+ ShellInfoObject.NewEfiShellProtocol->DeleteFileByName (StdOutFileName);\r
}\r
- Status = ShellOpenFileByName(StdOutFileName, &TempHandle, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE,0);\r
+\r
+ Status = ShellOpenFileByName (StdOutFileName, &TempHandle, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, 0);\r
if (TempHandle == NULL) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
if (gUnicodeCollation->MetaiMatch (gUnicodeCollation, StdOutFileName, L"NUL")) {\r
- //no-op\r
- } else if (!OutAppend && OutUnicode && !EFI_ERROR(Status)) {\r
+ // no-op\r
+ } else if (!OutAppend && OutUnicode && !EFI_ERROR (Status)) {\r
Status = WriteFileTag (TempHandle);\r
} else if (OutAppend) {\r
- Status = ShellInfoObject.NewEfiShellProtocol->GetFileSize(TempHandle, &FileSize);\r
- if (!EFI_ERROR(Status)) {\r
+ Status = ShellInfoObject.NewEfiShellProtocol->GetFileSize (TempHandle, &FileSize);\r
+ if (!EFI_ERROR (Status)) {\r
//\r
// When appending to a new unicode file, write the file tag.\r
// Otherwise (ie. when appending to a new ASCII file, or an\r
// existent file with any encoding), just seek to the end.\r
//\r
Status = (FileSize == 0 && OutUnicode) ?\r
- WriteFileTag (TempHandle) :\r
- ShellInfoObject.NewEfiShellProtocol->SetFilePosition (\r
- TempHandle,\r
- FileSize);\r
+ WriteFileTag (TempHandle) :\r
+ ShellInfoObject.NewEfiShellProtocol->SetFilePosition (\r
+ TempHandle,\r
+ FileSize\r
+ );\r
}\r
}\r
- if (!OutUnicode && !EFI_ERROR(Status)) {\r
- TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);\r
- ASSERT(TempHandle != NULL);\r
+\r
+ if (!OutUnicode && !EFI_ERROR (Status)) {\r
+ TempHandle = CreateFileInterfaceFile (TempHandle, FALSE);\r
+ ASSERT (TempHandle != NULL);\r
}\r
- if (!EFI_ERROR(Status)) {\r
+\r
+ if (!EFI_ERROR (Status)) {\r
ShellParameters->StdOut = TempHandle;\r
- gST->ConOut = CreateSimpleTextOutOnFile(TempHandle, &gST->ConsoleOutHandle, gST->ConOut);\r
+ gST->ConOut = CreateSimpleTextOutOnFile (TempHandle, &gST->ConsoleOutHandle, gST->ConOut);\r
}\r
}\r
}\r
//\r
// StdOut to a var\r
//\r
- if (!EFI_ERROR(Status) && StdOutVarName != NULL) {\r
+ if (!EFI_ERROR (Status) && (StdOutVarName != NULL)) {\r
if (!OutAppend) {\r
//\r
// delete existing variable.\r
//\r
- SHELL_SET_ENVIRONMENT_VARIABLE_V(StdOutVarName, 0, L"");\r
+ SHELL_SET_ENVIRONMENT_VARIABLE_V (StdOutVarName, 0, L"");\r
}\r
- TempHandle = CreateFileInterfaceEnv(StdOutVarName);\r
- ASSERT(TempHandle != NULL);\r
+\r
+ TempHandle = CreateFileInterfaceEnv (StdOutVarName);\r
+ ASSERT (TempHandle != NULL);\r
ShellParameters->StdOut = TempHandle;\r
- gST->ConOut = CreateSimpleTextOutOnFile(TempHandle, &gST->ConsoleOutHandle, gST->ConOut);\r
+ gST->ConOut = CreateSimpleTextOutOnFile (TempHandle, &gST->ConsoleOutHandle, gST->ConOut);\r
}\r
\r
//\r
// StdErr to a var\r
//\r
- if (!EFI_ERROR(Status) && StdErrVarName != NULL) {\r
+ if (!EFI_ERROR (Status) && (StdErrVarName != NULL)) {\r
if (!ErrAppend) {\r
//\r
// delete existing variable.\r
//\r
- SHELL_SET_ENVIRONMENT_VARIABLE_V(StdErrVarName, 0, L"");\r
+ SHELL_SET_ENVIRONMENT_VARIABLE_V (StdErrVarName, 0, L"");\r
}\r
- TempHandle = CreateFileInterfaceEnv(StdErrVarName);\r
- ASSERT(TempHandle != NULL);\r
+\r
+ TempHandle = CreateFileInterfaceEnv (StdErrVarName);\r
+ ASSERT (TempHandle != NULL);\r
ShellParameters->StdErr = TempHandle;\r
- gST->StdErr = CreateSimpleTextOutOnFile(TempHandle, &gST->StandardErrorHandle, gST->StdErr);\r
+ gST->StdErr = CreateSimpleTextOutOnFile (TempHandle, &gST->StandardErrorHandle, gST->StdErr);\r
}\r
\r
//\r
// StdIn from a var\r
//\r
- if (!EFI_ERROR(Status) && StdInVarName != NULL) {\r
- TempHandle = CreateFileInterfaceEnv(StdInVarName);\r
+ if (!EFI_ERROR (Status) && (StdInVarName != NULL)) {\r
+ TempHandle = CreateFileInterfaceEnv (StdInVarName);\r
if (TempHandle == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
} else {\r
if (!InUnicode) {\r
- TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);\r
+ TempHandle = CreateFileInterfaceFile (TempHandle, FALSE);\r
}\r
+\r
Size = 0;\r
- if (TempHandle == NULL || ((EFI_FILE_PROTOCOL*)TempHandle)->Read(TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL) {\r
+ if ((TempHandle == NULL) || (((EFI_FILE_PROTOCOL *)TempHandle)->Read (TempHandle, &Size, NULL) != EFI_BUFFER_TOO_SMALL)) {\r
Status = EFI_INVALID_PARAMETER;\r
} else {\r
ShellParameters->StdIn = TempHandle;\r
- gST->ConIn = CreateSimpleTextInOnFile(TempHandle, &gST->ConsoleInHandle);\r
+ gST->ConIn = CreateSimpleTextInOnFile (TempHandle, &gST->ConsoleInHandle);\r
}\r
}\r
}\r
//\r
// StdIn from a file\r
//\r
- if (!EFI_ERROR(Status) && StdInFileName != NULL) {\r
- Status = ShellOpenFileByName(\r
- StdInFileName,\r
- &TempHandle,\r
- EFI_FILE_MODE_READ,\r
- 0);\r
- if (!EFI_ERROR(Status)) {\r
+ if (!EFI_ERROR (Status) && (StdInFileName != NULL)) {\r
+ Status = ShellOpenFileByName (\r
+ StdInFileName,\r
+ &TempHandle,\r
+ EFI_FILE_MODE_READ,\r
+ 0\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
if (!InUnicode) {\r
//\r
// Create the ASCII->Unicode conversion layer\r
//\r
- TempHandle = CreateFileInterfaceFile(TempHandle, FALSE);\r
+ TempHandle = CreateFileInterfaceFile (TempHandle, FALSE);\r
}\r
+\r
ShellParameters->StdIn = TempHandle;\r
- gST->ConIn = CreateSimpleTextInOnFile(TempHandle, &gST->ConsoleInHandle);\r
+ gST->ConIn = CreateSimpleTextInOnFile (TempHandle, &gST->ConsoleInHandle);\r
}\r
}\r
}\r
}\r
- FreePool(CommandLineCopy);\r
\r
- CalculateEfiHdrCrc(&gST->Hdr);\r
+ FreePool (CommandLineCopy);\r
+\r
+ CalculateEfiHdrCrc (&gST->Hdr);\r
\r
- if (gST->ConIn == NULL ||gST->ConOut == NULL) {\r
+ if ((gST->ConIn == NULL) || (gST->ConOut == NULL)) {\r
Status = EFI_OUT_OF_RESOURCES;\r
}\r
\r
if (Status == EFI_NOT_FOUND) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_REDUNDA_REDIR), ShellInfoObject.HiiHandle);\r
- } else if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_REDIR), ShellInfoObject.HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SHELL_REDUNDA_REDIR), ShellInfoObject.HiiHandle);\r
+ } else if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SHELL_INVALID_REDIR), ShellInfoObject.HiiHandle);\r
}\r
\r
return (Status);\r
IN SYSTEM_TABLE_INFO *SystemTableInfo\r
)\r
{\r
- SPLIT_LIST *Split;\r
-\r
- if (ShellParameters == NULL\r
- ||OldStdIn == NULL\r
- ||OldStdOut == NULL\r
- ||OldStdErr == NULL\r
- ||SystemTableInfo == NULL) {\r
+ SPLIT_LIST *Split;\r
+\r
+ if ( (ShellParameters == NULL)\r
+ || (OldStdIn == NULL)\r
+ || (OldStdOut == NULL)\r
+ || (OldStdErr == NULL)\r
+ || (SystemTableInfo == NULL))\r
+ {\r
return (EFI_INVALID_PARAMETER);\r
}\r
- if (!IsListEmpty(&ShellInfoObject.SplitList.Link)) {\r
- Split = (SPLIT_LIST*)GetFirstNode(&ShellInfoObject.SplitList.Link);\r
+\r
+ if (!IsListEmpty (&ShellInfoObject.SplitList.Link)) {\r
+ Split = (SPLIT_LIST *)GetFirstNode (&ShellInfoObject.SplitList.Link);\r
} else {\r
Split = NULL;\r
}\r
+\r
if (ShellParameters->StdIn != *OldStdIn) {\r
- if ((Split != NULL && Split->SplitStdIn != ShellParameters->StdIn) || Split == NULL) {\r
- gEfiShellProtocol->CloseFile(ShellParameters->StdIn);\r
+ if (((Split != NULL) && (Split->SplitStdIn != ShellParameters->StdIn)) || (Split == NULL)) {\r
+ gEfiShellProtocol->CloseFile (ShellParameters->StdIn);\r
}\r
+\r
ShellParameters->StdIn = *OldStdIn;\r
}\r
+\r
if (ShellParameters->StdOut != *OldStdOut) {\r
- if ((Split != NULL && Split->SplitStdOut != ShellParameters->StdOut) || Split == NULL) {\r
- gEfiShellProtocol->CloseFile(ShellParameters->StdOut);\r
+ if (((Split != NULL) && (Split->SplitStdOut != ShellParameters->StdOut)) || (Split == NULL)) {\r
+ gEfiShellProtocol->CloseFile (ShellParameters->StdOut);\r
}\r
+\r
ShellParameters->StdOut = *OldStdOut;\r
}\r
+\r
if (ShellParameters->StdErr != *OldStdErr) {\r
- gEfiShellProtocol->CloseFile(ShellParameters->StdErr);\r
+ gEfiShellProtocol->CloseFile (ShellParameters->StdErr);\r
ShellParameters->StdErr = *OldStdErr;\r
}\r
\r
if (gST->ConIn != SystemTableInfo->ConIn) {\r
- CloseSimpleTextInOnFile(gST->ConIn);\r
- gST->ConIn = SystemTableInfo->ConIn;\r
- gST->ConsoleInHandle = SystemTableInfo->ConInHandle;\r
+ CloseSimpleTextInOnFile (gST->ConIn);\r
+ gST->ConIn = SystemTableInfo->ConIn;\r
+ gST->ConsoleInHandle = SystemTableInfo->ConInHandle;\r
}\r
+\r
if (gST->ConOut != SystemTableInfo->ConOut) {\r
- CloseSimpleTextOutOnFile(gST->ConOut);\r
- gST->ConOut = SystemTableInfo->ConOut;\r
- gST->ConsoleOutHandle = SystemTableInfo->ConOutHandle;\r
+ CloseSimpleTextOutOnFile (gST->ConOut);\r
+ gST->ConOut = SystemTableInfo->ConOut;\r
+ gST->ConsoleOutHandle = SystemTableInfo->ConOutHandle;\r
}\r
+\r
if (gST->StdErr != SystemTableInfo->ErrOut) {\r
- CloseSimpleTextOutOnFile(gST->StdErr);\r
- gST->StdErr = SystemTableInfo->ErrOut;\r
- gST->StandardErrorHandle = SystemTableInfo->ErrOutHandle;\r
+ CloseSimpleTextOutOnFile (gST->StdErr);\r
+ gST->StdErr = SystemTableInfo->ErrOut;\r
+ gST->StandardErrorHandle = SystemTableInfo->ErrOutHandle;\r
}\r
\r
- CalculateEfiHdrCrc(&gST->Hdr);\r
+ CalculateEfiHdrCrc (&gST->Hdr);\r
\r
return (EFI_SUCCESS);\r
}\r
+\r
/**\r
Function will replace the current Argc and Argv in the ShellParameters protocol\r
structure by parsing NewCommandLine. The current values are returned to the\r
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.\r
**/\r
EFI_STATUS\r
-UpdateArgcArgv(\r
+UpdateArgcArgv (\r
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,\r
IN CONST CHAR16 *NewCommandLine,\r
IN SHELL_OPERATION_TYPES Type,\r
OUT UINTN *OldArgc OPTIONAL\r
)\r
{\r
- BOOLEAN StripParamQuotation;\r
+ BOOLEAN StripParamQuotation;\r
\r
- ASSERT(ShellParameters != NULL);\r
+ ASSERT (ShellParameters != NULL);\r
StripParamQuotation = TRUE;\r
\r
if (OldArgc != NULL) {\r
*OldArgc = ShellParameters->Argc;\r
}\r
+\r
if (OldArgc != NULL) {\r
*OldArgv = ShellParameters->Argv;\r
}\r
StripParamQuotation = FALSE;\r
}\r
\r
- return ParseCommandLineToArgs( NewCommandLine,\r
- StripParamQuotation,\r
- &(ShellParameters->Argv),\r
- &(ShellParameters->Argc)\r
- );\r
+ return ParseCommandLineToArgs (\r
+ NewCommandLine,\r
+ StripParamQuotation,\r
+ &(ShellParameters->Argv),\r
+ &(ShellParameters->Argc)\r
+ );\r
}\r
\r
/**\r
@param[in] OldArgc pointer to old number of items in Argv list\r
**/\r
VOID\r
-RestoreArgcArgv(\r
+RestoreArgcArgv (\r
IN OUT EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters,\r
IN CHAR16 ***OldArgv,\r
IN UINTN *OldArgc\r
)\r
{\r
- UINTN LoopCounter;\r
- ASSERT(ShellParameters != NULL);\r
- ASSERT(OldArgv != NULL);\r
- ASSERT(OldArgc != NULL);\r
+ UINTN LoopCounter;\r
+\r
+ ASSERT (ShellParameters != NULL);\r
+ ASSERT (OldArgv != NULL);\r
+ ASSERT (OldArgc != NULL);\r
\r
if (ShellParameters->Argv != NULL) {\r
for ( LoopCounter = 0\r
- ; LoopCounter < ShellParameters->Argc\r
- ; LoopCounter++\r
- ){\r
- FreePool(ShellParameters->Argv[LoopCounter]);\r
+ ; LoopCounter < ShellParameters->Argc\r
+ ; LoopCounter++\r
+ )\r
+ {\r
+ FreePool (ShellParameters->Argv[LoopCounter]);\r
}\r
- FreePool(ShellParameters->Argv);\r
+\r
+ FreePool (ShellParameters->Argv);\r
}\r
+\r
ShellParameters->Argv = *OldArgv;\r
- *OldArgv = NULL;\r
+ *OldArgv = NULL;\r
ShellParameters->Argc = *OldArgc;\r
- *OldArgc = 0;\r
+ *OldArgc = 0;\r
}\r
projects / mirror_edk2.git / blobdiff