1.Add code to check the pointer 'CorrectedPath' in Ls.c line 460 before referenced...

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Map.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 358f63d8db719208389cb51e8cbdc5d5add01156..9e33286c90db5f16f742e922519a6661c229481c 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for map shell level 2 command.\r
 \r
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -397,10 +397,14 @@ PerformSingleMappingDisplay(
   CHAR16                    *MediaType;\r
   CHAR16                    *DevPathString;\r
   CHAR16                    *TempSpot;\r
+  CHAR16                    *Alias;\r
   UINTN                     TempLen;\r
   BOOLEAN                   Removable;\r
   CONST CHAR16              *TempSpot2;\r
 \r
+  Alias       = NULL;\r
+  TempSpot2   = NULL;\r
+  CurrentName = NULL;\r
   DevPath = DevicePathFromHandle(Handle);\r
   DevPathCopy = DevPath;\r
   MapList = gEfiShellProtocol->GetMapFromDevicePath(&DevPathCopy);\r
@@ -412,13 +416,83 @@ PerformSingleMappingDisplay(
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  CurrentName = NULL;\r
-  CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
-  TempSpot = StrStr(CurrentName, L";");\r
-  if (TempSpot != NULL) {\r
-    *TempSpot = CHAR_NULL;\r
+  if (Normal) {\r
+    //\r
+    // Allocate a name\r
+    //\r
+    CurrentName = NULL;\r
+    CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+    if (CurrentName == NULL) {\r
+      return (EFI_OUT_OF_RESOURCES);\r
+    }\r
+\r
+    //\r
+    // Chop off the other names that become "Alias(s)"\r
+    // leaving just the normal name\r
+    //\r
+    TempSpot = StrStr(CurrentName, L";");\r
+    if (TempSpot != NULL) {\r
+      *TempSpot = CHAR_NULL;\r
+    }\r
+  } else if (Consist) {\r
+    CurrentName = NULL;\r
+\r
+    //\r
+    // Skip the first name.  This is the standard name.\r
+    //\r
+    TempSpot = StrStr(MapList, L";");\r
+    if (TempSpot != NULL) {\r
+      TempSpot++;\r
+    }\r
+    SearchList(TempSpot, L"HD*", &CurrentName, TRUE, FALSE, L";");\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"CD*", &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"FP*", &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      SearchList(TempSpot, L"F*",  &CurrentName, TRUE, FALSE, L";");\r
+    }\r
+    if (CurrentName == NULL) {\r
+      //\r
+      // We didnt find anything, so just the first one in the list...\r
+      //\r
+      CurrentName = StrnCatGrow(&CurrentName, 0, MapList, 0);\r
+      if (CurrentName == NULL) {\r
+        return (EFI_OUT_OF_RESOURCES);\r
+      }\r
+      TempSpot = StrStr(CurrentName, L";");\r
+      if (TempSpot != NULL) {\r
+        *TempSpot = CHAR_NULL;\r
+      }\r
+    } else {\r
+      Alias = StrnCatGrow(&Alias, 0, MapList, 0);\r
+      if (Alias == NULL) {\r
+        return EFI_OUT_OF_RESOURCES;\r
+      }\r
+      TempSpot = StrStr(Alias, CurrentName);\r
+      if (TempSpot != NULL) {\r
+        TempSpot2 = StrStr(TempSpot, L";");\r
+        if (TempSpot2 != NULL) {\r
+          TempSpot2++; // Move past ";" from CurrentName\r
+          CopyMem(TempSpot, TempSpot2, StrSize(TempSpot2));\r
+        } else {\r
+          *TempSpot = CHAR_NULL;\r
+        }\r
+      }\r
+      if (Alias[StrLen(Alias)-1] == L';') {\r
+        Alias[StrLen(Alias)-1] = CHAR_NULL;\r
+      }\r
+    }\r
+  } else {\r
+    CurrentName = NULL;\r
+    CurrentName = StrnCatGrow(&CurrentName, 0, L"", 0);\r
+    if (CurrentName == NULL) {\r
+      return (EFI_OUT_OF_RESOURCES);\r
+    }\r
   }\r
-  DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
+  DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);\r
   if (!SFO) {\r
     TempLen = StrLen(CurrentName);\r
     ShellPrintHiiEx (\r
@@ -428,7 +502,7 @@ PerformSingleMappingDisplay(
       STRING_TOKEN (STR_MAP_ENTRY),\r
       gShellLevel2HiiHandle,\r
       CurrentName,\r
-      TempLen < StrLen(MapList)?MapList + TempLen+1:L"",\r
+      Alias!=NULL?Alias:(TempLen < StrLen(MapList)?MapList + TempLen+1:L""),\r
       DevPathString\r
      );\r
     if (Verbose) {\r
@@ -451,7 +525,7 @@ PerformSingleMappingDisplay(
           TempSpot2\r
          );\r
       }\r
-      FreePool(MediaType);\r
+      SHELL_FREE_NON_NULL(MediaType);\r
     }\r
   } else {\r
     TempLen = StrLen(CurrentName);\r
@@ -463,11 +537,12 @@ PerformSingleMappingDisplay(
       gShellLevel2HiiHandle,\r
       CurrentName,\r
       DevPathString,\r
-      TempLen < StrLen(MapList)?MapList + TempLen+1:L""\r
+      Consist?L"":(TempLen < StrLen(MapList)?MapList + TempLen+1:L"")\r
      );\r
   }\r
-  FreePool(DevPathString);\r
-  FreePool(CurrentName);\r
+  SHELL_FREE_NON_NULL(DevPathString);\r
+  SHELL_FREE_NON_NULL(CurrentName);\r
+  SHELL_FREE_NON_NULL(Alias);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -1022,7 +1097,6 @@ ShellCommandRunMap (
   CONST CHAR16  *SName;\r
   CONST CHAR16  *Mapping;\r
   EFI_HANDLE    MapAsHandle;\r
-  CONST EFI_DEVICE_PATH_PROTOCOL *DevPath;\r
   SHELL_STATUS  ShellStatus;\r
   BOOLEAN       SfoMode;\r
   BOOLEAN       ConstMode;\r
@@ -1034,7 +1108,6 @@ ShellCommandRunMap (
   ProblemParam  = NULL;\r
   Mapping       = NULL;\r
   SName         = NULL;\r
-  DevPath       = NULL;\r
   ShellStatus   = SHELL_SUCCESS;\r
   MapAsHandle = NULL;\r
 \r
@@ -1090,18 +1163,15 @@ ShellCommandRunMap (
           if (SName != NULL) {\r
             Status = PerformMappingDelete(SName);\r
             if (EFI_ERROR(Status)) {\r
-              switch (Status) {\r
-                case EFI_ACCESS_DENIED:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);\r
-                  ShellStatus = SHELL_ACCESS_DENIED;\r
-                  break;\r
-                case EFI_NOT_FOUND:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, SName);\r
-                  ShellStatus = SHELL_INVALID_PARAMETER;\r
-                  break;\r
-                default:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
-                  ShellStatus = SHELL_UNSUPPORTED;\r
+              if (Status == EFI_ACCESS_DENIED) {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle);\r
+                ShellStatus = SHELL_ACCESS_DENIED;\r
+              } else if (Status == EFI_NOT_FOUND) {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NF), gShellLevel2HiiHandle, SName);\r
+                ShellStatus = SHELL_INVALID_PARAMETER;\r
+              } else {\r
+                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, Status);\r
+                ShellStatus = SHELL_UNSUPPORTED;\r
               }\r
             }\r
           } else {\r