ShellPkg: Fix file size error upon copy operation.

There was a case where an copy operation of a small file overwriting a larger file would not correctly remove the extra space in the old file.  The resultant file would have the entire source file and then what remained of the original file.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
reviewed-by: El-Haj-Mahmoud, Samer <samer.el-haj-mahmoud@hp.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14584 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 05f3844966a68315dd8644289a1b21c8add865c6..a8c1f6697e1f1ec0fcb7c120241eae59499eb533 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -95,23 +95,10 @@ CopySingleFile(
     return (SHELL_SUCCESS);\r
   }\r
 \r
-  //\r
-  // Open destination file without create\r
-  //\r
-  Status = ShellOpenFileByName(Dest, &DestHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE, 0);\r
-\r
-  //\r
-  // close file\r
-  //\r
-  if (DestHandle != NULL) {\r
-    ShellCloseFile(&DestHandle);\r
-    DestHandle   = NULL;\r
-  }\r
-\r
   //\r
   // if the destination file existed check response and possibly prompt user\r
   //\r
-  if (!EFI_ERROR(Status)) {\r
+  if (ShellFileExists(Dest) == EFI_SUCCESS) {\r
     if (Response == NULL && !SilentMode) {\r
       Status = ShellPromptForResponseHii(ShellPromptResponseTypeYesNoAllCancel, STRING_TOKEN (STR_GEN_DEST_EXIST_OVR), gShellLevel2HiiHandle, &Response);\r
     }\r
@@ -165,81 +152,83 @@ CopySingleFile(
       Size = 0;\r
     }\r
   } else {\r
-      //\r
-      // open file with create enabled\r
-      //\r
-      Status = ShellOpenFileByName(Dest, &DestHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
-      if (EFI_ERROR(Status)) {\r
-        return (SHELL_ACCESS_DENIED);\r
-      }\r
+    Status = ShellDeleteFileByName(Dest);\r
 \r
-      //\r
-      // open source file\r
-      //\r
-      Status = ShellOpenFileByName(Source, &SourceHandle, EFI_FILE_MODE_READ, 0);\r
-      ASSERT_EFI_ERROR(Status);\r
+    //\r
+    // open file with create enabled\r
+    //\r
+    Status = ShellOpenFileByName(Dest, &DestHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);\r
+    if (EFI_ERROR(Status)) {\r
+      return (SHELL_ACCESS_DENIED);\r
+    }\r
 \r
-      //\r
-      //get file size of source file and freespace available on destination volume\r
-      //\r
-      ShellGetFileSize(SourceHandle, &SourceFileSize);\r
-      ShellGetFileSize(DestHandle, &DestFileSize);\r
+    //\r
+    // open source file\r
+    //\r
+    Status = ShellOpenFileByName(Source, &SourceHandle, EFI_FILE_MODE_READ, 0);\r
+    ASSERT_EFI_ERROR(Status);\r
 \r
-      //\r
-      //if the destination file already exists then it will be replaced, meaning the sourcefile effectively needs less storage space\r
-      //\r
-      if(DestFileSize < SourceFileSize){\r
-        SourceFileSize -= DestFileSize;\r
-      } else {\r
-        SourceFileSize = 0;\r
-      }\r
+    //\r
+    //get file size of source file and freespace available on destination volume\r
+    //\r
+    ShellGetFileSize(SourceHandle, &SourceFileSize);\r
+    ShellGetFileSize(DestHandle, &DestFileSize);\r
 \r
-      //\r
-      //get the system volume info to check the free space\r
-      //\r
-      DestVolumeFP = ConvertShellHandleToEfiFileProtocol(DestHandle);\r
-      DestVolumeInfo = NULL;\r
-      DestVolumeInfoSize = 0;\r
+    //\r
+    //if the destination file already exists then it will be replaced, meaning the sourcefile effectively needs less storage space\r
+    //\r
+    if(DestFileSize < SourceFileSize){\r
+      SourceFileSize -= DestFileSize;\r
+    } else {\r
+      SourceFileSize = 0;\r
+    }\r
+\r
+    //\r
+    //get the system volume info to check the free space\r
+    //\r
+    DestVolumeFP = ConvertShellHandleToEfiFileProtocol(DestHandle);\r
+    DestVolumeInfo = NULL;\r
+    DestVolumeInfoSize = 0;\r
+    Status = DestVolumeFP->GetInfo(\r
+      DestVolumeFP,\r
+      &gEfiFileSystemInfoGuid,\r
+      &DestVolumeInfoSize,\r
+      DestVolumeInfo\r
+      );\r
+\r
+    if (Status == EFI_BUFFER_TOO_SMALL) {\r
+      DestVolumeInfo = AllocateZeroPool(DestVolumeInfoSize);\r
       Status = DestVolumeFP->GetInfo(\r
         DestVolumeFP,\r
         &gEfiFileSystemInfoGuid,\r
         &DestVolumeInfoSize,\r
         DestVolumeInfo\r
         );\r
+    }\r
 \r
-      if (Status == EFI_BUFFER_TOO_SMALL) {\r
-        DestVolumeInfo = AllocateZeroPool(DestVolumeInfoSize);\r
-        Status = DestVolumeFP->GetInfo(\r
-          DestVolumeFP,\r
-          &gEfiFileSystemInfoGuid,\r
-          &DestVolumeInfoSize,\r
-          DestVolumeInfo\r
-          );\r
-      }\r
-\r
+    //\r
+    //check if enough space available on destination drive to complete copy\r
+    //\r
+    if (DestVolumeInfo!= NULL && (DestVolumeInfo->FreeSpace < SourceFileSize)) {\r
       //\r
-      //check if enough space available on destination drive to complete copy\r
+      //not enough space on destination directory to copy file\r
       //\r
-      if (DestVolumeInfo!= NULL && (DestVolumeInfo->FreeSpace < SourceFileSize)) {\r
-        //\r
-        //not enough space on destination directory to copy file\r
-        //\r
-        SHELL_FREE_NON_NULL(DestVolumeInfo);\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_FAIL), gShellLevel2HiiHandle);\r
-        return(SHELL_VOLUME_FULL);\r
-      } else {\r
-        //\r
-        // copy data between files\r
-        //\r
-        Buffer = AllocateZeroPool(ReadSize);\r
-        ASSERT(Buffer != NULL);\r
-        while (ReadSize == PcdGet32(PcdShellFileOperationSize) && !EFI_ERROR(Status)) {\r
-          Status = ShellReadFile(SourceHandle, &ReadSize, Buffer);\r
-          Status = ShellWriteFile(DestHandle, &ReadSize, Buffer);\r
-        }\r
-      }\r
       SHELL_FREE_NON_NULL(DestVolumeInfo);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_CPY_FAIL), gShellLevel2HiiHandle);\r
