X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FInclude%2FLibrary%2FShellCommandLib.h;h=63fcac82a2de2a387acdeee92db5188ccff6d056;hb=c44501b313b3d2a28255d9ef5f8bc9644745859e;hp=5c5e241f1525e03b0a8713cd0dc5a9a83508b15c;hpb=c0bcd3433f33876c519bf5567e0ab69261b57fe9;p=mirror_edk2.git

diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index 5c5e241f15..63fcac82a2 100644
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -2,18 +2,12 @@
   Provides interface to shell internal functions for shell commands.
 
   This library is for use ONLY by shell commands linked into the shell application.
-  This library will not funciton if it is used for UEFI Shell 2.0 Applications.
+  This library will not function if it is used for UEFI Shell 2.0 Applications.
 
-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
   (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.<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
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -21,10 +15,9 @@
 #define _SHELL_COMMAND_LIB_
 
 #include <Uefi.h>
-#include <ShellBase.h>
 
-#include <Protocol/EfiShell.h>
-#include <Protocol/EfiShellParameters.h>
+#include <Protocol/Shell.h>
+#include <Protocol/ShellParameters.h>
 #include <Protocol/UnicodeCollation.h>
 #include <Protocol/SimpleFileSystem.h>
 
@@ -49,7 +42,7 @@ typedef struct {
 /// List of Mappings - DeviceName and Drive Letter(ism).
 extern        SHELL_MAP_LIST                      gShellMapList;
 /// Pointer to node of current directory in the mMapList.
-extern        SHELL_MAP_LIST                      *gShellCurDir;
+extern        SHELL_MAP_LIST                      *gShellCurMapping;
 
 /**
   Returns the help MAN fileName for a given shell command.
@@ -143,7 +136,7 @@ ShellCommandRegisterCommandName (
   IN        UINT32                      ShellMinSupportLevel,
   IN CONST  CHAR16                      *ProfileName,
   IN CONST  BOOLEAN                     CanAffectLE,
-  IN CONST  EFI_HANDLE                  HiiHandle,
+  IN CONST  EFI_HII_HANDLE              HiiHandle,
   IN CONST  EFI_STRING_ID               ManFormatHelp
   );
 
@@ -508,10 +501,10 @@ ShellCommandConsistMappingUnInitialize (
   );
 
 /**
-  Create a consistent mapped name for the device specified by DevicePath 
+  Create a consistent mapped name for the device specified by DevicePath
   based on the Table.
 
-  This must be called after ShellCommandConsistMappingInitialize() and 
+  This must be called after ShellCommandConsistMappingInitialize() and
   before ShellCommandConsistMappingUnInitialize() is called.
 
   @param[in] DevicePath   The pointer to the dev path for the device.
@@ -695,6 +688,7 @@ FreeBufferList (
   @param[in] UserData     Pointer to some data.
 **/
 VOID
+EFIAPI
 DumpHex (
   IN UINTN        Indent,
   IN UINTN        Offset,
@@ -712,6 +706,7 @@ DumpHex (
   @param[in] UserData   The data to print out.
 **/
 CHAR16*
+EFIAPI
 CatSDumpHex (
   IN CHAR16  *Buffer,
   IN UINTN   Indent,
@@ -719,49 +714,4 @@ CatSDumpHex (
   IN UINTN   DataSize,
   IN VOID    *UserData
   );
-
-/**
-  Return the pointer to the first occurrence of any character from a list of characters.
-
-  @param[in] String                 The string to parse
-  @param[in] CharacterList          The list of character to look for
-  @param[in] IgnoreEscapedCharacter TRUE to ignore escaped characters
-
-  @return The location of the first character in the String.
-  @return Pointer to the ending NULL character of the String.
-**/
-CONST CHAR16*
-EFIAPI
-ShellFindFirstCharacter (
-  IN CONST CHAR16  *String,
-  IN CONST CHAR16  *CharacterList,
-  IN CONST BOOLEAN IgnoreEscapedCharacter
-  );
-
-/**
-  return the next parameter from a command line string;
-
-  This function moves the next parameter from Walker into NextParameter and moves
-  Walker up past that parameter for recursive calling.  When the final parameter
-  is moved *Walker will be set to NULL;
-
-  @param[in, out] Walker          pointer to string of command line.  Adjusted to
-                                  reminaing command line on return
-  @param[in, out] NextParameter   string of command line item extracted.
-  @param[in]      Length          Length of TempParameter in bytes
-  @param[in]      StripQuotation  if TRUE then strip the quotation marks surrounding
-                                  the parameters.
-
-  @return   EFI_INALID_PARAMETER  A required parameter was NULL or pointed to a NULL or empty string.
-  @return   EFI_NOT_FOUND         A closing " could not be found on the specified string
-**/
-EFI_STATUS
-EFIAPI
-ShellGetNextParameter(
-  IN OUT CHAR16   **Walker,
-  IN OUT CHAR16   *NextParameter,
-  IN CONST UINTN  Length,
-  IN BOOLEAN      StripQuotation
-  );
-
 #endif //_SHELL_COMMAND_LIB_