tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Rename gShellCurDir to gShellCurMapping 

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Huajing Li 2017-08-28 11:23:39 +08:00 committed by Ruiyu Ni
parent 10cd747d33
commit 9cf4518702
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ShellPkg/Application/Shell/ShellProtocol.c
View File

@ -3079,10 +3079,10 @@ EfiShellSetCurDir(
// make that the current file system mapping
//
if (MapListItem != NULL) {
gShellCurDir = MapListItem;
gShellCurMapping = MapListItem;
}
} else {
MapListItem = gShellCurDir;
MapListItem = gShellCurMapping;
}
if (MapListItem == NULL) {
@ -3131,7 +3131,7 @@ EfiShellSetCurDir(
FreePool (DirectoryName);
return (EFI_INVALID_PARAMETER);
}
// gShellCurDir = MapListItem;
// gShellCurMapping = MapListItem;
if (DirectoryName != NULL) {
//
// change current dir on that file system
@ -3157,7 +3157,7 @@ EfiShellSetCurDir(
//
// if updated the current directory then update the environment variable
//
if (MapListItem == gShellCurDir) {
if (MapListItem == gShellCurMapping) {
Size = 0;
ASSERT((TempString == NULL && Size == 0) || (TempString != NULL));
StrnCatGrow(&TempString, &Size, MapListItem->MapName, 0);

4
ShellPkg/Include/Library/ShellCommandLib.h
View File

@ -4,7 +4,7 @@
This library is for use ONLY by shell commands linked into the shell application.
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 - 2017, 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
@ -48,7 +48,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.

6
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
View File

@ -1,7 +1,7 @@
/** @file
Provides interface to shell internal functions for shell commands.
Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
@ -53,7 +53,7 @@ STATIC CONST CHAR8 Hex[] = {
// global variables required by library class.
EFI_UNICODE_COLLATION_PROTOCOL *gUnicodeCollation = NULL;
SHELL_MAP_LIST gShellMapList;
SHELL_MAP_LIST *gShellCurDir = NULL;
SHELL_MAP_LIST *gShellCurMapping = NULL;
CONST CHAR16* SupportLevel[] = {
L"Minimal",
@ -229,7 +229,7 @@ ShellCommandLibDestructor (
}
gUnicodeCollation = NULL;
gShellCurDir = NULL;
gShellCurMapping = NULL;
return (RETURN_SUCCESS);
}