From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Huajing Li <huajing.li@intel.com>
Subject: [PATCH 1/3] ShellPkg: Rename gShellCurDir to gShellCurMapping
Date: Tue, 29 Aug 2017 16:11:05 +0800 [thread overview]
Message-ID: <20170829081107.442452-2-ruiyu.ni@intel.com> (raw)
In-Reply-To: <20170829081107.442452-1-ruiyu.ni@intel.com>
From: Huajing Li <huajing.li@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
---
ShellPkg/Application/Shell/ShellProtocol.c | 8 ++++----
ShellPkg/Include/Library/ShellCommandLib.h | 4 ++--
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c
index 991fb58ca7..40e5e653ae 100644
--- a/ShellPkg/Application/Shell/ShellProtocol.c
+++ b/ShellPkg/Application/Shell/ShellProtocol.c
@@ -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);
diff --git a/ShellPkg/Include/Library/ShellCommandLib.h b/ShellPkg/Include/Library/ShellCommandLib.h
index c11d81d506..616b0d3267 100644
--- a/ShellPkg/Include/Library/ShellCommandLib.h
+++ b/ShellPkg/Include/Library/ShellCommandLib.h
@@ -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.
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index bd14878052..b9158d1243 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -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);
}
--
2.12.2.windows.2
next prev parent reply other threads:[~2017-08-29 8:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-29 8:11 [PATCH 0/3] Update CWD and current mapping properly Ruiyu Ni
2017-08-29 8:11 ` Ruiyu Ni [this message]
2017-08-29 8:11 ` [PATCH 2/3] ShellPkg: Fix bug that fails to change CWD after "map -r" Ruiyu Ni
2017-08-29 8:11 ` [PATCH 3/3] ShellPkg: Update CWD and current mapping when commands return Ruiyu Ni
2017-08-29 14:58 ` [PATCH 0/3] Update CWD and current mapping properly Carsey, Jaben
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170829081107.442452-2-ruiyu.ni@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox