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

ShellPkg: Fix 'mv' command to not attempt moving a file from write-protected media 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Phillips <chrisp@hp.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15584 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Chris Phillips 2014-06-24 18:39:15 +00:00 committed by jcarsey
parent b34039b2e1
commit 83c7a556a2
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
View File

@ -1,8 +1,8 @@
/** @file /** @file
Main file for mv shell level 2 function. Main file for mv shell level 2 function.
Copyright (c) 2013, Hewlett-Packard Development Company, L.P. (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.
Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2014, 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
@ -29,6 +29,7 @@
@param Cwd [in] The current working directory @param Cwd [in] The current working directory
@param DestPath [in] The target location to move to @param DestPath [in] The target location to move to
@param Attribute[in] The Attribute of the file @param Attribute[in] The Attribute of the file
@param FileStatus[in] The Status of the file when opened
@retval TRUE The move is valid @retval TRUE The move is valid
@retval FALSE The move is not @retval FALSE The move is not
@ -39,7 +40,8 @@ IsValidMove(
IN CONST CHAR16 *FullName, IN CONST CHAR16 *FullName,
IN CONST CHAR16 *Cwd, IN CONST CHAR16 *Cwd,
IN CONST CHAR16 *DestPath, IN CONST CHAR16 *DestPath,
IN CONST UINT64 Attribute IN CONST UINT64 Attribute,
IN CONST EFI_STATUS FileStatus
) )
{ {
CHAR16 *Test; CHAR16 *Test;
@ -87,11 +89,11 @@ IsValidMove(
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_SUB), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_SUB), gShellLevel2HiiHandle);
return (FALSE); return (FALSE);
} }
if ((Attribute & EFI_FILE_READ_ONLY) != 0) { if (((Attribute & EFI_FILE_READ_ONLY) != 0) || (FileStatus == EFI_WRITE_PROTECTED)) {
// //
// invalid to move read only // invalid to move read only
// //
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_RO), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MV_INV_RO), gShellLevel2HiiHandle, FullName);
return (FALSE); return (FALSE);
} }
Test = StrStr(FullName, L":"); Test = StrStr(FullName, L":");
@ -290,7 +292,6 @@ ValidateAndMoveFiles(
ASSERT (DestPath != NULL); ASSERT (DestPath != NULL);
ASSERT (HiiResultOk != NULL); ASSERT (HiiResultOk != NULL);
ASSERT (HiiOutput != NULL); ASSERT (HiiOutput != NULL);
// ASSERT (Cwd != NULL);
// //
// Go through the list of files and directories to move... // Go through the list of files and directories to move...
@ -302,8 +303,13 @@ ValidateAndMoveFiles(
if (ShellGetExecutionBreakFlag()) { if (ShellGetExecutionBreakFlag()) {
break; break;
} }
//
// These should never be NULL
//
ASSERT(Node->FileName != NULL); ASSERT(Node->FileName != NULL);
ASSERT(Node->FullName != NULL); ASSERT(Node->FullName != NULL);
ASSERT(Node->Info != NULL);
// //
// skip the directory traversing stuff... // skip the directory traversing stuff...
@ -315,7 +321,7 @@ ValidateAndMoveFiles(
// //
// Validate that the move is valid // Validate that the move is valid
// //
if (!IsValidMove(Node->FullName, Cwd, DestPath, Node->Info->Attribute)) { if (!IsValidMove(Node->FullName, Cwd, DestPath, Node->Info->Attribute, Node->Status)) {
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
continue; continue;
} }

BIN
ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni
View File

Binary file not shown.