Changeset 1911

Timestamp:

02/24/09 20:55:43 (3 years ago)

Author:

mwhitworth

Message:

Fix bug involving incorrect root directory pointer on FAT32 (i.e. parent pointer should be zero rather than the true root dir start).

Files:

• Whitix/trunk/fs/fat/vnode.c (modified) (2 diffs)

Whitix/trunk/fs/fat/vnode.c

@@ -215 +215 @@
                 
         /* Is the root directory then */
-        if (!startCluster || ( (info->fatType == 32) && (info->rootDirStart == startCluster) ))
+        if (!startCluster)
                 return FAT_ROOT_ID;
 
@@ -710 +710 @@
 
         dirEntry=(struct FatDirEntry*)(buffer->data+FAT_DIR_POS(VNUM_TO_OFFSET(vNum)));
-        dirEntry->startClusterHigh=FatGetPriv(dir)->startCluster >> 16;
-        dirEntry->startClusterLow=FatGetPriv(dir)->startCluster & 0xFFFF;
+        
+        if (dir->id != FAT_ROOT_ID)
+        {
+                dirEntry->startClusterHigh=FatGetPriv(dir)->startCluster >> 16;
+                dirEntry->startClusterLow=FatGetPriv(dir)->startCluster & 0xFFFF;
+        }else{
+                /* If the parent is the root directory, the start cluster should
+                 * always point to 0, even on FAT32, where the root directory has its
+                 * own start cluster.
+                 */
+                dirEntry->startClusterHigh = 0;
+                dirEntry->startClusterLow = 0;
+        }
+        
         dirEntry->fileSize=0;