ShellPkg/cd: Fix "cd" to support "fs0:dir" (no slash after ':')

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Load.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
index 1e29ad62e1bb3a09a475e22001893a43414cf521..322d510eacd9cf9a255167d4e6d32575470b2d78 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for attrib shell level 2 function.\r
 \r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<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
@@ -27,7 +28,6 @@
 \r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConnectAllEfi (\r
   VOID\r
   )\r
@@ -73,7 +73,6 @@ ConnectAllEfi (
   @retval EFI_OUT_OF_RESOURCES  there was insufficient memory\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 LoadDriver(\r
   IN CONST CHAR16   *FileName,\r
   IN CONST BOOLEAN  Connect\r
@@ -81,13 +80,11 @@ LoadDriver(
 {\r
   EFI_HANDLE                    LoadedDriverHandle;\r
   EFI_STATUS                    Status;\r
-  EFI_DEVICE_PATH_PROTOCOL      *Node;\r
   EFI_DEVICE_PATH_PROTOCOL      *FilePath;\r
   EFI_LOADED_IMAGE_PROTOCOL     *LoadedDriverImage;\r
 \r
   LoadedDriverImage   = NULL;\r
   FilePath            = NULL;\r
-  Node                = NULL;\r
   LoadedDriverHandle  = NULL;\r
   Status              = EFI_SUCCESS;\r
 \r
@@ -215,7 +212,7 @@ ShellCommandRunLoad (
   Status = ShellCommandLineParse (LoadParamList, &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), gShellLevel2HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"load", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -231,7 +228,7 @@ ShellCommandRunLoad (
       //\r
       // we didnt get a single file to load parameter\r
       //\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"load");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       for ( ParamCount = 1\r
@@ -248,9 +245,9 @@ ShellCommandRunLoad (
             // once we have an error preserve that value, but finish the loop.\r
             //\r
             if (EFI_ERROR(Status)) {\r
-              LoadDriver(Node->FullName, ShellCommandLineGetFlag(Package, L"-nc"));\r
+              LoadDriver(Node->FullName, (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-nc")==FALSE));\r
             } else {\r
-              Status = LoadDriver(Node->FullName, ShellCommandLineGetFlag(Package, L"-nc"));\r
+              Status = LoadDriver(Node->FullName, (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-nc")==FALSE));\r
             }\r
           } // for loop for multi-open\r
           if (EFI_ERROR(Status)) {\r
@@ -262,7 +259,7 @@ ShellCommandRunLoad (
           //\r
           // no files found.\r
           //\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, (CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount));\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"load", (CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount));  \r
           ShellStatus = SHELL_NOT_FOUND;\r
         }\r
       } // for loop for params\r