ShellPkg: Follow spec to remove the last '\' char in return name of GetCurDir().

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

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 8faa54beee767fd8944df5b4036dffea890ec109..5cfbc9064f8318670fe7c16807ccb65c15577769 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -2,7 +2,7 @@
   Main file for cp shell level 2 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
   Main file for cp shell level 2 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2015, 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
   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


@@ -360,7 +360,7 @@ ValidateAndCopyFiles(
 \r
     NewSize =  StrSize(CleanFilePathStr);\r
     NewSize += StrSize(Node->FullName);\r
 \r
     NewSize =  StrSize(CleanFilePathStr);\r
     NewSize += StrSize(Node->FullName);\r

-    NewSize += (Cwd == NULL)? 0 : StrSize(Cwd);\r
+    NewSize += (Cwd == NULL)? 0 : (StrSize(Cwd) + sizeof(CHAR16));\r

     if (NewSize > PathSize) {\r
       PathSize = NewSize;\r
     }\r
     if (NewSize > PathSize) {\r
       PathSize = NewSize;\r
     }\r


@@ -427,20 +427,21 @@ ValidateAndCopyFiles(
         // simple copy of a single file\r
         //\r
         if (Cwd != NULL) {\r
         // simple copy of a single file\r
         //\r
         if (Cwd != NULL) {\r

-          StrnCpy(DestPath, Cwd, PathSize/sizeof(CHAR16)-1);\r
+          StrCpyS(DestPath, PathSize / sizeof(CHAR16), Cwd);\r
+          StrCatS(DestPath, PathSize / sizeof(CHAR16), L"\\");\r

         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  \r
           FreePool (CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         if (DestPath[StrLen(DestPath)-1] != L'\\' && CleanFilePathStr[0] != L'\\') {\r
         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  \r
           FreePool (CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         if (DestPath[StrLen(DestPath)-1] != L'\\' && CleanFilePathStr[0] != L'\\') {\r

-          StrnCat(DestPath, L"\\", PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+          StrCatS(DestPath, PathSize / sizeof(CHAR16), L"\\");\r

         } else if (DestPath[StrLen(DestPath)-1] == L'\\' && CleanFilePathStr[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r
         } else if (DestPath[StrLen(DestPath)-1] == L'\\' && CleanFilePathStr[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r

-        StrnCat(DestPath, CleanFilePathStr, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), CleanFilePathStr);\r

       } else {\r
       } else {\r

-        StrnCpy(DestPath, CleanFilePathStr, PathSize/sizeof(CHAR16) -1);\r
+        StrCpyS(DestPath, PathSize/sizeof(CHAR16), CleanFilePathStr);\r

       }\r
     } else {\r
       //\r
       }\r
     } else {\r
       //\r


@@ -455,44 +456,46 @@ ValidateAndCopyFiles(
          // Copy to the root of CWD\r
          //\r
         if (Cwd != NULL) {\r
          // Copy to the root of CWD\r
          //\r
         if (Cwd != NULL) {\r

-          StrnCpy(DestPath, Cwd, PathSize/sizeof(CHAR16) -1);\r
+          StrCpyS(DestPath, PathSize/sizeof(CHAR16), Cwd);\r
+          StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");\r

         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp",  CleanFilePathStr); \r
           FreePool(CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         while (PathRemoveLastItem(DestPath));\r
         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp",  CleanFilePathStr); \r
           FreePool(CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         while (PathRemoveLastItem(DestPath));\r

-        StrnCat(DestPath, CleanFilePathStr+1, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
-        StrnCat(DestPath, Node->FileName, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), CleanFilePathStr+1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), Node->FileName);\r

       } else if (StrStr(CleanFilePathStr, L":") == NULL) {\r
         if (Cwd != NULL) {\r
       } else if (StrStr(CleanFilePathStr, L":") == NULL) {\r
         if (Cwd != NULL) {\r

-          StrnCpy(DestPath, Cwd, PathSize/sizeof(CHAR16) -1);\r
+          StrCpyS(DestPath, PathSize/sizeof(CHAR16), Cwd);\r
+          StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");\r

         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  \r
           FreePool(CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         if (DestPath[StrLen(DestPath)-1] != L'\\' && CleanFilePathStr[0] != L'\\') {\r
         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_DIR_NF), gShellLevel2HiiHandle, L"cp", CleanFilePathStr);  \r
           FreePool(CleanFilePathStr);\r
           return (SHELL_INVALID_PARAMETER);\r
         }\r
         if (DestPath[StrLen(DestPath)-1] != L'\\' && CleanFilePathStr[0] != L'\\') {\r

-          StrnCat(DestPath, L"\\", PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+          StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");\r

         } else if (DestPath[StrLen(DestPath)-1] == L'\\' && CleanFilePathStr[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r
         } else if (DestPath[StrLen(DestPath)-1] == L'\\' && CleanFilePathStr[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r

-        StrnCat(DestPath, CleanFilePathStr, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), CleanFilePathStr);\r

         if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] != L'\\' && Node->FileName[0] != L'\\') {\r
         if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] != L'\\' && Node->FileName[0] != L'\\') {\r

-          StrnCat(DestPath, L"\\", PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+          StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");\r

         } else if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] == L'\\' && Node->FileName[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r
         } else if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] == L'\\' && Node->FileName[0] == L'\\') {\r
           ((CHAR16*)DestPath)[StrLen(DestPath)-1] = CHAR_NULL;\r
         }\r

-        StrnCat(DestPath, Node->FileName, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), Node->FileName);\r

 \r
       } else {\r
 \r
       } else {\r

-        StrnCpy(DestPath, CleanFilePathStr, PathSize/sizeof(CHAR16) -1);\r
+        StrCpyS(DestPath, PathSize/sizeof(CHAR16), CleanFilePathStr);\r

         if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] != L'\\' && Node->FileName[0] != L'\\') {\r
         if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] != L'\\' && Node->FileName[0] != L'\\') {\r

-          StrnCat(DestPath, L"\\", PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+          StrCatS(DestPath, PathSize/sizeof(CHAR16), L"\\");\r

         } else if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] == L'\\' && Node->FileName[0] == L'\\') {\r
           ((CHAR16*)CleanFilePathStr)[StrLen(CleanFilePathStr)-1] = CHAR_NULL;\r
         }\r
         } else if (CleanFilePathStr[StrLen(CleanFilePathStr)-1] == L'\\' && Node->FileName[0] == L'\\') {\r
           ((CHAR16*)CleanFilePathStr)[StrLen(CleanFilePathStr)-1] = CHAR_NULL;\r
         }\r

-        StrnCat(DestPath, Node->FileName, PathSize/sizeof(CHAR16) - StrLen(DestPath) -1);\r
+        StrCatS(DestPath, PathSize/sizeof(CHAR16), Node->FileName);\r

       }\r
     }\r
     \r
       }\r
     }\r
     \r


@@ -644,6 +647,7 @@ ShellCommandRunCp (
   BOOLEAN             SilentMode;\r
   BOOLEAN             RecursiveMode;\r
   CONST CHAR16        *Cwd;\r
   BOOLEAN             SilentMode;\r
   BOOLEAN             RecursiveMode;\r
   CONST CHAR16        *Cwd;\r

+  CHAR16              *FullCwd;\r

 \r
   ProblemParam        = NULL;\r
   ShellStatus         = SHELL_SUCCESS;\r
 \r
   ProblemParam        = NULL;\r
   ShellStatus         = SHELL_SUCCESS;\r


@@ -712,7 +716,11 @@ ShellCommandRunCp (
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, 1));  \r
             ShellStatus = SHELL_NOT_FOUND;\r
           } else  {\r
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_NF), gShellLevel2HiiHandle, L"cp", ShellCommandLineGetRawValue(Package, 1));  \r
             ShellStatus = SHELL_NOT_FOUND;\r
           } else  {\r

-            ShellStatus = ProcessValidateAndCopyFiles(FileList, Cwd, SilentMode, RecursiveMode);\r
+            FullCwd = AllocateZeroPool(StrSize(Cwd) + sizeof(CHAR16));\r
+            ASSERT (FullCwd != NULL);\r
+            StrCpyS(FullCwd, StrSize(Cwd)/sizeof(CHAR16)+1, Cwd);\r
+            ShellStatus = ProcessValidateAndCopyFiles(FileList, FullCwd, SilentMode, RecursiveMode);\r
+            FreePool(FullCwd);\r

           }\r
         }\r
 \r
           }\r
         }\r
 \r