+      return(SHELL_VOLUME_FULL);\r
+    } else {\r
+      //\r
+      // copy data between files\r
+      //\r
+      Buffer = AllocateZeroPool(ReadSize);\r
+      ASSERT(Buffer != NULL);\r
+      while (ReadSize == PcdGet32(PcdShellFileOperationSize) && !EFI_ERROR(Status)) {\r
+        Status = ShellReadFile(SourceHandle, &ReadSize, Buffer);\r
+        Status = ShellWriteFile(DestHandle, &ReadSize, Buffer);\r
+      }\r
     }\r
+    SHELL_FREE_NON_NULL(DestVolumeInfo);\r
+  }\r
 \r
   //\r
   // close files\r
@@ -549,8 +538,10 @@ ProcessValidateAndCopyFiles(
   SHELL_STATUS        ShellStatus;\r
   EFI_SHELL_FILE_INFO *List;\r
   EFI_FILE_INFO       *FileInfo;\r
+  CHAR16              *FullName;\r
 \r
-  List = NULL;\r
+  List      = NULL;\r
+  FullName  = NULL;\r
 \r
   ShellOpenFileMetaArg((CHAR16*)DestDir, EFI_FILE_MODE_READ, &List);\r
   if (List != NULL && List->Link.ForwardLink != List->Link.BackLink) {\r
@@ -563,18 +554,21 @@ ProcessValidateAndCopyFiles(
     FileInfo    = NULL;\r
     FileInfo = gEfiShellProtocol->GetFileInfo(((EFI_SHELL_FILE_INFO *)List->Link.ForwardLink)->Handle);\r
     ASSERT(FileInfo != NULL);\r
+    StrnCatGrow(&FullName, NULL, ((EFI_SHELL_FILE_INFO *)List->Link.ForwardLink)->FullName, 0);\r
+    ShellCloseFileMetaArg(&List);\r
     if ((FileInfo->Attribute & EFI_FILE_READ_ONLY) == 0) {\r
-      ShellStatus = ValidateAndCopyFiles(FileList, ((EFI_SHELL_FILE_INFO *)List->Link.ForwardLink)->FullName, SilentMode, RecursiveMode, NULL);\r
+      ShellStatus = ValidateAndCopyFiles(FileList, FullName, SilentMode, RecursiveMode, NULL);\r
     } else {\r
       ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CP_DEST_ERROR), gShellLevel2HiiHandle);\r
       ShellStatus = SHELL_ACCESS_DENIED;\r
     }\r
-    SHELL_FREE_NON_NULL(FileInfo);\r
-    ShellCloseFileMetaArg(&List);\r
   } else {\r
+    ShellCloseFileMetaArg(&List);\r
     ShellStatus = ValidateAndCopyFiles(FileList, DestDir, SilentMode, RecursiveMode, NULL);\r
   }\r
 \r
+  SHELL_FREE_NON_NULL(FileInfo);\r
+  SHELL_FREE_NON_NULL(FullName);\r
   return (ShellStatus);\r
 }\r
 \r