ShellPkg/ls: Display the correct directory path

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

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 087daac54e4be97adec267eb6a0456cb0830896b..035aff1a0fa78f17cb8aefcd886f95b3c5945973 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -1,8 +1,10 @@
 /** @file\r
   Main file for map shell level 2 command.\r
 \r
+  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  \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
@@ -224,6 +226,8 @@ MappingListHasType(
   )\r
 {\r
   CHAR16 *NewSpecific;\r
+  RETURN_STATUS  Status;\r
+  \r
   //\r
   // specific has priority\r
   //\r
@@ -233,7 +237,11 @@ MappingListHasType(
       return FALSE;\r
     }\r
     if (NewSpecific[StrLen(NewSpecific)-1] != L':') {\r
-      StrnCat(NewSpecific, L":", 2);\r
+      Status = StrnCatS(NewSpecific, (StrSize(Specific) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
+      if (EFI_ERROR (Status)) {\r
+        FreePool(NewSpecific);\r
+        return FALSE;\r
+      }\r
     }\r
 \r
     if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r
@@ -875,13 +883,18 @@ AddMappingFromMapping(
   CONST EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                      Status;\r
   CHAR16                          *NewSName;\r
+  RETURN_STATUS                   StrRetStatus;\r
   \r
   NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r
-    StrnCat(NewSName, L":", 2);\r
+    StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
+    if (EFI_ERROR(StrRetStatus)) {\r
+      FreePool(NewSName);\r
+      return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+    }\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
@@ -927,13 +940,18 @@ AddMappingFromHandle(
   EFI_DEVICE_PATH_PROTOCOL  *DevPath;\r
   EFI_STATUS                Status;\r
   CHAR16                    *NewSName;\r
+  RETURN_STATUS             StrRetStatus;\r
   \r
   NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r
-    StrnCat(NewSName, L":", 2);\r
+    StrRetStatus = StrnCatS(NewSName, (StrSize(SName) + sizeof(CHAR16))/sizeof(CHAR16), L":", StrLen(L":"));\r
+    if (EFI_ERROR(StrRetStatus)) {\r
+      FreePool(NewSName);\r
+      return ((SHELL_STATUS) (StrRetStatus & (~MAX_BIT)));\r
+    }\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
@@ -1180,51 +1198,48 @@ ShellCommandRunMap (
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);  \r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
-            if (MapAsHandle != NULL) {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r
-              } else {\r
+            TempStringLength = StrLen(SName);\r
+            if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
+              ShellStatus = SHELL_INVALID_PARAMETER;\r
+            }\r
+\r
+            if (ShellStatus == SHELL_SUCCESS) {\r
+              if (MapAsHandle != NULL) {\r
                 ShellStatus = AddMappingFromHandle(MapAsHandle, SName);\r
-              }\r
-            } else {\r
-              TempStringLength = StrLen(SName);\r
-              if (!IsNumberLetterOnly(SName, TempStringLength-(SName[TempStringLength-1]==L':'?1:0))) {\r
-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", SName);\r
-                ShellStatus = SHELL_INVALID_PARAMETER;\r
               } else {\r
                 ShellStatus = AddMappingFromMapping(Mapping, SName);\r
               }\r
+\r
+              if (ShellStatus != SHELL_SUCCESS) {\r
+                switch (ShellStatus) {\r
+                  case SHELL_ACCESS_DENIED:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
+                    break;\r
+                  case SHELL_INVALID_PARAMETER:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  case SHELL_DEVICE_ERROR:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
+                    break;\r
+                  default:\r
+                    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
+                }\r
+              } else {\r
+                //\r
+                // now do the display...\r
+                //\r
+                ShellStatus = PerformMappingDisplay(\r
+                  FALSE,\r
+                  FALSE,\r
+                  FALSE,\r
+                  NULL,\r
+                  SfoMode,\r
+                  SName,\r
+                  TRUE\r
+                 );\r
+              } // we were sucessful so do an output\r
             }\r
-            if (ShellStatus != SHELL_SUCCESS) {\r
-              switch (ShellStatus) {\r
-                case SHELL_ACCESS_DENIED:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellLevel2HiiHandle, L"map");\r
-                  break;\r
-                case SHELL_INVALID_PARAMETER:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel2HiiHandle, L"map", Mapping);\r
-                  break;\r
-                case SHELL_DEVICE_ERROR:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MAP_NOF), gShellLevel2HiiHandle, L"map", Mapping);\r
-                  break;\r
-                default:\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_UK), gShellLevel2HiiHandle, L"map", ShellStatus|MAX_BIT);\r
-              }\r
-            } else {\r
-              //\r
-              // now do the display...\r
-              //\r
-              ShellStatus = PerformMappingDisplay(\r
-                FALSE,\r
-                FALSE,\r
-                FALSE,\r
-                NULL,\r
-                SfoMode,\r
-                SName,\r
-                TRUE\r
-               );\r
-            } // we were sucessful so do an output\r
           } // got a valid map target\r
         } // got 2 variables\r
       } // we are adding a mapping\r