/** @file\r
Main file for mv shell level 2 function.\r
\r
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
if the result is sucessful the caller must free *DestPathPointer.\r
\r
- @param[in] DestDir The original path to the destination\r
- @param[in,out] DestPathPointer a pointer to the callee allocated final path.\r
+ @param[in] DestDir The original path to the destination.\r
+ @param[in, out] DestPathPointer A pointer to the callee allocated final path.\r
+ @param[in] Cwd A pointer to the current working directory.\r
\r
- @retval EFI_INVALID_PARAMETR the DestDir could not be resolved to a location\r
- @retval EFI_INVALID_PARAMETR the DestDir could be resolved to more than 1 location\r
- @retval EFI_SUCCESS the operation was sucessful\r
+ @retval SHELL_INVALID_PARAMETER The DestDir could not be resolved to a location.\r
+ @retval SHELL_INVALID_PARAMETER The DestDir could be resolved to more than 1 location.\r
+ @retval SHELL_INVALID_PARAMETER Cwd is required and is NULL.\r
+ @retval SHELL_SUCCESS The operation was sucessful.\r
**/\r
SHELL_STATUS\r
EFIAPI\r
{\r
EFI_SHELL_FILE_INFO *DestList;\r
EFI_SHELL_FILE_INFO *Node;\r
- EFI_STATUS Status;\r
CHAR16 *DestPath;\r
CHAR16 *TempLocation;\r
UINTN NewSize;\r
\r
DestList = NULL;\r
DestPath = NULL;\r
+\r
+ if (StrStr(DestDir, L"\\") == DestDir) {\r
+ if (Cwd == NULL) {\r
+ return SHELL_INVALID_PARAMETER;\r
+ }\r
+ DestPath = AllocateZeroPool(StrSize(Cwd));\r
+ if (DestPath == NULL) {\r
+ return (SHELL_OUT_OF_RESOURCES);\r
+ }\r
+ StrCpy(DestPath, Cwd);\r
+ while (PathRemoveLastItem(DestPath)) ;\r
+ *DestPathPointer = DestPath;\r
+ return (SHELL_SUCCESS);\r
+ }\r
//\r
// get the destination path\r
//\r
- Status = ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
+ ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ|EFI_FILE_MODE_CREATE, &DestList);\r
if (DestList == NULL || IsListEmpty(&DestList->Link)) {\r
//\r
// Not existing... must be renaming\r
//\r
if ((TempLocation = StrStr(DestDir, L":")) == NULL) {\r
+ if (Cwd == NULL) {\r
+ ShellCloseFileMetaArg(&DestList);\r
+ return (SHELL_INVALID_PARAMETER);\r
+ }\r
NewSize = StrSize(Cwd);\r
NewSize += StrSize(DestDir);\r
DestPath = AllocateZeroPool(NewSize);\r
will report any errors to the user and continue to move the rest of the files.\r
\r
@param[in] FileList A LIST_ENTRY* based list of files to move\r
+ @param[out] Resp pointer to response from question. Pass back on looped calling\r
@param[in] DestDir the destination location\r
\r
@retval SHELL_SUCCESS the files were all moved.\r
EFIAPI\r
ValidateAndMoveFiles(\r
IN CONST EFI_SHELL_FILE_INFO *FileList,\r
+ OUT VOID **Resp,\r
IN CONST CHAR16 *DestDir\r
)\r
{\r
CHAR16 *TempLocation;\r
UINTN NewSize;\r
UINTN Length;\r
+ VOID *Response;\r
+ SHELL_FILE_HANDLE DestHandle;\r
\r
ASSERT(FileList != NULL);\r
ASSERT(DestDir != NULL);\r
\r
DestPath = NULL;\r
Cwd = ShellGetCurrentDir(NULL);\r
+ Response = *Resp;\r
\r
//\r
// Get and validate the destination location\r
if (ShellStatus != SHELL_SUCCESS) {\r
return (ShellStatus);\r
}\r
+ DestPath = PathCleanUpDirectories(DestPath);\r
\r
HiiOutput = HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_MV_OUTPUT), NULL);\r
HiiResultOk = HiiGetString (gShellLevel2HiiHandle, STRING_TOKEN (STR_GEN_RES_OK), NULL);\r
// construct the new file info block\r
//\r
NewSize = StrSize(DestPath);\r
- NewSize += StrSize(Node->FileName) + sizeof(EFI_FILE_INFO) + sizeof(CHAR16);\r
+ NewSize += StrSize(Node->FileName) + SIZE_OF_EFI_FILE_INFO + sizeof(CHAR16);\r
NewFileInfo = AllocateZeroPool(NewSize);\r
if (NewFileInfo == NULL) {\r
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);\r
ShellStatus = SHELL_OUT_OF_RESOURCES;\r
} else {\r
- CopyMem(NewFileInfo, Node->Info, sizeof(EFI_FILE_INFO));\r
+ CopyMem(NewFileInfo, Node->Info, SIZE_OF_EFI_FILE_INFO);\r
if (DestPath[0] != L'\\') {\r
StrCpy(NewFileInfo->FileName, L"\\");\r
StrCat(NewFileInfo->FileName, DestPath);\r
}\r
StrCat(NewFileInfo->FileName, Node->FileName);\r
}\r
- NewFileInfo->Size = sizeof(EFI_FILE_INFO) + StrSize(NewFileInfo->FileName);\r
-\r
+ NewFileInfo->Size = SIZE_OF_EFI_FILE_INFO + StrSize(NewFileInfo->FileName);\r
ShellPrintEx(-1, -1, HiiOutput, Node->FullName, NewFileInfo->FileName);\r
\r
+ if (!EFI_ERROR(ShellFileExists(NewFileInfo->FileName))) {\r
+ if (Response == NULL) {\r
+ ShellPromptForResponseHii(ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);\r
+ }\r
+ switch (*(SHELL_PROMPT_RESPONSE*)Response) {\r
+ case ShellPromptResponseNo:\r
+ FreePool(NewFileInfo);\r
+ continue;\r
+ case ShellPromptResponseCancel:\r
+ *Resp = Response;\r
+ //\r
+ // indicate to stop everything\r
+ //\r
+ FreePool(NewFileInfo);\r
+ FreePool(DestPath);\r
+ FreePool(HiiOutput);\r
+ FreePool(HiiResultOk);\r
+ return (SHELL_ABORTED);\r
+ case ShellPromptResponseAll:\r
+ *Resp = Response;\r
+ break;\r
+ case ShellPromptResponseYes:\r
+ FreePool(Response);\r
+ break;\r
+ default:\r
+ FreePool(Response);\r
+ FreePool(NewFileInfo);\r
+ FreePool(DestPath);\r
+ FreePool(HiiOutput);\r
+ FreePool(HiiResultOk);\r
+ return SHELL_ABORTED;\r
+ }\r
+ Status = ShellOpenFileByName(NewFileInfo->FileName, &DestHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, 0);\r
+ ShellDeleteFile(&DestHandle);\r
+ }\r
+\r
+\r
//\r
// Perform the move operation\r
//\r
//\r
// Free the info object we used...\r
//\r
- ASSERT (NewFileInfo != NULL);\r
FreePool(NewFileInfo);\r
\r
//\r
return (ShellStatus);\r
}\r
\r
+/**\r
+ Function for 'mv' command.\r
+\r
+ @param[in] ImageHandle Handle to the Image (NULL if Internal).\r
+ @param[in] SystemTable Pointer to the System Table (NULL if Internal).\r
+**/\r
SHELL_STATUS\r
EFIAPI\r
ShellCommandRunMv (\r
UINTN ParamCount;\r
UINTN LoopCounter;\r
EFI_SHELL_FILE_INFO *FileList;\r
+ VOID *Response;\r
\r
ProblemParam = NULL;\r
ShellStatus = SHELL_SUCCESS;\r
ParamCount = 0;\r
FileList = NULL;\r
+ Response = NULL;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
// ValidateAndMoveFiles will report errors to the screen itself\r
//\r
- ShellStatus = ValidateAndMoveFiles(FileList, ShellGetCurrentDir(NULL));\r
+ ShellStatus = ValidateAndMoveFiles(FileList, &Response, ShellGetCurrentDir(NULL));\r
}\r
}\r
\r
break;\r
default:\r
///@todo make sure this works with error half way through and continues...\r
- for (ParamCount--, LoopCounter = 1 ; LoopCounter < ParamCount && ShellStatus == SHELL_SUCCESS ; LoopCounter++) {\r
+ for (ParamCount--, LoopCounter = 1 ; LoopCounter < ParamCount ; LoopCounter++) {\r
if (ShellGetExecutionBreakFlag()) {\r
break;\r
}\r
Status = ShellOpenFileMetaArg((CHAR16*)ShellCommandLineGetRawValue(Package, LoopCounter), EFI_FILE_MODE_WRITE|EFI_FILE_MODE_READ, &FileList);\r
if (FileList == NULL || IsListEmpty(&FileList->Link) || EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, ShellCommandLineGetRawValue(Package, 1));\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, ShellCommandLineGetRawValue(Package, LoopCounter));\r
ShellStatus = SHELL_NOT_FOUND;\r
} else {\r
//\r
// Only change ShellStatus if it's sucessful\r
//\r
if (ShellStatus == SHELL_SUCCESS) {\r
- ShellStatus = ValidateAndMoveFiles(FileList, ShellCommandLineGetRawValue(Package, ParamCount));\r
+ ShellStatus = ValidateAndMoveFiles(FileList, &Response, ShellCommandLineGetRawValue(Package, ParamCount));\r
} else {\r
- ValidateAndMoveFiles(FileList, ShellCommandLineGetRawValue(Package, ParamCount));\r
+ ValidateAndMoveFiles(FileList, &Response, ShellCommandLineGetRawValue(Package, ParamCount));\r
}\r
}\r
if (FileList != NULL && !IsListEmpty(&FileList->Link)) {\r
ShellCommandLineFreeVarList (Package);\r
}\r
\r
+ SHELL_FREE_NON_NULL(Response);\r
+\r
if (ShellGetExecutionBreakFlag()) {\r
return (SHELL_ABORTED);\r
}\r
projects / mirror_edk2.git / blobdiff