This refactors 3 functions out of ShellCommandLib and puts them into a new library...

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Cp.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 8b30ac3122ae5db0a71aaa704d7b40b015c3c9bd..08f5514cf54be387f6dc4c6af6994af172afb1fc 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -416,7 +416,7 @@ ValidateAndCopyFiles(
       break;\r
     }\r
 \r
-    CleanPath(DestPath);\r
+    PathCleanUpDirectories(DestPath);\r
 \r
     ShellPrintEx(-1, -1, HiiOutput, Node->FullName, DestPath);\r
 \r
@@ -619,7 +619,7 @@ ShellCommandRunCp (
           // now copy them all...\r
           //\r
           if (FileList != NULL && !IsListEmpty(&FileList->Link)) {\r
-            ShellStatus = ProcessValidateAndCopyFiles(FileList, ShellCommandCleanPath((CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount)), SilentMode, RecursiveMode);\r
+            ShellStatus = ProcessValidateAndCopyFiles(FileList, PathCleanUpDirectories((CHAR16*)ShellCommandLineGetRawValue(Package, ParamCount)), SilentMode, RecursiveMode);\r
             Status = ShellCloseFileMetaArg(&FileList);\r
             if (EFI_ERROR(Status) && ShellStatus == SHELL_SUCCESS) {\r
               ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_FILE), gShellLevel2HiiHandle, ShellCommandLineGetRawValue(Package, ParamCount), ShellStatus|MAX_BIT);\r