Changeset 59146 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Dec 16, 2015 8:53:19 AM (9 years ago)

Author:

vboxsync

Message:

EFI: Updated HFS+ driver to support hard links.

Location:

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe

Files:

• fsw_efi.c (modified) (3 diffs)
• fsw_hfs.c (modified) (12 diffs)
• fsw_hfs.h (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c

@@ -1048 +1048 @@
     EFI_FILE_INFO       *FileInfo;
     UINTN               RequiredSize;
+    struct fsw_dnode    *target_dno;
     struct fsw_dnode_stat sb;
 
@@ -1072 +1073 @@
     ZeroMem(Buffer, RequiredSize);
     FileInfo = (EFI_FILE_INFO *)Buffer;
+
+    // must preserve the original file name
+    fsw_efi_strcpy(FileInfo->FileName, &dno->name);
+
+    // if the node is a symlink, also resolve it
+    Status = fsw_efi_map_status(fsw_dnode_resolve(dno, &target_dno), Volume);
+    fsw_dnode_release(dno);
+    if (EFI_ERROR(Status))
+        return Status;
+    dno = target_dno;
+    // make sure the dnode has complete info again
+    Status = fsw_efi_map_status(fsw_dnode_fill(dno), Volume);
+    if (EFI_ERROR(Status))
+        return Status;
+
     FileInfo->Size = RequiredSize;
     FileInfo->FileSize          = dno->size;
@@ -1077 +1093 @@
     if (dno->type == FSW_DNODE_TYPE_DIR)
         FileInfo->Attribute    |= EFI_FILE_DIRECTORY;
-    fsw_efi_strcpy(FileInfo->FileName, &dno->name);
 
     // get the missing info from the fs driver

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c

@@ -45 +45 @@
 #define BP(msg) DPRINT(msg)
 #else
+#include <Library/PrintLib.h>
 #define DPRINT(x) do { } while (0)
 #define DPRINT2(x,y) do { } while (0)
@@ -620 +621 @@
     return status;
 }
+
 typedef struct
 {
@@ -629 +631 @@
     fsw_u32                 ctime;
     fsw_u32                 mtime;
+    fsw_u32                 node_num;
     HFSPlusExtentRecord     extents;
 } file_info_t;
@@ -641 +644 @@
     file_info_t             file_info;
 } visitor_parameter_t;
+
+static void hfs_fill_info(struct fsw_hfs_volume *vol, HFSPlusCatalogKey *file_key, file_info_t *file_info)
+{
+    fsw_u8    * base;
+    fsw_u16     rec_type;
+
+    /* for plain HFS "-(keySize & 1)" would be needed */
+    base = (fsw_u8*)file_key + be16_to_cpu(file_key->keyLength) + 2;
+    rec_type =  be16_to_cpu(*(fsw_u16*)base);
+
+    /** @todo: read additional info */
+    switch (rec_type)
+    {
+        case kHFSPlusFolderRecord:
+        {
+            HFSPlusCatalogFolder* info = (HFSPlusCatalogFolder*)base;
+
+            file_info->id = be32_to_cpu(info->folderID);
+            file_info->type = FSW_DNODE_TYPE_DIR;
+            /* @todo: return number of elements, maybe use smth else */
+            file_info->size = be32_to_cpu(info->valence);
+            file_info->used = be32_to_cpu(info->valence);
+            file_info->ctime = be32_to_cpu(info->createDate);
+            file_info->mtime = be32_to_cpu(info->contentModDate);
+            break;
+        }
+        case kHFSPlusFileRecord:
+        {
+            HFSPlusCatalogFile* info = (HFSPlusCatalogFile*)base;
+            uint32_t    creator = be32_to_cpu(info->userInfo.fdCreator);
+            uint32_t    crtype  = be32_to_cpu(info->userInfo.fdType);
+
+            file_info->id = be32_to_cpu(info->fileID);
+            file_info->type = FSW_DNODE_TYPE_FILE;
+            file_info->size = be64_to_cpu(info->dataFork.logicalSize);
+            file_info->used = LShiftU64(be32_to_cpu(info->dataFork.totalBlocks), vol->block_size_shift);
+            file_info->ctime = be32_to_cpu(info->createDate);
+            file_info->mtime = be32_to_cpu(info->contentModDate);
+            fsw_memcpy(&file_info->extents, &info->dataFork.extents,
+                       sizeof file_info->extents);
+            if (creator == kHFSPlusCreator && crtype == kHardLinkFileType)
+            {
+                /* Only hard links currently supported. */
+                file_info->type     = FSW_DNODE_TYPE_SYMLINK;
+                file_info->node_num = be32_to_cpu(info->bsdInfo.special.iNodeNum);
+            }
+            break;
+        }
+        case kHFSPlusFolderThreadRecord:
+        case kHFSPlusFileThreadRecord:
+        {
+            /* Do nothing. */
+            break;
+        }
+        default:
+            BP("unknown file type\n");
+            file_info->type = FSW_DNODE_TYPE_UNKNOWN;
+
+            break;
+    }
+}
 
 static int
