X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FApplication%2FShell%2FShellProtocol.c;h=e1aadb845d4eb7c49a971d9ba1919efced0c84f7;hb=e3df6949e7e2a4578660d4079988487a147c91b7;hp=17c517c088961a7f57ea1389c9641e051a1bff43;hpb=74fa83fda6be6277044619276d0f1391e72e54a2;p=mirror_edk2.git

diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 17c517c088..e1aadb845d 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -2,7 +2,7 @@
   Member functions of EFI_SHELL_PROTOCOL and functions for creation,
   manipulation, and initialization of EFI_SHELL_PROTOCOL.
 
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -14,7 +14,6 @@
 **/
 
 #include "Shell.h"
-#include <Library/FileHandleLib.h>
 
 /**
   Close an open file handle.
@@ -116,27 +115,19 @@ InternalShellProtocolDebugPrintMessage (
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
   )
 {
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
   EFI_STATUS                        Status;
   CHAR16                            *Temp;
 
   Status = EFI_SUCCESS;
   DEBUG_CODE_BEGIN();
-  DevicePathToText = NULL;
 
-  Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid,
-                               NULL,
-                               (VOID**)&DevicePathToText);
   if (Mapping != NULL) {
     DEBUG((EFI_D_INFO, "Added new map item:\"%S\"\r\n", Mapping));
   }
-  if (!EFI_ERROR(Status)) {
-    if (DevicePath != NULL) {
-      Temp = DevicePathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);
-      DEBUG((EFI_D_INFO, "DevicePath: %S\r\n", Temp));
-      FreePool(Temp);
-    }
-  }
+  Temp = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
+  DEBUG((EFI_D_INFO, "DevicePath: %S\r\n", Temp));
+  FreePool(Temp);
+
   DEBUG_CODE_END();
   return (Status);
 }
@@ -648,7 +639,6 @@ EfiShellGetDeviceName(
 {
   EFI_STATUS                        Status;
   EFI_COMPONENT_NAME2_PROTOCOL      *CompName2;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;
   EFI_HANDLE                        *HandleList;
   UINTN                             HandleCount;
@@ -816,28 +806,19 @@ EfiShellGetDeviceName(
     }
   }
   if ((Flags & EFI_DEVICE_NAME_USE_DEVICE_PATH) != 0) {
-    Status = gBS->LocateProtocol(
-      &gEfiDevicePathToTextProtocolGuid,
+    Status = gBS->OpenProtocol(
+      DeviceHandle,
+      &gEfiDevicePathProtocolGuid,
+      (VOID**)&DevicePath,
+      gImageHandle,
       NULL,
-      (VOID**)&DevicePathToText);
-    //
-    // we now have the device path to text protocol
-    //
+      EFI_OPEN_PROTOCOL_GET_PROTOCOL);
     if (!EFI_ERROR(Status)) {
-      Status = gBS->OpenProtocol(
-        DeviceHandle,
-        &gEfiDevicePathProtocolGuid,
-        (VOID**)&DevicePath,
-        gImageHandle,
-        NULL,
-        EFI_OPEN_PROTOCOL_GET_PROTOCOL);
-      if (!EFI_ERROR(Status)) {
-        //
-        // use device path to text on the device path
-        //
-        *BestDeviceName = DevicePathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);
-        return (EFI_SUCCESS);
-      }
+      //
+      // use device path to text on the device path
+      //
+      *BestDeviceName = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
+      return (EFI_SUCCESS);
     }
   }
   //
@@ -995,7 +976,6 @@ InternalOpenFileDevicePath(
   SHELL_FILE_HANDLE               ShellHandle;
   EFI_FILE_PROTOCOL               *Handle1;
   EFI_FILE_PROTOCOL               *Handle2;
-  EFI_DEVICE_PATH_PROTOCOL        *DpCopy;
   FILEPATH_DEVICE_PATH            *AlignedNode;
 
   if (FileHandle == NULL) {
@@ -1005,7 +985,6 @@ InternalOpenFileDevicePath(
   Handle1       = NULL;
   Handle2       = NULL;
   Handle        = NULL;
-  DpCopy        = DevicePath;
   ShellHandle   = NULL;
   FilePathNode  = NULL;
   AlignedNode   = NULL;
@@ -1586,18 +1565,18 @@ EfiShellExecute(
   DevPath = AppendDevicePath (ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
 
   DEBUG_CODE_BEGIN();
-  Temp = gDevPathToText->ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
   FreePool(Temp);
-  Temp = gDevPathToText->ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
   FreePool(Temp);
-  Temp = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(DevPath, TRUE, TRUE);
   FreePool(Temp);
   DEBUG_CODE_END();
 
   Temp = NULL;
   Size = 0;
   ASSERT((Temp == NULL && Size == 0) || (Temp != NULL));
-  StrnCatGrow(&Temp, &Size, L"Shell.efi ", 0);
+  StrnCatGrow(&Temp, &Size, L"Shell.efi -_exit ", 0);
   StrnCatGrow(&Temp, &Size, CommandLine, 0);
 
   Status = InternalShellExecuteDevicePath(
@@ -2893,7 +2872,6 @@ InternalEfiShellGetListAlias(
   UINTN             NameSize;
   CHAR16            *RetVal;
   UINTN             RetSize;
-  CHAR16            *Alias;
 
   Status = gRT->QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE|EFI_VARIABLE_BOOTSERVICE_ACCESS, &MaxStorSize, &RemStorSize, &MaxVarSize);
   ASSERT_EFI_ERROR(Status);
@@ -2919,7 +2897,6 @@ InternalEfiShellGetListAlias(
       break;
     }
     if (CompareGuid(&Guid, &gShellAliasGuid)){
-      Alias = GetVariable(VariableName, &gShellAliasGuid);
       ASSERT((RetVal == NULL && RetSize == 0) || (RetVal != NULL));
       RetVal = StrnCatGrow(&RetVal, &RetSize, VariableName, 0);
       RetVal = StrnCatGrow(&RetVal, &RetSize, L";", 0);
@@ -3337,8 +3314,9 @@ NotificationFunction(
   )
 {
   EFI_INPUT_KEY Key;
-  if ((KeyData->Key.UnicodeChar == L'c' || KeyData->Key.UnicodeChar == 3) &&
-      (KeyData->KeyState.KeyShiftState == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))
+  if ( ((KeyData->Key.UnicodeChar == L'c') &&
+        (KeyData->KeyState.KeyShiftState == (EFI_SHIFT_STATE_VALID|EFI_LEFT_CONTROL_PRESSED) || KeyData->KeyState.KeyShiftState  == (EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED))) ||
+      (KeyData->Key.UnicodeChar == 3)
       ){ 
     if (ShellInfoObject.NewEfiShellProtocol->ExecutionBreak == NULL) {
       return (EFI_UNSUPPORTED);