VOID\r
)\r
{\r
- SHELL_FILE_HANDLE FileHandle;\r
- EFI_STATUS Status;\r
- CHAR16 CharBuffer;\r
- UINTN CharSize;\r
- UINT64 OriginalFilePosition;\r
+ SHELL_FILE_HANDLE FileHandle;\r
+ EFI_STATUS Status;\r
+ CHAR16 CharBuffer;\r
+ UINTN CharSize;\r
+ UINT64 OriginalFilePosition;\r
\r
Status = EFI_SUCCESS;\r
FileHandle = NULL;\r
OriginalFilePosition = 0;\r
\r
if (ShellOpenFileByName (L">i", &FileHandle, EFI_FILE_MODE_READ, 0) == EFI_SUCCESS) {\r
- CharSize = sizeof(CHAR16);\r
+ CharSize = sizeof (CHAR16);\r
gEfiShellProtocol->GetFilePosition (FileHandle, &OriginalFilePosition);\r
Status = gEfiShellProtocol->ReadFile (FileHandle, &CharSize, &CharBuffer);\r
- if (EFI_ERROR (Status) || (CharSize != sizeof(CHAR16))) {\r
+ if (EFI_ERROR (Status) || (CharSize != sizeof (CHAR16))) {\r
return FALSE;\r
}\r
- gEfiShellProtocol->SetFilePosition(FileHandle, OriginalFilePosition);\r
+\r
+ gEfiShellProtocol->SetFilePosition (FileHandle, OriginalFilePosition);\r
}\r
\r
if (FileHandle == NULL) {\r
if (NewStr == NULL) {\r
return NULL;\r
}\r
+\r
ReturnStr = NewStr;\r
StrWalker = String;\r
while (*StrWalker != CHAR_NULL) {\r
- if (*StrWalker == L'^' && (*(StrWalker + 1) == L'^' || *(StrWalker + 1) == L'"')) {\r
+ if ((*StrWalker == L'^') && ((*(StrWalker + 1) == L'^') || (*(StrWalker + 1) == L'"'))) {\r
*NewStr = *(StrWalker + 1);\r
StrWalker++;\r
} else {\r
*NewStr = *StrWalker;\r
}\r
+\r
StrWalker++;\r
NewStr++;\r
}\r
return ReturnStr;\r
}\r
\r
-\r
/**\r
Do the actual parsing of the file. the file should be SFO output from a\r
shell command or a similar format.\r
@retval SHELL_SUCCESS The operation was successful.\r
**/\r
SHELL_STATUS\r
-PerformParsing(\r
- IN CONST CHAR16 *FileName,\r
- IN CONST CHAR16 *TableName,\r
- IN CONST UINTN ColumnIndex,\r
- IN CONST UINTN TableNameInstance,\r
- IN CONST UINTN ShellCommandInstance,\r
- IN BOOLEAN StreamingUnicode\r
+PerformParsing (\r
+ IN CONST CHAR16 *FileName,\r
+ IN CONST CHAR16 *TableName,\r
+ IN CONST UINTN ColumnIndex,\r
+ IN CONST UINTN TableNameInstance,\r
+ IN CONST UINTN ShellCommandInstance,\r
+ IN BOOLEAN StreamingUnicode\r
)\r
{\r
- SHELL_FILE_HANDLE FileHandle;\r
- EFI_STATUS Status;\r
- BOOLEAN Ascii;\r
- UINTN LoopVariable;\r
- UINTN ColumnLoop;\r
- CHAR16 *TempLine;\r
- CHAR16 *ColumnPointer;\r
- SHELL_STATUS ShellStatus;\r
- CHAR16 *TempSpot;\r
- CHAR16 *SfoString;\r
-\r
- ASSERT(FileName != NULL);\r
- ASSERT(TableName != NULL);\r
-\r
- ShellStatus = SHELL_SUCCESS;\r
-\r
- Status = ShellOpenFileByName(FileName, &FileHandle, EFI_FILE_MODE_READ, 0);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"parse", FileName);\r
+ SHELL_FILE_HANDLE FileHandle;\r
+ EFI_STATUS Status;\r
+ BOOLEAN Ascii;\r
+ UINTN LoopVariable;\r
+ UINTN ColumnLoop;\r
+ CHAR16 *TempLine;\r
+ CHAR16 *ColumnPointer;\r
+ SHELL_STATUS ShellStatus;\r
+ CHAR16 *TempSpot;\r
+ CHAR16 *SfoString;\r
+\r
+ ASSERT (FileName != NULL);\r
+ ASSERT (TableName != NULL);\r
+\r
+ ShellStatus = SHELL_SUCCESS;\r
+\r
+ Status = ShellOpenFileByName (FileName, &FileHandle, EFI_FILE_MODE_READ, 0);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"parse", FileName);\r
ShellStatus = SHELL_NOT_FOUND;\r
} else if (!EFI_ERROR (FileHandleIsDirectory (FileHandle))) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_FILE), gShellLevel2HiiHandle, L"parse", FileName);\r
ShellStatus = SHELL_NOT_FOUND;\r
} else {\r
- for (LoopVariable = 0 ; LoopVariable < ShellCommandInstance && !ShellFileHandleEof(FileHandle);) {\r
- TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii);\r
+ for (LoopVariable = 0; LoopVariable < ShellCommandInstance && !ShellFileHandleEof (FileHandle);) {\r
+ TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii);\r
\r
- if ((TempLine == NULL) || (*TempLine == CHAR_NULL && StreamingUnicode)) {\r
- break;\r
+ if ((TempLine == NULL) || ((*TempLine == CHAR_NULL) && StreamingUnicode)) {\r
+ break;\r
}\r
\r
//\r
if (StrStr (TempLine, L"ShellCommand,") == TempLine) {\r
LoopVariable++;\r
}\r
- SHELL_FREE_NON_NULL(TempLine);\r
+\r
+ SHELL_FREE_NON_NULL (TempLine);\r
}\r
+\r
if (LoopVariable == ShellCommandInstance) {\r
LoopVariable = 0;\r
- while(1) {\r
+ while (1) {\r
TempLine = ShellFileHandleReturnLine (FileHandle, &Ascii);\r
- if (TempLine == NULL\r
- || *TempLine == CHAR_NULL\r
- || StrStr (TempLine, L"ShellCommand,") == TempLine) {\r
- SHELL_FREE_NON_NULL(TempLine);\r
+ if ( (TempLine == NULL)\r
+ || (*TempLine == CHAR_NULL)\r
+ || (StrStr (TempLine, L"ShellCommand,") == TempLine))\r
+ {\r
+ SHELL_FREE_NON_NULL (TempLine);\r
break;\r
}\r
+\r
if (StrStr (TempLine, TableName) == TempLine) {\r
LoopVariable++;\r
- if (LoopVariable == TableNameInstance\r
- || (TableNameInstance == (UINTN)-1)) {\r
+ if ( (LoopVariable == TableNameInstance)\r
+ || (TableNameInstance == (UINTN)-1))\r
+ {\r
for (ColumnLoop = 1, ColumnPointer = TempLine; ColumnLoop < ColumnIndex && ColumnPointer != NULL && *ColumnPointer != CHAR_NULL; ColumnLoop++) {\r
ColumnPointer = StrStr (ColumnPointer, L",\"");\r
- if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL){\r
+ if ((ColumnPointer != NULL) && (*ColumnPointer != CHAR_NULL)) {\r
ColumnPointer++;\r
}\r
}\r
+\r
if (ColumnLoop == ColumnIndex) {\r
if (ColumnPointer == NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"parse", L"Column Index");\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellLevel2HiiHandle, L"parse", L"Column Index");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
TempSpot = StrStr (ColumnPointer, L",\"");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r
- while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){\r
+\r
+ while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' ') {\r
ColumnPointer++;\r
}\r
- if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){\r
+\r
+ if ((ColumnPointer != NULL) && (*ColumnPointer != CHAR_NULL) && (ColumnPointer[0] == L'\"')) {\r
ColumnPointer++;\r
}\r
- if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen (ColumnPointer) - 1] == L'\"'){\r
+\r
+ if ((ColumnPointer != NULL) && (*ColumnPointer != CHAR_NULL) && (ColumnPointer[StrLen (ColumnPointer) - 1] == L'\"')) {\r
ColumnPointer[StrLen (ColumnPointer) - 1] = CHAR_NULL;\r
}\r
+\r
SfoString = HandleStringWithEscapeCharForParse (ColumnPointer);\r
if (SfoString != NULL) {\r
ShellPrintEx (-1, -1, L"%s\r\n", SfoString);\r
}\r
}\r
}\r
- SHELL_FREE_NON_NULL(TempLine);\r
+\r
+ SHELL_FREE_NON_NULL (TempLine);\r
}\r
}\r
}\r
+\r
return (ShellStatus);\r
}\r
\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-i", TypeValue},\r
- {L"-s", TypeValue},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-i", TypeValue },\r
+ { L"-s", TypeValue },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'parse' command.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- CONST CHAR16 *FileName;\r
- CONST CHAR16 *TableName;\r
- CONST CHAR16 *ColumnString;\r
- SHELL_STATUS ShellStatus;\r
- UINTN ShellCommandInstance;\r
- UINTN TableNameInstance;\r
- BOOLEAN StreamingUnicode;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ CONST CHAR16 *FileName;\r
+ CONST CHAR16 *TableName;\r
+ CONST CHAR16 *ColumnString;\r
+ SHELL_STATUS ShellStatus;\r
+ UINTN ShellCommandInstance;\r
+ UINTN TableNameInstance;\r
+ BOOLEAN StreamingUnicode;\r
\r
ShellStatus = SHELL_SUCCESS;\r
ProblemParam = NULL;\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
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParseEx (ParamList, &Package, &ProblemParam, TRUE, FALSE);\r
- if (EFI_ERROR(Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"parse", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"parse", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
StreamingUnicode = IsStdInDataAvailable ();\r
- if ((!StreamingUnicode && (ShellCommandLineGetCount(Package) < 4)) ||\r
- (ShellCommandLineGetCount(Package) < 3)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"parse");\r
+ if ((!StreamingUnicode && (ShellCommandLineGetCount (Package) < 4)) ||\r
+ (ShellCommandLineGetCount (Package) < 3))\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"parse");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
- } else if ((StreamingUnicode && (ShellCommandLineGetCount(Package) > 3)) ||\r
- (ShellCommandLineGetCount(Package) > 4)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"parse");\r
+ } else if ((StreamingUnicode && (ShellCommandLineGetCount (Package) > 3)) ||\r
+ (ShellCommandLineGetCount (Package) > 4))\r
+ {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"parse");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (StreamingUnicode) {\r
- FileName = L">i";\r
- TableName = ShellCommandLineGetRawValue(Package, 1);\r
- ColumnString = ShellCommandLineGetRawValue(Package, 2);\r
+ FileName = L">i";\r
+ TableName = ShellCommandLineGetRawValue (Package, 1);\r
+ ColumnString = ShellCommandLineGetRawValue (Package, 2);\r
} else {\r
- FileName = ShellCommandLineGetRawValue(Package, 1);\r
- TableName = ShellCommandLineGetRawValue(Package, 2);\r
- ColumnString = ShellCommandLineGetRawValue(Package, 3);\r
+ FileName = ShellCommandLineGetRawValue (Package, 1);\r
+ TableName = ShellCommandLineGetRawValue (Package, 2);\r
+ ColumnString = ShellCommandLineGetRawValue (Package, 3);\r
}\r
- if (ShellCommandLineGetValue(Package, L"-i") == NULL) {\r
+\r
+ if (ShellCommandLineGetValue (Package, L"-i") == NULL) {\r
TableNameInstance = (UINTN)-1;\r
} else {\r
- TableNameInstance = ShellStrToUintn(ShellCommandLineGetValue(Package, L"-i"));\r
+ TableNameInstance = ShellStrToUintn (ShellCommandLineGetValue (Package, L"-i"));\r
}\r
- if (ShellCommandLineGetValue(Package, L"-s") == NULL) {\r
+\r
+ if (ShellCommandLineGetValue (Package, L"-s") == NULL) {\r
ShellCommandInstance = 1;\r
} else {\r
- ShellCommandInstance = ShellStrToUintn(ShellCommandLineGetValue(Package, L"-s"));\r
+ ShellCommandInstance = ShellStrToUintn (ShellCommandLineGetValue (Package, L"-s"));\r
}\r
\r
- ShellStatus = PerformParsing(FileName, TableName, ShellStrToUintn(ColumnString), TableNameInstance, ShellCommandInstance, StreamingUnicode);\r
+ ShellStatus = PerformParsing (FileName, TableName, ShellStrToUintn (ColumnString), TableNameInstance, ShellCommandInstance, StreamingUnicode);\r
}\r
}\r
\r
\r
return (ShellStatus);\r
}\r
-\r
projects / mirror_edk2.git / blobdiff