Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel3CommandsLib/Echo.c

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Library/UefiShellLevel3CommandsLib/Echo.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellLevel3CommandsLib/Echo.c

@@ -12 +12 @@
 #include <Library/ShellLib.h>
 
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
-  {L"-on", TypeFlag},
-  {L"-off", TypeFlag},
-  {NULL, TypeMax}
-  };
+STATIC CONST SHELL_PARAM_ITEM  ParamList[] = {
+  { L"-on",  TypeFlag },
+  { L"-off", TypeFlag },
+  { NULL,    TypeMax  }
+};
 
 /**
@@ -31 +31 @@
   )
 {
-  EFI_STATUS          Status;
-  LIST_ENTRY          *Package;
-  SHELL_STATUS        ShellStatus;
-  UINTN               ParamCount;
-  CHAR16              *ProblemParam;
-  UINTN               Size;
-  CHAR16              *PrintString;
+  EFI_STATUS    Status;
+  LIST_ENTRY    *Package;
+  SHELL_STATUS  ShellStatus;
+  UINTN         ParamCount;
+  CHAR16        *ProblemParam;
+  UINTN         Size;
+  CHAR16        *PrintString;
 
-  Size                = 0;
-  ProblemParam        = NULL;
-  PrintString         = NULL;
-  ShellStatus         = SHELL_SUCCESS;
+  Size         = 0;
+  ProblemParam = NULL;
+  PrintString  = NULL;
+  ShellStatus  = SHELL_SUCCESS;
 
   //
   // initialize the shell lib (we must be in non-auto-init...)
   //
-  Status = ShellInitialize();
-  ASSERT_EFI_ERROR(Status);
+  Status = ShellInitialize ();
+  ASSERT_EFI_ERROR (Status);
 
   //
@@ -54 +54 @@
   //
   Status = ShellCommandLineParseEx (ParamList, &Package, &ProblemParam, TRUE, TRUE);
-  if (EFI_ERROR(Status)) {
-    if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel3HiiHandle, L"echo", ProblemParam);
-      FreePool(ProblemParam);
+  if (EFI_ERROR (Status)) {
+    if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel3HiiHandle, L"echo", ProblemParam);
+      FreePool (ProblemParam);
       ShellStatus = SHELL_INVALID_PARAMETER;
     } else {
-      ASSERT(FALSE);
+      ASSERT (FALSE);
     }
   } else {
@@ -66 +66 @@
     // check for "-?"
     //
-    if (ShellCommandLineGetFlag(Package, L"-?")) {
-      ASSERT(FALSE);
+    if (ShellCommandLineGetFlag (Package, L"-?")) {
+      ASSERT (FALSE);
     }
-    if (ShellCommandLineGetFlag(Package, L"-on")) {
+
+    if (ShellCommandLineGetFlag (Package, L"-on")) {
       //
       // Turn it on
       //
-      ShellCommandSetEchoState(TRUE);
-    } else if (ShellCommandLineGetFlag(Package, L"-off")) {
+      ShellCommandSetEchoState (TRUE);
+    } else if (ShellCommandLineGetFlag (Package, L"-off")) {
       //
       // turn it off
       //
-      ShellCommandSetEchoState(FALSE);
-    } else if (ShellCommandLineGetRawValue(Package, 1) == NULL) {
+      ShellCommandSetEchoState (FALSE);
+    } else if (ShellCommandLineGetRawValue (Package, 1) == NULL) {
       //
       // output its current state
       //
-      if (ShellCommandGetEchoState()) {
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_ECHO_ON), gShellLevel3HiiHandle);
+      if (ShellCommandGetEchoState ()) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_ECHO_ON), gShellLevel3HiiHandle);
       } else {
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_ECHO_OFF), gShellLevel3HiiHandle);
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_ECHO_OFF), gShellLevel3HiiHandle);
       }
     } else {
@@ -93 +94 @@
       //
       for ( ParamCount = 1
-          ; ShellCommandLineGetRawValue(Package, ParamCount) != NULL
-          ; ParamCount++
-         ) {
-        StrnCatGrow(&PrintString, &Size, ShellCommandLineGetRawValue(Package, ParamCount), 0);
-        if (ShellCommandLineGetRawValue(Package, ParamCount+1) != NULL) {
-          StrnCatGrow(&PrintString, &Size, L" ", 0);
+            ; ShellCommandLineGetRawValue (Package, ParamCount) != NULL
+            ; ParamCount++
+            )
+      {
+        StrnCatGrow (&PrintString, &Size, ShellCommandLineGetRawValue (Package, ParamCount), 0);
+        if (ShellCommandLineGetRawValue (Package, ParamCount+1) != NULL) {
+          StrnCatGrow (&PrintString, &Size, L" ", 0);
         }
       }
-      ShellPrintEx(-1, -1, L"%s\r\n", PrintString);
-      SHELL_FREE_NON_NULL(PrintString);
+
+      ShellPrintEx (-1, -1, L"%s\r\n", PrintString);
+      SHELL_FREE_NON_NULL (PrintString);
     }
 
@@ -113 +116 @@
   return (ShellStatus);
 }
-