Changeset 1229 for trunk/eraser6

Timestamp:

9/30/2009 4:52:22 AM (4 years ago)

Author:

lowjoel

Message:

-Fixed the calculation of cluster positions in FAT12 and FAT16 (used sectors per cluster instead of sector size)
-Standardise the input of the DirectoryToCluster? function, volume root is "", subfolder level 1 is "\Subfolder" so process the input string properly
-Fixed multi-level path parsing (index-off-by-one)
-Apparently, in the directory list certain LFNs may be interrupted by deleted entries, handle those.
-Fixed directory corruption when clearing deleted entries -- insufficient data was coped (I used the wrong sizeof operator -- it was using the old type which was changed earlier)

Location:

trunk/eraser6/Eraser.Util.FileSystem

Files:

• Fat12Or16Api.cpp (modified) (5 diffs)
• Fat32Api.cpp (modified) (2 diffs)
• FatApi.cpp (modified) (7 diffs)

trunk/eraser6/Eraser.Util.FileSystem/Fat12Or16Api.cpp

@@ -66 +66 @@
     long long Fat12Or16Api::ClusterToOffset(unsigned cluster)
     {
-        unsigned long long sector = BootSector->ReservedSectorCount +                                           //Reserved area
-            BootSector->FatCount * BootSector->SectorsPerFat +                                                  //FAT area
-            (BootSector->RootDirectoryEntryCount * sizeof(::FatDirectoryEntry) / (ClusterSize / SectorSize)) +  //Root directory area
+        unsigned long long sector = BootSector->ReservedSectorCount +                           //Reserved area
+            BootSector->FatCount * BootSector->SectorsPerFat +                                  //FAT area
+            (BootSector->RootDirectoryEntryCount * sizeof(::FatDirectoryEntry) / SectorSize) +  //Root directory area
             (static_cast<unsigned long long>(cluster) - 2) * (ClusterSize / SectorSize);
         return SectorToOffset(sector);
@@ -76 +76 @@
     {
         //The path must start with a backslash as it must be volume-relative.
-        if (path->Length != 0 && path[0] != L'\\')
-            throw gcnew ArgumentException(L"The path provided is not volume relative. " +
-                gcnew String(L"Volume relative paths must begin with a backslash."));
+        if (path->Length != 0)
+        {
+            if (path[0] != L'\\')
+                throw gcnew ArgumentException(L"The path provided is not volume relative. " +
+                    gcnew String(L"Volume relative paths must begin with a backslash."));
+            path = path->Remove(0, 1);
+        }
 
         //Chop the path into it's constituent directory components
@@ -86 +90 @@
         //Traverse the directories until we get the cluster we want.
         unsigned cluster = 0;
-        FatDirectoryBase^ parentDir = gcnew RootDirectory(this);
+        FatDirectoryBase^ parentDir = nullptr;
         for each (String^ component in components)
         {
@@ -92 +96 @@
                 break;
 
-            parentDir = LoadDirectory(cluster, parentDir == nullptr ? nullptr : parentDir->Name,
+            parentDir = LoadDirectory(cluster, parentDir == nullptr ? String::Empty : parentDir->Name,
                 parentDir);
             cluster = parentDir->Items[component]->Cluster;
@@ -105 +109 @@
             BootSector->SectorCount32 : BootSector->SectorCount16);
         unsigned long long availableSectors = numberOfSectors - (
-            BootSector->ReservedSectorCount +                                                                   //Reserved area
-            BootSector->FatCount * BootSector->SectorsPerFat +                                                  //FAT area
-            (BootSector->RootDirectoryEntryCount * sizeof(::FatDirectoryEntry) / (ClusterSize / SectorSize))    //Root directory area
+            BootSector->ReservedSectorCount +                                                   //Reserved area
+            BootSector->FatCount * BootSector->SectorsPerFat +                                  //FAT area
+            (BootSector->RootDirectoryEntryCount * sizeof(::FatDirectoryEntry) / SectorSize)    //Root directory area
         );
         unsigned long long numberOfClusters = availableSectors / (ClusterSize / SectorSize);

trunk/eraser6/Eraser.Util.FileSystem/Fat32Api.cpp

@@ -114 +114 @@
     {
         //The path must start with a backslash as it must be volume-relative.
-        if (path->Length != 0 && path[0] != L'\\')
-            throw gcnew ArgumentException(L"The path provided is not volume relative. " +
-                gcnew String(L"Volume relative paths must begin with a backslash."));
+        if (path->Length != 0)
+        {
+            if (path[0] != L'\\')
+                throw gcnew ArgumentException(L"The path provided is not volume relative. " +
+                    gcnew String(L"Volume relative paths must begin with a backslash."));
+            path = path->Remove(0, 1);
+        }
 
         //Chop the path into it's constituent directory components
@@ -130 +134 @@
                 break;
 
-            parentDir = LoadDirectory(cluster, parentDir == nullptr ? nullptr : parentDir->Name,
+            parentDir = LoadDirectory(cluster, parentDir == nullptr ? String::Empty : parentDir->Name,
                 parentDir);
             cluster = parentDir->Items[component]->Cluster;

trunk/eraser6/Eraser.Util.FileSystem/FatApi.cpp

@@ -84 +84 @@
         int lastIndex = directory->LastIndexOfAny(pathSeparators);
         return LoadDirectory(DirectoryToCluster(directory), directory->Substring(lastIndex + 1),
-            LoadDirectory(directory->Substring(0, lastIndex == 0 ? 0 : lastIndex - 1)));
+            LoadDirectory(directory->Substring(0, lastIndex)));
     }
 
@@ -200 +200 @@
                 for (unsigned char sequence = 0; i->Short.Attributes == 0x0F; ++i)
                 {
-                    if (!(i->LongFileName.Sequence & 0x40)) //Second entry onwards
+                    if (static_cast<unsigned char>(i->Short.Name[0]) == 0xE5)
+                        continue;
+                    else if (!(i->LongFileName.Sequence & 0x40)) //Second entry onwards
                     {
                         //Check that the checksum of the file name is the same as the previous
@@ -226 +228 @@
                     validEntries.insert(validEntries.end(), longFileNameBegin, i);
                 }
+                else
+                {
+                    --i;
+                    continue;
+                }
             }
 
@@ -234 +241 @@
         //the memory used.
         memset(Directory, 0, DirectorySize * sizeof(::FatDirectoryEntry));
-        memcpy(Directory, &validEntries.front(), validEntries.size() * sizeof(::FatDirectory));
+        memcpy(Directory, &validEntries.front(), validEntries.size() * sizeof(::FatDirectoryEntry));
 
         //Write the entries to disk
@@ -262 +269 @@
                 for (unsigned char sequence = 0; i->Short.Attributes == 0x0F; ++i)
                 {
-                    if (!(i->LongFileName.Sequence & 0x40)) //Second entry onwards
+                    if (static_cast<unsigned char>(i->Short.Name[0]) == 0xE5)
+                        continue;
+                    else if (!(i->LongFileName.Sequence & 0x40)) //Second entry onwards
                     {
                         //Check that the checksum of the file name is the same as the previous
@@ -273 +282 @@
                             throw gcnew ArgumentException(L"Invalid directory entry.");
                     }
+                    else
+                        longFileName.clear();
                     
                     sequence = i->LongFileName.Sequence & ~0x40;
@@ -297 +308 @@
                             FatDirectoryEntryTypes::Directory : FatDirectoryEntryTypes::File,
                         GetStartCluster(*i)));
+                }
+                else
+                {
+                    --i;
+                    continue;
                 }
             }