ShellPkg/dh: display all the protocol names in a single line

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 170a868e07baa225ec7577b2deca5e8d0a664be7..3694e501b6d63e951c517b907c110c69f38b33df 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -319,7 +319,7 @@ GetProtocolInfoString(
           if (!Verbose) {\r
             StrnCatGrow(&RetVal, &Size, L"(", 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
-            StrnCatGrow(&RetVal, &Size, L")\r\n", 0);\r
+            StrnCatGrow(&RetVal, &Size, L")", 0);\r
           } else {\r
             StrnCatGrow(&RetVal, &Size, Separator, 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
@@ -802,17 +802,29 @@ DoDhByHandle(
         ProtocolInfoString==NULL?L"":ProtocolInfoString\r
       );\r
     } else {\r
-      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE);\r
-      ShellPrintHiiEx(\r
-        -1,\r
-        -1,\r
-        NULL,\r
-        STRING_TOKEN (STR_DH_OUTPUT_SINGLE),\r
-        gShellDriver1HiiHandle,\r
-        ConvertHandleToHandleIndex(TheHandle),\r
-        TheHandle,\r
-        ProtocolInfoString==NULL?L"":ProtocolInfoString\r
-      );\r
+      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, Verbose ? L"\r\n" : L" ", Verbose, TRUE);\r
+      if (Verbose) {\r
+        ShellPrintHiiEx(\r
+          -1,\r
+          -1,\r
+          NULL,\r
+          STRING_TOKEN (STR_DH_OUTPUT_SINGLE),\r
+          gShellDriver1HiiHandle,\r
+          ConvertHandleToHandleIndex(TheHandle),\r
+          TheHandle,\r
+          ProtocolInfoString==NULL?L"":ProtocolInfoString\r
+        );\r
+      } else {\r
+        ShellPrintHiiEx(\r
+          -1,\r
+          -1,\r
+          NULL,\r
+          STRING_TOKEN (STR_DH_OUTPUT_SINGLE_D),\r
+          gShellDriver1HiiHandle,\r
+          ConvertHandleToHandleIndex(TheHandle),\r
+          ProtocolInfoString==NULL?L"":ProtocolInfoString\r
+        );\r
+      }\r
     }\r
 \r
     if (DriverInfo) {\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
index 05101f3782f8cfd5864909ae577c86044cca9727..07e865711355e40e16ff6ba9d28e6c5d3bb3876d 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
@@ -106,6 +106,7 @@
 #string STR_DH_OUTPUT_ALL_HEADER  #language en-US "Handle dump\r\n"\r
 #string STR_DH_OUTPUT_GUID_HEADER #language en-US "Handle dump by protocol '%g'\r\n"\r
 #string STR_DH_OUTPUT_NAME_HEADER #language en-US "Handle dump by protocol '%s'\r\n"\r
+#string STR_DH_OUTPUT_SINGLE_D    #language en-US "%H%02x%N: %s\r\n"\r
 #string STR_DH_OUTPUT_SINGLE      #language en-US "%H%02x%N: %x\r\n%s"\r
 #string STR_DH_OUTPUT_SFO         #language en-US "%s, %s, %s, %H%02x%N, %s, %s\r\n"\r
 #string STR_DH_OUTPUT_DRIVER1     #language en-US "   Controller Name    : %B%s%N\r\n"\r