@@ -661 +725 @@
         return 0;
 
-    switch (rec_type)
-    {
-        case kHFSPlusFolderRecord:
-        {
-            HFSPlusCatalogFolder* folder_info = (HFSPlusCatalogFolder*)base;
-
-            vp->file_info.id = be32_to_cpu(folder_info->folderID);
-            vp->file_info.type = FSW_DNODE_TYPE_DIR;
-            vp->file_info.size = be32_to_cpu(folder_info->valence);
-            vp->file_info.used = be32_to_cpu(folder_info->valence);
-            vp->file_info.ctime = be32_to_cpu(folder_info->createDate);
-            vp->file_info.mtime = be32_to_cpu(folder_info->contentModDate);
-            break;
-        }
-        case kHFSPlusFileRecord:
-        {
-            HFSPlusCatalogFile* file_info = (HFSPlusCatalogFile*)base;
-
-            vp->file_info.id = be32_to_cpu(file_info->fileID);
-            vp->file_info.type = FSW_DNODE_TYPE_FILE;
-            vp->file_info.size = be64_to_cpu(file_info->dataFork.logicalSize);
-            vp->file_info.used = LShiftU64(be32_to_cpu(file_info->dataFork.totalBlocks),
-                                           vp->vol->block_size_shift);
-            vp->file_info.ctime = be32_to_cpu(file_info->createDate);
-            vp->file_info.mtime = be32_to_cpu(file_info->contentModDate);
-            fsw_memcpy(&vp->file_info.extents, &file_info->dataFork.extents,
-                       sizeof vp->file_info.extents);
-            break;
-        }
-        case kHFSPlusFolderThreadRecord:
-        case kHFSPlusFileThreadRecord:
-        {
-            vp->shandle->pos++;
-            return 0;
-        }
-        default:
-            BP("unknown file type\n");
-            vp->file_info.type = FSW_DNODE_TYPE_UNKNOWN;
-            break;
-    }
+    if (rec_type == kHFSPlusFolderThreadRecord || rec_type == kHFSPlusFileThreadRecord)
+    {
+        vp->shandle->pos++;
+        return 0;
+    }
+
+    hfs_fill_info(vp->vol, cat_key, &vp->file_info);
 
     name_len = be16_to_cpu(cat_key->nodeName.length);
@@ -1026 +1057 @@
     baby->ctime = file_info->ctime;
     baby->mtime = file_info->mtime;
+    baby->node_num = file_info->node_num;
 
 
@@ -1055 +1087 @@
     struct HFSPlusCatalogKey   catkey;
     fsw_u32                    ptr;
-    fsw_u16                    rec_type;
     BTNodeDescriptor *         node = NULL;
     struct fsw_string          rec_name;
@@ -1061 +1092 @@
     HFSPlusCatalogKey*         file_key;
     file_info_t                file_info;
-    fsw_u8*                    base;
 
 
@@ -1108 +1138 @@
 #endif
 
