Modules/FAT - Fixed write support

[tpg/acess2.git] / KernelLand / Modules / Filesystems / FAT / fat.c

diff --git a/KernelLand/Modules/Filesystems/FAT/fat.c b/KernelLand/Modules/Filesystems/FAT/fat.c
index f7dd8c5..bb90c3c 100644 (file)
--- a/KernelLand/Modules/Filesystems/FAT/fat.c
+++ b/KernelLand/Modules/Filesystems/FAT/fat.c
@@ -17,7 +17,7 @@
  * \todo Implement changing of the parent directory when a file is written to\r
  * \todo Implement file creation / deletion\r
  */\r
-#define DEBUG  0\r
+#define DEBUG  1\r
 #define VERBOSE        1\r
 \r
 #include <acess.h>\r
@@ -483,9 +483,12 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
         int    remLength = Length;\r
        Uint32  cluster, tmpCluster;\r
         int    bNewCluster = 0;\r
+       off_t   original_offset = Offset;\r
        \r
        if(Offset > Node->Size) return 0;\r
        \r
+       ENTER("pNode Xoffset xlength pbuffer", Node, Offset, Length, Buffer);\r
+       \r
        // Seek Clusters\r
        cluster = Node->Inode & 0xFFFFFFFF;\r
        while( Offset > disk->BytesPerCluster )\r
@@ -493,6 +496,7 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
                cluster = FAT_int_GetFatValue( disk, cluster );\r
                if(cluster == -1) {\r
                        Log_Warning("FAT", "EOC Unexpectedly Reached");\r
+                       LEAVE('i', 0);\r
                        return 0;\r
                }\r
                Offset -= disk->BytesPerCluster;\r
@@ -500,7 +504,10 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
        if( Offset == disk->BytesPerCluster )\r
        {\r
                Uint32  tmp = FAT_int_AllocateCluster(disk, cluster);\r
-               if(!tmp)        return 0;\r
+               if(!tmp) {\r
+                       LEAVE('i', 0);\r
+                       return 0;\r
+               }\r
                cluster = tmp;\r
                Offset -= disk->BytesPerCluster;\r
        }\r
@@ -509,17 +516,20 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
        {\r
                char    tmpBuf[disk->BytesPerCluster];\r
                \r
+               LOG("Read-Modify-Write single");\r
+               \r
                // Read-Modify-Write\r
                FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
                memcpy( tmpBuf + Offset, Buffer, Length );\r
                FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
-               \r
-               return Length;\r
+               goto return_full;\r
        }\r
        \r
        // Clean up changes within a cluster\r
        if( Offset )\r
        {       \r
+               LOG("Read-Modify-Write first");\r
+\r
                // Read-Modify-Write\r
                FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
                memcpy( tmpBuf + Offset, Buffer, disk->BytesPerCluster - Offset );\r
@@ -532,9 +542,8 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
                tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
                if(tmpCluster == -1) {\r
                        tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
-                       if( tmpCluster == 0 ) {\r
-                               return Length - remLength;\r
-                       }\r
+                       if( tmpCluster == 0 )\r
+                               goto ret_incomplete;\r
                }\r
                cluster = tmpCluster;\r
        }\r
@@ -543,28 +552,47 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
        {\r
                FAT_int_WriteCluster( disk, cluster, Buffer );\r
                Buffer += disk->BytesPerCluster;\r
+               remLength -= disk->BytesPerCluster;\r
                \r
                // Get next cluster (allocating if needed)\r
                tmpCluster = FAT_int_GetFatValue(disk, cluster);\r
                if(tmpCluster == -1) {\r
                        bNewCluster = 1;\r
                        tmpCluster = FAT_int_AllocateCluster(disk, cluster);\r
-                       if( tmpCluster == 0 ) {\r
-                               return Length - remLength;\r
-                       }\r
+                       if( tmpCluster == 0 )\r
+                               goto ret_incomplete;\r
                }\r
                cluster = tmpCluster;\r
        }\r
        \r
        // Finish off\r
-       if( bNewCluster )\r
-               memset(tmpBuf, 0, disk->BytesPerCluster);\r
-       else\r
-               FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
-       memcpy( tmpBuf, Buffer, remLength );\r
-       FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
-       free( tmpBuf );\r
-       \r
+       if( remLength )\r
+       {\r
+               if( bNewCluster )\r
+                       memset(tmpBuf, 0, disk->BytesPerCluster);\r
+               else\r
+                       FAT_int_ReadCluster( disk, cluster, disk->BytesPerCluster, tmpBuf );\r
+               memcpy( tmpBuf, Buffer, remLength );\r
+               FAT_int_WriteCluster( disk, cluster, tmpBuf );\r
+       }\r
+\r
+return_full:\r
+       if( original_offset + Length > Node->Size ) {\r
+               Node->Size = original_offset + Length;\r
+               LOG("Updated size to %x", Node->Size);\r
+               Node->ImplInt |= FAT_FLAG_DIRTY;\r
+       }\r
+\r
+       LEAVE('i', Length);\r
+       return Length;\r
+ret_incomplete:\r
+       LOG("Write incomplete");\r
+       Length -= remLength;\r
+       if( original_offset + Length > Node->Size ) {\r
+               Node->Size = original_offset + Length;  \r
+               Node->ImplInt |= FAT_FLAG_DIRTY;\r
+       }\r
+       LEAVE('i', Length);\r
        return Length;\r
 }\r
 #endif\r
@@ -577,7 +605,9 @@ void FAT_CloseFile(tVFS_Node *Node)
 {\r
        tFAT_VolInfo    *disk = Node->ImplPtr;\r
        if(Node == NULL)        return ;\r
-       \r
+\r
+       ENTER("pNode", Node);   \r
+\r
        #if SUPPORT_WRITE\r
        // Update the node if it's dirty (don't bother if it's marked for\r
        // deletion)\r
@@ -589,6 +619,7 @@ void FAT_CloseFile(tVFS_Node *Node)
                dirnode = FAT_int_CreateIncompleteDirNode(disk, Node->Inode >> 32);\r
                if( !dirnode ) {\r
                        Log_Error("FAT", "Can't get node for directory cluster #0x%x", Node->Inode>>32);\r
+                       LEAVE('-');\r
                        return ;\r
                }\r
 \r
@@ -619,4 +650,5 @@ void FAT_CloseFile(tVFS_Node *Node)
                }\r
        }\r
        #endif\r
+       LEAVE('-');\r
 }\r