ShellPkg/for: Fix potential null pointer deference

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
index 0a8e1b2be812eb9cb0cf6e20ecc7f858f1cf2f7d..d2ae8e82719dfcb5edc7a82b19e4651b1561a3d6 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Reconnect.c
@@ -1,7 +1,9 @@
 /** @file\r
   Main file for Reconnect shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -14,6 +16,30 @@
 \r
 #include "UefiShellDriver1CommandsLib.h"\r
 \r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+  {L"-r", TypeFlag},\r
+  {NULL, TypeMax}\r
+  };\r
+\r
+/**\r
+  Connect all the possible console devices.\r
+\r
+**/\r
+VOID\r
+ConnectAllConsoles (\r
+  VOID\r
+  )\r
+{  \r
+  ShellConnectFromDevPaths(L"ConInDev");\r
+  ShellConnectFromDevPaths(L"ConOutDev");\r
+  ShellConnectFromDevPaths(L"ErrOutDev");\r
+  \r
+  ShellConnectFromDevPaths(L"ErrOut");\r
+  ShellConnectFromDevPaths(L"ConIn");\r
+  ShellConnectFromDevPaths(L"ConOut");\r
+}\r
+\r
+\r
 /**\r
   Function for 'reconnect' command.\r
 \r
@@ -28,10 +54,46 @@ ShellCommandRunReconnect (
   )\r
 {\r
   SHELL_STATUS        ShellStatus;\r
+  LIST_ENTRY          *Package;\r
+  CHAR16              *ProblemParam;\r
+  EFI_STATUS          Status;\r
+\r
+  gInReconnect = TRUE;\r
+  ShellStatus = SHELL_SUCCESS;\r
+  \r
+  //\r
+  // initialize the shell lib (we must be in non-auto-init...)\r
+  //\r
+  Status = ShellInitialize();\r
+  ASSERT_EFI_ERROR(Status);\r
+\r
+  Status = CommandInit();\r
+  ASSERT_EFI_ERROR(Status);\r
+\r
+  //\r
+  // parse the command line\r
+  //\r
+  Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
+  if (EFI_ERROR(Status)) {\r
+    if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"reconnect", ProblemParam);\r
+      FreePool(ProblemParam);\r
+      ShellStatus = SHELL_INVALID_PARAMETER;\r
+    } else {\r
+      ASSERT(FALSE);\r
+    }\r
+  } else {\r
+    ShellStatus = ShellCommandRunDisconnect(ImageHandle, SystemTable);\r
+    if (ShellStatus == SHELL_SUCCESS) {\r
+      if (ShellCommandLineGetFlag(Package, L"-r")) {\r
+        ConnectAllConsoles();\r
+      }\r
+      ShellStatus = ShellCommandRunConnect(ImageHandle, SystemTable);\r
+    }\r
+  }  \r
+\r
+  gInReconnect = FALSE;\r
 \r
-  ShellStatus = ShellCommandRunDisconnect(ImageHandle, SystemTable);\r
-  if (ShellStatus == SHELL_SUCCESS) {\r
-    ShellStatus = ShellCommandRunConnect(ImageHandle, SystemTable);\r
-  }\r
   return (ShellStatus);\r
 }\r
+\r