Initialize shell only once

boot/xtldr/includes/xtldr.hh

@@ -261,6 +261,7 @@ class Shell
         STATIC LIST_ENTRY ShellCommands;
 
     public:
+        STATIC XTCDECL VOID InitializeShell();
         STATIC XTCDECL EFI_STATUS RegisterCommand(IN PCWSTR Command,
                                                   IN PCWSTR Description,
                                                   IN PBL_SHELL_COMMAND Handler);

boot/xtldr/shell.cc

@@ -307,6 +307,24 @@ Shell::ExecuteCommand(IN ULONG Argc,
     Console::Print(L"ERROR: '%S' is not recognized as a valid command.\n", Argv[0]);
 }
 
+/**
+ * Initializes the bootloader shell.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+Shell::InitializeShell()
+{
+    /* Initialize the shell commands list */
+    RTL::LinkedList::InitializeListHead(&ShellCommands);
+
+    /* Register all built-in commands */
+    RegisterBuiltinCommands();
+}
+
 /**
  * Splits the supplied raw command line string into an argument count and an argument vector suitable
  * for command dispatch. The input string is tokenized by whitespace.
@@ -881,12 +899,6 @@ Shell::StartLoaderShell()
     /* Initialize console */
     Console::InitializeConsole();
 
-    /* Initialize the shell commands list */
-    RTL::LinkedList::InitializeListHead(&ShellCommands);
-
-    /* Register all built-in commands */
-    RegisterBuiltinCommands();
-
     /* Clear the shell exit request flag */
     ExitRequest = FALSE;
 

boot/xtldr/xtldr.cc

@@ -245,8 +245,9 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
         for(;;);
     }
 
-    /* Initialize XTLDR and */
+    /* Initialize XTLDR and shell */
     XtLoader::InitializeBootLoader(ImageHandle, SystemTable);
+    Shell::InitializeShell();
 
     /* Parse configuration options passed from UEFI shell */
     Status = Configuration::ParseCommandLine();