X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FParse.c;h=3b7a04f7a0903a5b1def228850f59500196b135b;hb=658bf43ecfe96df1cdc005a15f0af1dcc79de09b;hp=927c8d972993dbd373d51baa468a769fa3aad0b8;hpb=a405b86d274d32b92f69842bfb9a1ab143128f57;p=mirror_edk2.git

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
index 927c8d9729..3b7a04f7a0 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Parse.c
@@ -1,7 +1,8 @@
 /** @file
   Main file for Parse shell level 2 function.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.
+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -14,6 +15,19 @@
 
 #include "UefiShellLevel2CommandsLib.h"
 
+/**
+  Do the actual parsing of the file.  the file should be SFO output from a 
+  shell command or a similar format.
+
+  @param[in] FileName               The filename to open.
+  @param[in] TableName              The name of the table to find.
+  @param[in] ColumnIndex            The column number to get.
+  @param[in] TableNameInstance      Which instance of the table to get (row).
+  @param[in] ShellCommandInstance   Which instance of the command to get.
+
+  @retval SHELL_NOT_FOUND     The requested instance was not found.
+  @retval SHELL_SUCCESS       The operation was successful.
+**/
 SHELL_STATUS
 EFIAPI
 PerformParsing(
@@ -43,13 +57,22 @@ PerformParsing(
   if (EFI_ERROR(Status)) {
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, FileName);
     ShellStatus = SHELL_NOT_FOUND;
+  } else if (!EFI_ERROR (FileHandleIsDirectory (FileHandle))) {
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_FILE), gShellLevel2HiiHandle, FileName);
+    ShellStatus = SHELL_NOT_FOUND;
   } else {
     for (LoopVariable = 0 ; LoopVariable < ShellCommandInstance && !ShellFileHandleEof(FileHandle);) {
       TempLine = ShellFileHandleReturnLine(FileHandle, &Ascii);
       if (TempLine == NULL) {
         break;
       }
-      if (StrStr(TempLine, L"ShellCommand, \"") == TempLine) {
+
+      //
+      // Search for "ShellCommand," in the file to start the SFO table
+      // for a given ShellCommand.  The UEFI Shell spec does not specify
+      // a space after the comma.
+      //
+      if (StrStr (TempLine, L"ShellCommand,") == TempLine) {
         LoopVariable++;
       }
       SHELL_FREE_NON_NULL(TempLine);
@@ -58,42 +81,44 @@ PerformParsing(
       LoopVariable = 0;
       while(1) {
         TempLine = ShellFileHandleReturnLine(FileHandle, &Ascii);
-        if ( TempLine == NULL
-          || *TempLine == CHAR_NULL
-          || StrStr(TempLine, L"ShellCommand, \"") == TempLine
-         ){
+        if (TempLine == NULL
+            || *TempLine == CHAR_NULL
+            || StrStr (TempLine, L"ShellCommand,") == TempLine) {
           SHELL_FREE_NON_NULL(TempLine);
           break;
         }
-        if (StrStr(TempLine, TableName) == TempLine) {
+        if (StrStr (TempLine, TableName) == TempLine) {
           LoopVariable++;
-        }
-        if ( LoopVariable == TableNameInstance
-          || (TableNameInstance == (UINTN)-1 && StrStr(TempLine, TableName) == TempLine)
-         ){
-          for (ColumnLoop = 1, ColumnPointer = TempLine; ColumnLoop < ColumnIndex && ColumnPointer != NULL && *ColumnPointer != CHAR_NULL; ColumnLoop++) {
-            ColumnPointer = StrStr(ColumnPointer, L",");
-            if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL){
-              ColumnPointer++;
-            }
-          }
-          if (ColumnLoop == ColumnIndex) {
-            ASSERT(ColumnPointer != NULL);
-            TempSpot = StrStr(ColumnPointer, L",");
-            if (TempSpot != NULL) {
-              *TempSpot = CHAR_NULL;
+          if (LoopVariable == TableNameInstance
+              || (TableNameInstance == (UINTN)-1)) {
+            for (ColumnLoop = 1, ColumnPointer = TempLine; ColumnLoop < ColumnIndex && ColumnPointer != NULL && *ColumnPointer != CHAR_NULL; ColumnLoop++) {
+              ColumnPointer = StrStr (ColumnPointer, L",");
+              if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL){
+                ColumnPointer++;
+              }
             }
-            while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){
-              ColumnPointer++;
+            if (ColumnLoop == ColumnIndex) {
+              if (ColumnPointer == NULL) {
+                ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"Column Index");
+                ShellStatus = SHELL_INVALID_PARAMETER;
+              } else {
+                TempSpot = StrStr (ColumnPointer, L",");
+                if (TempSpot != NULL) {
+                  *TempSpot = CHAR_NULL;
+                }
+                while (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L' '){
+                  ColumnPointer++;
+                }
+                if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){
+                  ColumnPointer++;
+                }
+                if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen (ColumnPointer) - 1] == L'\"'){
+                  ColumnPointer[StrLen (ColumnPointer) - 1] = CHAR_NULL;
+                }
+
+                ShellPrintEx (-1, -1, L"%s\r\n", ColumnPointer);
+              }
             }
-            if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[0] == L'\"'){
-              ColumnPointer++;
-            }
-            if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL && ColumnPointer[StrLen(ColumnPointer)-1] == L'\"'){
-              ColumnPointer[StrLen(ColumnPointer)-1] = CHAR_NULL;
-            }
-
-            ShellPrintEx(-1, -1, L"%s\r\n", ColumnPointer);
           }
         }
         SHELL_FREE_NON_NULL(TempLine);