ArmPlatformPkg/BootMonFs: eliminate deprecated string functions

Get rid of functions that are no longer available when defining
DISABLE_NEW_DEPRECATED_INTERFACES

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

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
   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
   CHAR8            AsciiFileName[MAX_NAME_LENGTH];\r
   BOOTMON_FS_FILE  *SameFile;\r
 \r


@@ -314,9 +313,7 @@ SetFileName (
     FileName++;\r
   }\r
 \r
     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
 \r
   if (BootMonGetFileFromAsciiFileName (\r
         File->Instance,\r


@@ -327,7 +324,8 @@ SetFileName (
     return EFI_ACCESS_DENIED;\r
   } else {\r
     // OK, change the filename.\r
     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
     return EFI_SUCCESS;\r
   }\r
 }\r

diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
index 3d71760fef9913aad15a1b8ec5f9e2649d16cffd..a1150856f6ba5eee61b0cee76e0e672ae823d020 100644 (file)
--- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
+++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
@@ -98,7 +98,8 @@ BootMonGetFileFromAsciiFileName (
   {\r
     FileEntry = BOOTMON_FS_FILE_FROM_LINK_THIS (Entry);\r
     if (FileEntry->Info != NULL) {\r
   {\r
     FileEntry = BOOTMON_FS_FILE_FROM_LINK_THIS (Entry);\r
     if (FileEntry->Info != NULL) {\r

-      UnicodeStrToAsciiStr (FileEntry->Info->FileName, OpenFileAsciiFileName);\r
+      UnicodeStrToAsciiStrS (FileEntry->Info->FileName, OpenFileAsciiFileName,\r
+        MAX_NAME_LENGTH);\r

       AsciiFileNameToCompare = OpenFileAsciiFileName;\r
     } else {\r
       AsciiFileNameToCompare = FileEntry->HwDescription.Footer.Filename;\r
       AsciiFileNameToCompare = OpenFileAsciiFileName;\r
     } else {\r
       AsciiFileNameToCompare = FileEntry->HwDescription.Footer.Filename;\r

diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c
index af2fe514f0440221d1ff710d58fe08b904ae8e58..ae10055255ffbf2d50053a070c7e8dc2044612ea 100644 (file)
--- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c
+++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsOpenClose.c
@@ -101,7 +101,8 @@ WriteFileDescription (
   Description->Attributes = 1;\r
   Description->BlockStart = FileStart / BlockSize;\r
   Description->BlockEnd   = Description->BlockStart + (FileSize / BlockSize);\r
   Description->Attributes = 1;\r
   Description->BlockStart = FileStart / BlockSize;\r
   Description->BlockEnd   = Description->BlockStart + (FileSize / BlockSize);\r

-  AsciiStrCpy (Description->Footer.Filename, FileName);\r
+  AsciiStrCpyS (Description->Footer.Filename,\r
+    sizeof Description->Footer.Filename, FileName);\r

 \r
 #ifdef MDE_CPU_ARM\r
   Description->Footer.Offset  = HW_IMAGE_FOOTER_OFFSET;\r
 \r
 #ifdef MDE_CPU_ARM\r
   Description->Footer.Offset  = HW_IMAGE_FOOTER_OFFSET;\r


@@ -294,7 +295,7 @@ BootMonFsFlushFile (
   DiskIo    = Instance->DiskIo;\r
   BlockSize = Media->BlockSize;\r
 \r
   DiskIo    = Instance->DiskIo;\r
   BlockSize = Media->BlockSize;\r
 \r

-  UnicodeStrToAsciiStr (Info->FileName, AsciiFileName);\r
+  UnicodeStrToAsciiStrS (Info->FileName, AsciiFileName, MAX_NAME_LENGTH);\r

 \r
   // If the file doesn't exist then find a space for it\r
   if (File->HwDescription.RegionCount == 0) {\r
 \r
   // If the file doesn't exist then find a space for it\r
   if (File->HwDescription.RegionCount == 0) {\r


@@ -513,6 +514,7 @@ BootMonFsOpenFile (
   CHAR16               *Separator;\r
   CHAR8                *AsciiFileName;\r
   EFI_FILE_INFO        *Info;\r
   CHAR16               *Separator;\r
   CHAR8                *AsciiFileName;\r
   EFI_FILE_INFO        *Info;\r

+  UINTN                AsciiFileNameSize;\r

 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -621,15 +623,16 @@ BootMonFsOpenFile (
   //\r
   // BootMonFs interface requires ASCII filenames\r
   //\r
   //\r
   // BootMonFs interface requires ASCII filenames\r
   //\r

-  AsciiFileName = AllocatePool (StrLen (Path) + 1);\r
+  AsciiFileNameSize = StrLen (Path) + 1;\r
+  if (AsciiFileNameSize > MAX_NAME_LENGTH) {\r
+    AsciiFileNameSize = MAX_NAME_LENGTH;\r
+  }\r
+  AsciiFileName = AllocatePool (AsciiFileNameSize);\r

   if (AsciiFileName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Error;\r
   }\r
   if (AsciiFileName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Error;\r
   }\r

-  UnicodeStrToAsciiStr (Path, AsciiFileName);\r
-  if (AsciiStrSize (AsciiFileName) > MAX_NAME_LENGTH) {\r
-   AsciiFileName[MAX_NAME_LENGTH - 1] = '\0';\r
-  }\r
+  UnicodeStrToAsciiStrS (Path, AsciiFileName, AsciiFileNameSize);\r

 \r
   if ((AsciiFileName[0] == '\0') ||\r
       (AsciiFileName[0] == '.' )    ) {\r
 \r
   if ((AsciiFileName[0] == '\0') ||\r
       (AsciiFileName[0] == '.' )    ) {\r


@@ -688,7 +691,7 @@ BootMonFsOpenFile (
 \r
     Info->FileSize     = BootMonFsGetImageLength (File);\r
     Info->PhysicalSize = BootMonFsGetPhysicalSize (File);\r
 \r
     Info->FileSize     = BootMonFsGetImageLength (File);\r
     Info->PhysicalSize = BootMonFsGetPhysicalSize (File);\r

-    AsciiStrToUnicodeStr (AsciiFileName, Info->FileName);\r
+    AsciiStrToUnicodeStrS (AsciiFileName, Info->FileName, MAX_NAME_LENGTH);\r

 \r
     File->Info = Info;\r
     Info = NULL;\r
 \r
     File->Info = Info;\r
     Info = NULL;\r