MdeModulePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / UdfDxe / File.c

diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/File.c b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
index 0730e6a3fa9caced9ef605a596c4670b9e14d2bf..4ad7bb93da4a3458512a455f38b9221be54a3157 100644 (file)
--- a/MdeModulePkg/Universal/Disk/UdfDxe/File.c
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/File.c
@@ -2,14 +2,9 @@
   Handle operations in files and directories from UDF/ECMA-167 file systems.\r
 \r
   Copyright (C) 2014-2017 Paulo Alcantara <pcacjr@zytor.com>\r
+  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials are licensed and made available\r
-  under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT\r
-  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
 #include "Udf.h"\r
@@ -248,7 +243,7 @@ UdfOpen (
     FileName = TempFileName + 1;\r
   }\r
 \r
-  StrCpyS (NewPrivFileData->FileName, UDF_PATH_LENGTH, FileName);\r
+  StrCpyS (NewPrivFileData->FileName, UDF_FILENAME_LENGTH, FileName);\r
 \r
   Status = GetFileSize (\r
     PrivFsData->BlockIo,\r
@@ -457,7 +452,7 @@ UdfRead (
       FreePool ((VOID *)NewFileEntryData);\r
       NewFileEntryData = FoundFile.FileEntry;\r
 \r
-      Status = GetFileNameFromFid (NewFileIdentifierDesc, FileName);\r
+      Status = GetFileNameFromFid (NewFileIdentifierDesc, ARRAY_SIZE (FileName), FileName);\r
       if (EFI_ERROR (Status)) {\r
         FreePool ((VOID *)FoundFile.FileIdentifierDesc);\r
         goto Error_Get_FileName;\r
@@ -469,7 +464,7 @@ UdfRead (
       FoundFile.FileIdentifierDesc  = NewFileIdentifierDesc;\r
       FoundFile.FileEntry           = NewFileEntryData;\r
 \r
-      Status = GetFileNameFromFid (FoundFile.FileIdentifierDesc, FileName);\r
+      Status = GetFileNameFromFid (FoundFile.FileIdentifierDesc, ARRAY_SIZE (FileName), FileName);\r
       if (EFI_ERROR (Status)) {\r
         goto Error_Get_FileName;\r
       }\r
@@ -500,6 +495,10 @@ UdfRead (
     PrivFileData->FilePosition++;\r
     Status = EFI_SUCCESS;\r
   } else if (IS_FID_DELETED_FILE (Parent->FileIdentifierDesc)) {\r
+    //\r
+    // Code should never reach here.\r
+    //\r
+    ASSERT (FALSE);\r
     Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -717,7 +716,7 @@ UdfSetPosition (
     // set to the EOF.\r
     //\r
     if (Position == 0xFFFFFFFFFFFFFFFF) {\r
-      PrivFileData->FilePosition = PrivFileData->FileSize - 1;\r
+      PrivFileData->FilePosition = PrivFileData->FileSize;\r
     } else {\r
       PrivFileData->FilePosition = Position;\r
     }\r
@@ -757,19 +756,16 @@ UdfGetInfo (
   OUT     VOID               *Buffer\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  PRIVATE_UDF_FILE_DATA       *PrivFileData;\r
-  PRIVATE_UDF_SIMPLE_FS_DATA  *PrivFsData;\r
-  EFI_FILE_SYSTEM_INFO        *FileSystemInfo;\r
-  UINTN                       FileSystemInfoLength;\r
-  CHAR16                      *String;\r
-  UDF_FILE_SET_DESCRIPTOR     *FileSetDesc;\r
-  UINTN                       Index;\r
-  UINT8                       *OstaCompressed;\r
-  UINT8                       CompressionId;\r
-  UINT64                      VolumeSize;\r
-  UINT64                      FreeSpaceSize;\r
-  CHAR16                      VolumeLabel[64];\r
+  EFI_STATUS                    Status;\r
+  PRIVATE_UDF_FILE_DATA         *PrivFileData;\r
+  PRIVATE_UDF_SIMPLE_FS_DATA    *PrivFsData;\r
+  EFI_FILE_SYSTEM_INFO          *FileSystemInfo;\r
+  UINTN                         FileSystemInfoLength;\r
+  UINT64                        VolumeSize;\r
+  UINT64                        FreeSpaceSize;\r
+  EFI_FILE_SYSTEM_VOLUME_LABEL  *FileSystemVolumeLabel;\r
+  UINTN                         FileSystemVolumeLabelLength;\r
+  CHAR16                        VolumeLabel[64];\r
 \r
   if (This == NULL || InformationType == NULL || BufferSize == NULL ||\r
       (*BufferSize != 0 && Buffer == NULL)) {\r
@@ -791,43 +787,11 @@ UdfGetInfo (
       Buffer\r
       );\r
   } else if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid)) {\r
-    String = VolumeLabel;\r
-\r
-    FileSetDesc = &PrivFsData->Volume.FileSetDesc;\r
-\r
-    OstaCompressed = &FileSetDesc->LogicalVolumeIdentifier[0];\r
-\r
-    CompressionId = OstaCompressed[0];\r
-    if (!IS_VALID_COMPRESSION_ID (CompressionId)) {\r
-      return EFI_VOLUME_CORRUPTED;\r
-    }\r
-\r
-    for (Index = 1; Index < 128; Index++) {\r
-      if (CompressionId == 16) {\r
-        *String = *(UINT8 *)(OstaCompressed + Index) << 8;\r
-        Index++;\r
-      } else {\r
-        *String = 0;\r
-      }\r
-\r
-      if (Index < 128) {\r
-        *String |= (CHAR16)(*(UINT8 *)(OstaCompressed + Index));\r
-      }\r
-\r
-      //\r
-      // Unlike FID Identifiers, Logical Volume Identifier is stored in a\r
-      // NULL-terminated OSTA compressed format, so we must check for the NULL\r
-      // character.\r
-      //\r
-      if (*String == L'\0') {\r
-        break;\r
-      }\r
-\r
-      String++;\r
+    Status = GetVolumeLabel (&PrivFsData->Volume, ARRAY_SIZE (VolumeLabel), VolumeLabel);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
     }\r
 \r
-    *String = L'\0';\r
-\r
     FileSystemInfoLength = StrSize (VolumeLabel) +\r
                            sizeof (EFI_FILE_SYSTEM_INFO);\r
     if (*BufferSize < FileSystemInfoLength) {\r
@@ -836,8 +800,11 @@ UdfGetInfo (
     }\r
 \r
     FileSystemInfo = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
-    StrCpyS (FileSystemInfo->VolumeLabel, ARRAY_SIZE (VolumeLabel),\r
-             VolumeLabel);\r
+    StrCpyS (\r
+      FileSystemInfo->VolumeLabel,\r
+      (*BufferSize - SIZE_OF_EFI_FILE_SYSTEM_INFO) / sizeof (CHAR16),\r
+      VolumeLabel\r
+      );\r
     Status = GetVolumeSize (\r
       PrivFsData->BlockIo,\r
       PrivFsData->DiskIo,\r
@@ -858,6 +825,26 @@ UdfGetInfo (
 \r
     *BufferSize = FileSystemInfoLength;\r
     Status = EFI_SUCCESS;\r
+  } else if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
+    Status = GetVolumeLabel (&PrivFsData->Volume, ARRAY_SIZE (VolumeLabel), VolumeLabel);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+\r
+    FileSystemVolumeLabelLength = StrSize (VolumeLabel) +\r
+                                  sizeof (EFI_FILE_SYSTEM_VOLUME_LABEL);\r
+    if (*BufferSize < FileSystemVolumeLabelLength) {\r
+      *BufferSize = FileSystemVolumeLabelLength;\r
+      return EFI_BUFFER_TOO_SMALL;\r
+    }\r
+\r
+    FileSystemVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL *)Buffer;\r
+    StrCpyS (\r
+      FileSystemVolumeLabel->VolumeLabel,\r
+      (*BufferSize - SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL) / sizeof (CHAR16),\r
+      VolumeLabel\r
+      );\r
+    Status = EFI_SUCCESS;\r
   }\r
 \r
   return Status;\r