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

ShellPkg: add verification that a target directory exists when changing directory with drive identifier. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14128 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2013-02-13 22:22:16 +00:00
parent 9d0e28d4cf
commit 668a5781d3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main file for attrib shell level 2 function. Main file for attrib shell level 2 function.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -149,6 +149,9 @@ ShellCommandRunCd (
} }
} }
} else if (StrStr(Param1Copy, L":") == NULL) { } else if (StrStr(Param1Copy, L":") == NULL) {
//
// change directory without a drive identifier
//
if (ShellGetCurrentDir(NULL) == NULL) { if (ShellGetCurrentDir(NULL) == NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);
ShellStatus = SHELL_NOT_FOUND; ShellStatus = SHELL_NOT_FOUND;
@ -189,7 +192,7 @@ ShellCommandRunCd (
} }
} else { } else {
// //
// change directory on other drive letter // change directory with a drive letter
// //
Drive = AllocateZeroPool(StrSize(Param1Copy)); Drive = AllocateZeroPool(StrSize(Param1Copy));
if (Drive == NULL) { if (Drive == NULL) {
@ -199,7 +202,10 @@ ShellCommandRunCd (
Drive = StrCpy(Drive, Param1Copy); Drive = StrCpy(Drive, Param1Copy);
Path = StrStr(Drive, L":"); Path = StrStr(Drive, L":");
ASSERT(Path != NULL); ASSERT(Path != NULL);
if (*(Path+1) == CHAR_NULL) { if (EFI_ERROR(ShellIsDirectory(Param1Copy))) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, Param1Copy);
ShellStatus = SHELL_NOT_FOUND;
} else if (*(Path+1) == CHAR_NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle);
ShellStatus = SHELL_NOT_FOUND; ShellStatus = SHELL_NOT_FOUND;
} else { } else {