Refine the select language logic.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Dh.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 852ba1d1e1a0e2e5950b670466d534af59a341e0..1bb3191f4153e6a994ffca07fd4efdabc507b4ab 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for Dh shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 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
@@ -60,7 +60,6 @@ GetDriverName (
   )\r
 {\r
   CHAR8                             *Lang;\r
-  CHAR8                             *TempChar;\r
   EFI_STATUS                        Status;\r
   EFI_COMPONENT_NAME2_PROTOCOL      *CompName2;\r
   CHAR16                            *NameToReturn;\r
@@ -87,23 +86,7 @@ GetDriverName (
   if (EFI_ERROR(Status)) {\r
     return (EFI_NOT_FOUND);\r
   }\r
-  if (Language == NULL) {\r
-    Lang = AllocateZeroPool(AsciiStrSize(CompName2->SupportedLanguages));\r
-    if (Lang == NULL) {\r
-      return (EFI_OUT_OF_RESOURCES);\r
-    }\r
-    AsciiStrCpy(Lang, CompName2->SupportedLanguages);\r
-    TempChar = AsciiStrStr(Lang, ";");\r
-    if (TempChar != NULL){\r
-      *TempChar = CHAR_NULL;\r
-    }\r
-  } else {\r
-    Lang = AllocateZeroPool(AsciiStrSize(Language));\r
-    if (Lang == NULL) {\r
-      return (EFI_OUT_OF_RESOURCES);\r
-    }\r
-    AsciiStrCpy(Lang, Language);\r
-  }\r
+  Lang = GetBestLanguageForDriver (CompName2->SupportedLanguages, Language, FALSE);\r
   Status = CompName2->GetDriverName(CompName2, Lang, &NameToReturn);\r
   FreePool(Lang);\r
 \r
@@ -202,7 +185,7 @@ GetProtocolInfoString(
           if (!Verbose) {\r
             StrnCatGrow(&RetVal, &Size, L"(", 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
-            StrnCatGrow(&RetVal, &Size, L")", 0);\r
+            StrnCatGrow(&RetVal, &Size, L")\r\n", 0);\r
           } else {\r
             StrnCatGrow(&RetVal, &Size, Seperator, 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
@@ -260,7 +243,7 @@ GetDriverImageName (
     return (Status);\r
   }\r
   DevicePath = LoadedImage->FilePath;\r
-  *Name = gDevPathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);\r
+  *Name = ConvertDevicePathToText(DevicePath, TRUE, TRUE);\r
   return (EFI_SUCCESS);\r
 }\r
 \r
@@ -354,7 +337,7 @@ DisplayDriverModelHandle (
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DH_OUTPUT_DRIVER1), gShellDriver1HiiHandle, TempStringPointer!=NULL?TempStringPointer:L"<Unknown>");\r
     SHELL_FREE_NON_NULL(TempStringPointer);\r
   \r
-    TempStringPointer = gDevPathToText->ConvertDevicePathToText(DevicePath, TRUE, FALSE);\r
+    TempStringPointer = ConvertDevicePathToText(DevicePath, TRUE, FALSE);\r
     ShellPrintHiiEx(\r
       -1, \r
       -1, \r
@@ -394,11 +377,14 @@ DisplayDriverModelHandle (
                   Language,\r
                   &DriverName\r
                   );\r
-        if (DriverName == NULL) {\r
+        if (EFI_ERROR (Status)) {\r
           Status = GetDriverImageName (\r
                     DriverBindingHandleBuffer[Index],\r
                     &DriverName\r
                     );\r
+          if (EFI_ERROR (Status)) {\r
+            DriverName = NULL;\r
+          }\r
         }\r
 \r
         if (Image) {\r
@@ -537,6 +523,9 @@ DisplayDriverModelHandle (
   }\r
 \r
   Status = GetDriverName (Handle, Language, &DriverName);\r
+  if (EFI_ERROR (Status)) {\r
+    DriverName = NULL;\r
+  }\r
 \r
   ShellPrintHiiEx(\r
     -1, \r
@@ -548,11 +537,13 @@ DisplayDriverModelHandle (
     DriverName!=NULL?DriverName:L"<Unknown>"\r
     );\r
   SHELL_FREE_NON_NULL(DriverName);\r
-  DriverName = NULL;\r
   Status = GetDriverImageName (\r
             Handle,\r
             &DriverName\r
             );\r
+  if (EFI_ERROR (Status)) {\r
+    DriverName = NULL;\r
+  }\r
   ShellPrintHiiEx(\r
     -1, \r
     -1, \r
@@ -666,9 +657,7 @@ DoDhByHandle(
 {\r
   CHAR16              *ProtocolInfoString;\r
   SHELL_STATUS        ShellStatus;\r
-  EFI_STATUS          Status;\r
 \r
-  Status              = EFI_SUCCESS;\r
   ShellStatus         = SHELL_SUCCESS;\r
   ProtocolInfoString  = NULL;\r
 \r
@@ -728,6 +717,7 @@ DoDhByHandle(
   Display information for all handles on a list.\r
 \r
   @param[in] HandleList       The NULL-terminated list of handles.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
   @param[in] Sfo              TRUE to output in standard format output (spec).\r
   @param[in] Language         Language string per UEFI specification.\r
   @param[in] DriverInfo       TRUE to show all info about the handle.\r
@@ -739,6 +729,7 @@ SHELL_STATUS
 EFIAPI\r
 DoDhForHandleList(\r
   IN CONST EFI_HANDLE *HandleList,\r
+  IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    Sfo,\r
   IN CONST CHAR8      *Language,\r
   IN CONST BOOLEAN    DriverInfo\r
@@ -752,7 +743,7 @@ DoDhForHandleList(
   for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL && ShellStatus == SHELL_SUCCESS; HandleWalker++) {\r
     ShellStatus = DoDhByHandle(\r
           *HandleWalker,\r
-          FALSE,\r
+          Verbose,\r
           Sfo,\r
           Language,\r
           DriverInfo,\r
@@ -766,6 +757,7 @@ DoDhForHandleList(
   Display information for all handles.\r
 \r
   @param[in] Sfo              TRUE to output in standard format output (spec).\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
   @param[in] Language         Language string per UEFI specification.\r
   @param[in] DriverInfo       TRUE to show all info about the handle.\r
 \r
@@ -776,6 +768,7 @@ SHELL_STATUS
 EFIAPI\r
 DoDhForAll(\r
   IN CONST BOOLEAN  Sfo,\r
+  IN CONST BOOLEAN  Verbose,\r
   IN CONST CHAR8    *Language,\r
   IN CONST BOOLEAN  DriverInfo\r
   )\r
@@ -787,6 +780,7 @@ DoDhForAll(
 \r
   ShellStatus = DoDhForHandleList(\r
     HandleList,\r
+    Verbose,\r
     Sfo,\r
     Language,\r
     DriverInfo);\r
@@ -800,6 +794,7 @@ DoDhForAll(
   Display information for all handles which have a specific protocol.\r
 \r
   @param[in] ProtocolName     The pointer to the name of the protocol.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
   @param[in] Sfo              TRUE to output in standard format output (spec).\r
   @param[in] Language         Language string per UEFI specification.\r
   @param[in] DriverInfo       TRUE to show all info about the handle.\r
@@ -811,6 +806,7 @@ SHELL_STATUS
 EFIAPI\r
 DoDhByProtocol(\r
   IN CONST CHAR16   *ProtocolName,\r
+  IN CONST BOOLEAN  Verbose,\r
   IN CONST BOOLEAN  Sfo,\r
   IN CONST CHAR8    *Language,\r
   IN CONST BOOLEAN  DriverInfo\r
@@ -835,6 +831,7 @@ DoDhByProtocol(
 \r
   ShellStatus = DoDhForHandleList(\r
     HandleList,\r
+    Verbose,\r
     Sfo,\r
     Language,\r
     DriverInfo);\r
@@ -932,6 +929,7 @@ ShellCommandRunDh (
         //\r
         ShellStatus = DoDhByProtocol(\r
           ShellCommandLineGetValue(Package, L"-p"),\r
+          Verbose,\r
           SfoMode,\r
           Lang==NULL?NULL:Language,\r
           FlagD\r
@@ -945,6 +943,7 @@ ShellCommandRunDh (
         //\r
         ShellStatus = DoDhForAll(\r
           SfoMode,\r
+          Verbose,\r
           Lang==NULL?NULL:Language,\r
           FlagD\r
          );\r