Tools: support case insensitive arguments (acidanthera#254)

httpsgithu · Apr 19, 2021 · e7af094 · e7af094
1 parent edb8a64
commit e7af094
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 24 deletions.
diff --git a/Application/ChipTune/ChipTune.c b/Application/ChipTune/ChipTune.c
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>
 #include <Library/OcConsoleLib.h>
 #include <Library/OcMiscLib.h>
+#include <Library/OcStringLib.h>
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
@@ -87,7 +88,7 @@ UefiMain (
   HdaProtocol     = NULL;
   BeepGenProtocol = NULL;
 
-  if (StrCmp (Argv[1], L"any") == 0 || StrCmp (Argv[1], L"beep") == 0) {
+  if (OcStriCmp (Argv[1], L"any") == 0 || OcStriCmp (Argv[1], L"beep") == 0) {
     Status = gBS->LocateProtocol (
       &gAppleBeepGenProtocolGuid,
       NULL,
@@ -99,7 +100,7 @@ UefiMain (
     }
   }
 
-  if (BeepGenProtocol == NULL && (StrCmp (Argv[1], L"any") == 0 || StrCmp (Argv[1], L"hda") == 0)) {
+  if (BeepGenProtocol == NULL && (OcStriCmp (Argv[1], L"any") == 0 || OcStriCmp (Argv[1], L"hda") == 0)) {
     Status = gBS->LocateProtocol (
       &gAppleHighDefinitionAudioProtocolGuid,
       NULL,

diff --git a/Application/ChipTune/ChipTune.inf b/Application/ChipTune/ChipTune.inf
@@ -44,6 +44,7 @@
 
 [LibraryClasses]
   OcConsoleLib
+  OcStringLib
   UefiApplicationEntryPoint
   UefiBootServicesTableLib
   UefiLib
diff --git a/Application/ControlMsrE2/ControlMsrE2.h b/Application/ControlMsrE2/ControlMsrE2.h
@@ -25,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
 #include <Library/OcMiscLib.h>
+#include <Library/OcStringLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiApplicationEntryPoint.h>

diff --git a/Application/ControlMsrE2/ControlMsrE2.inf b/Application/ControlMsrE2/ControlMsrE2.inf
@@ -48,16 +48,17 @@
   BaseLib
   BaseMemoryLib
   DebugLib
+  HiiLib
+  IoLib
   MemoryAllocationLib
+  OcConsoleControlEntryModeGenericLib
   OcMemoryLib
   OcMiscLib
-  OcConsoleControlEntryModeGenericLib
+  OcStringLib
+  PcdLib
   UefiApplicationEntryPoint
-  UefiLib
-  HiiLib
   UefiHiiServicesLib
-  PcdLib
-  IoLib
+  UefiLib
 
 [Guids]
 gEfiHiiPlatformSetupFormsetGuid

diff --git a/Application/ControlMsrE2/ControlMsrE2UI.c b/Application/ControlMsrE2/ControlMsrE2UI.c
@@ -181,11 +181,11 @@ InterpretArguments (
 
       Token[TokenIndex] = '\0';
 
-      if (StrCmp (Parameter, L"lock") == 0) {
+      if (OcStriCmp (Parameter, L"lock") == 0) {
         mArgumentFlags = ARG_LOCK;
-      } else if (StrCmp (Parameter, L"unlock") == 0) {
+      } else if (OcStriCmp (Parameter, L"unlock") == 0) {
         mArgumentFlags = ARG_UNLOCK;
-      } else if (StrCmp (Parameter, L"interactive") == 0) {
+      } else if (OcStriCmp (Parameter, L"interactive") == 0) {
         mArgumentFlags = ARG_INTERACTIVE;
       } else {
         Print (L"Unknown command line argument: %s\n", Parameter);

diff --git a/Application/OpenControl/OpenControl.c b/Application/OpenControl/OpenControl.c
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/OcMiscLib.h>
+#include <Library/OcStringLib.h>
 #include <Library/UefiLib.h>
 #include <Protocol/OcFirmwareRuntime.h>
 
@@ -47,13 +48,13 @@ UefiMain (
       return EFI_SUCCESS;
     }
 
-    if (StrCmp (Argv[1], L"disable") == 0) {
+    if (OcStriCmp (Argv[1], L"disable") == 0) {
       ZeroMem (&Config, sizeof (Config));
       FwRuntime->SetOverride (&Config);
       return EFI_SUCCESS;
     }
 
-    if (StrCmp (Argv[1], L"restore") == 0) {
+    if (OcStriCmp (Argv[1], L"restore") == 0) {
       FwRuntime->SetOverride (NULL);
       return EFI_SUCCESS;
     }

diff --git a/Application/OpenControl/OpenControl.inf b/Application/OpenControl/OpenControl.inf
@@ -46,6 +46,7 @@
   BaseMemoryLib
   OcConsoleControlEntryModeGenericLib
   OcMiscLib
+  OcStringLib
   UefiApplicationEntryPoint
   UefiBootServicesTableLib
   UefiLib
diff --git a/Application/ResetSystem/ResetSystem.c b/Application/ResetSystem/ResetSystem.c
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/OcDebugLogLib.h>
 #include <Library/OcDeviceMiscLib.h>
 #include <Library/OcMiscLib.h>
+#include <Library/OcStringLib.h>
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
@@ -43,11 +44,11 @@ UefiMain (
   if (!EFI_ERROR (Status) && Argc >= 2) {
     Mode = Argv[1];
   } else {
-    DEBUG ((DEBUG_INFO, "OCRST: Assuming default to be ResetCold - %r\n", Status));
-    Mode = L"ColdReset";
+    DEBUG ((DEBUG_INFO, "OCRST: Assuming default to be coldreset - %r\n", Status));
+    Mode = L"coldreset";
   }
 
-  if (StrCmp (Mode, L"Firmware") == 0) {
+  if (OcStriCmp (Mode, L"firmware") == 0) {
     DEBUG ((DEBUG_INFO, "OCRST: Entering firmware...\n"));
     DataSize = sizeof (OsIndications);
     Status = gRT->GetVariable (
@@ -91,16 +92,16 @@ UefiMain (
       DEBUG ((DEBUG_WARN, "OCRST: Failed to acquire firmware features - %r\n", Status));
       return EFI_NOT_FOUND;
     }
-    Mode = L"ColdReset";
+    Mode = L"coldreset";
   }
 
-  if (StrCmp (Mode, L"ColdReset") == 0) {
+  if (OcStriCmp (Mode, L"coldreset") == 0) {
     DEBUG ((DEBUG_INFO, "OCRST: Perform cold reset...\n"));
     ResetMode = EfiResetCold;
-  } else if (StrCmp (Mode, L"WarmReset") == 0) {
+  } else if (OcStriCmp (Mode, L"warmreset") == 0) {
     DEBUG ((DEBUG_INFO, "OCRST: Perform warm reset...\n"));
     ResetMode = EfiResetWarm;
-  } else if (StrCmp (Mode, L"Shutdown") == 0) {
+  } else if (OcStriCmp (Mode, L"shutdown") == 0) {
     DEBUG ((DEBUG_INFO, "OCRST: Perform shutdown...\n"));
     ResetMode = EfiResetShutdown;
   } else {

diff --git a/Application/ResetSystem/ResetSystem.inf b/Application/ResetSystem/ResetSystem.inf
@@ -43,6 +43,7 @@
   DebugLib
   OcDeviceMiscLib
   OcMiscLib
+  OcStringLib
   UefiApplicationEntryPoint
   UefiBootServicesTableLib
   UefiRuntimeServicesTableLib

diff --git a/Application/RtcRw/RtcRw.c b/Application/RtcRw/RtcRw.c
@@ -19,6 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/OcConsoleLib.h>
 #include <Library/OcMiscLib.h>
 #include <Library/OcRtcLib.h>
+#include <Library/OcStringLib.h>
 #include <Library/UefiApplicationEntryPoint.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
@@ -48,7 +49,7 @@ UefiMain (
 
   Status = GetArguments (&Argc, &Argv);
   if (!EFI_ERROR (Status) && Argc >= 2) {
-    if (StrCmp (Argv[1], L"dump") == 0 && Argc == 2) {
+    if (OcStriCmp (Argv[1], L"dump") == 0 && Argc == 2) {
       for (Index = 0; Index < ARRAY_SIZE (Rtc); ++Index) {
         Rtc[Index] = OcRtcRead ((UINT8) Index);
       }
@@ -79,7 +80,7 @@ UefiMain (
       return EFI_SUCCESS;
     }
 
-    if (StrCmp (Argv[1], L"read") == 0 && Argc == 3)  {
+    if (OcStriCmp (Argv[1], L"read") == 0 && Argc == 3)  {
       Status = StrHexToUintnS (Argv[2], NULL, &Addr);
       if (EFI_ERROR (Status) || Addr > 0xFF) {
         Print (L"Invalid addr %LX - %r\n", (UINT64) Addr, Status);
@@ -90,7 +91,7 @@ UefiMain (
       return EFI_SUCCESS;
     }
 
-    if (StrCmp (Argv[1], L"write") == 0 && Argc == 4)  {
+    if (OcStriCmp (Argv[1], L"write") == 0 && Argc == 4)  {
       Status = StrHexToUintnS (Argv[2], NULL, &Addr);
       if (EFI_ERROR (Status) || Addr > 0xFF) {
         Print (L"Invalid addr %LX - %r\n", (UINT64) Addr, Status);

diff --git a/Application/RtcRw/RtcRw.inf b/Application/RtcRw/RtcRw.inf
@@ -42,6 +42,7 @@
   OcConsoleLib
   OcMiscLib
   OcRtcLib
+  OcStringLib
   UefiApplicationEntryPoint
   UefiBootServicesTableLib
   UefiLib
diff --git a/Docs/Configuration.tex b/Docs/Configuration.tex
@@ -5841,8 +5841,8 @@ \subsection{Tools and Applications}\label{uefitools}
 & Perform EPID provisioning (requires certificate data configuration). \\
 \href{https://github.com/acidanthera/OpenCorePkg}{\texttt{ResetSystem}}\textbf{*}
 & Utility to perform system reset. Takes reset type as an argument:
-  \texttt{ColdReset}, \texttt{Firmware}, \texttt{Shutdown}, \texttt{WarmReset}.
-  Defaults to \texttt{ColdReset}. \\
+  \texttt{coldreset}, \texttt{firmware}, \texttt{shutdown}, \texttt{warmreset}.
+  Defaults to \texttt{coldreset}. \\
 \href{https://github.com/acidanthera/OpenCorePkg}{\texttt{RtcRw}}\textbf{*}
 & Utility to read and write RTC (CMOS) memory. \\
 \href{https://github.com/acidanthera/OpenCorePkg}{\texttt{ControlMsrE2}}\textbf{*}