ArmPlatformPkg/BootMonFs: eliminate deprecated string functions

[mirror_edk2.git] / ArmPlatformPkg / FileSystem / BootMonFs / BootMonFsDir.c

diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsDir.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsDir.c
index 450a707f183c8c6fd1b4d6436e1d5f812b87a5c7..64ea0ec68048d677ff25e21ea3290428c64f9f4e 100644 (file)
--- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsDir.c
+++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsDir.c
@@ -304,7 +304,6 @@ SetFileName (
   IN  CONST CHAR16         *FileName\r
   )\r
 {\r
-  CHAR16           TruncFileName[MAX_NAME_LENGTH];\r
   CHAR8            AsciiFileName[MAX_NAME_LENGTH];\r
   BOOTMON_FS_FILE  *SameFile;\r
 \r
@@ -314,9 +313,7 @@ SetFileName (
     FileName++;\r
   }\r
 \r
-  StrnCpy (TruncFileName, FileName, MAX_NAME_LENGTH - 1);\r
-  TruncFileName[MAX_NAME_LENGTH - 1] = 0;\r
-  UnicodeStrToAsciiStr (TruncFileName, AsciiFileName);\r
+  UnicodeStrToAsciiStrS (FileName, AsciiFileName, MAX_NAME_LENGTH);\r
 \r
   if (BootMonGetFileFromAsciiFileName (\r
         File->Instance,\r
@@ -327,7 +324,8 @@ SetFileName (
     return EFI_ACCESS_DENIED;\r
   } else {\r
     // OK, change the filename.\r
-    AsciiStrToUnicodeStr (AsciiFileName, File->Info->FileName);\r
+    AsciiStrToUnicodeStrS (AsciiFileName, File->Info->FileName,\r
+      (File->Info->Size - SIZE_OF_EFI_FILE_INFO) / sizeof (CHAR16));\r
     return EFI_SUCCESS;\r
   }\r
 }\r