-    catkey.keyLength = (fsw_u16)(5 + rec_name.size);
+    catkey.keyLength = (fsw_u16)(6 + rec_name.len);
 
     status = fsw_hfs_btree_search (&vol->catalog_tree,
@@ -1119 +1149 @@
 
     file_key = (HFSPlusCatalogKey *)fsw_hfs_btree_rec (&vol->catalog_tree, node, ptr);
-    /* for plain HFS "-(keySize & 1)" would be needed */
-    base = (fsw_u8*)file_key + be16_to_cpu(file_key->keyLength) + 2;
-    rec_type =  be16_to_cpu(*(fsw_u16*)base);
-
-    /** @todo: read additional info */
-    switch (rec_type)
-    {
-        case kHFSPlusFolderRecord:
-        {
-            HFSPlusCatalogFolder* info = (HFSPlusCatalogFolder*)base;
-
-            file_info.id = be32_to_cpu(info->folderID);
-            file_info.type = FSW_DNODE_TYPE_DIR;
-            /* @todo: return number of elements, maybe use smth else */
-            file_info.size = be32_to_cpu(info->valence);
-            file_info.used = be32_to_cpu(info->valence);
-            file_info.ctime = be32_to_cpu(info->createDate);
-            file_info.mtime = be32_to_cpu(info->contentModDate);
-            break;
-        }
-        case kHFSPlusFileRecord:
-        {
-            HFSPlusCatalogFile* info = (HFSPlusCatalogFile*)base;
-
-            file_info.id = be32_to_cpu(info->fileID);
-            file_info.type = FSW_DNODE_TYPE_FILE;
-            file_info.size = be64_to_cpu(info->dataFork.logicalSize);
-            file_info.used = LShiftU64(be32_to_cpu(info->dataFork.totalBlocks), vol->block_size_shift);
-            file_info.ctime = be32_to_cpu(info->createDate);
-            file_info.mtime = be32_to_cpu(info->contentModDate);
-            fsw_memcpy(&file_info.extents, &info->dataFork.extents,
-                       sizeof file_info.extents);
-            break;
-        }
-        default:
-            BP("unknown file type\n");
-            file_info.type = FSW_DNODE_TYPE_UNKNOWN;
-
-            break;
-    }
+    hfs_fill_info(vol, file_key, &file_info);
+
 #ifdef HFS_FILE_INJECTION
 create:
@@ -1238 +1230 @@
 }
 
+static const char hfs_priv_prefix[] = "/\0\0\0\0HFS+ Private Data/" HFS_INODE_PREFIX;
+
 /**
  * Get the target path of a symbolic link. This function is called when a symbolic
@@ -1247 +1241 @@
                                      struct fsw_string *link_target)
 {
+    fsw_status_t    status;
+
+    if (dno->node_num)
+    {
+        struct fsw_string   tgt;
+
+        DPRINT2("hfs_readlink: %d\n", dno->node_num);
+        tgt.type = FSW_STRING_TYPE_ISO88591;
+        tgt.size = sizeof(hfs_priv_prefix) + 10;
+        tgt.len  = tgt.size - 1;
+        status = fsw_alloc(tgt.size, &tgt.data);
+        if (!status)
+        {
+            char *str = tgt.data;
+            fsw_memcpy(tgt.data, hfs_priv_prefix, sizeof(hfs_priv_prefix)); // null chars here!
+#ifdef HOST_POSIX
+            tgt.len = sprintf(&str[sizeof(hfs_priv_prefix) - 1], "%d", dno->node_num);
+#else
+            tgt.len = (int)AsciiSPrint(&str[sizeof(hfs_priv_prefix) - 1], tgt.len, "%d", dno->node_num);
+#endif
+            tgt.len += sizeof(hfs_priv_prefix) - 1;
+            status = fsw_strdup_coerce(link_target, vol->g.host_string_type, &tgt);
+            fsw_strfree(&tgt);
+        }
+        return status;
+    }
+
     return FSW_UNSUPPORTED;
 }

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h

@@ -89 +89 @@
   fsw_u32                   mtime;
   fsw_u64                   used_bytes;
+  fsw_u32                   node_num;
 };