Changeset 656 for trunk/kernel/syscalls/sys_write.c

Timestamp:

Dec 6, 2019, 12:07:51 PM (5 years ago)

Author:

alain

Message:

Fix several bugs in the FATFS and in the VFS,
related to the creation of big files requiring
more than 4 Kbytes (one cluster) on device.

File:

• trunk/kernel/syscalls/sys_write.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_write.c

@@ -62 +62 @@
     cxy_t         file_cxy;        // remote file cluster identifier
     uint32_t      file_type;       // file type
-    uint32_t      file_offset;     // current file offset
-    uint32_t      file_attr;       // file_attribute
+    uint32_t      file_offset;     // file offset
+    uint32_t      file_attr;       // file attributes
     vfs_inode_t * inode_ptr;       // local pointer on associated inode
     uint32_t      nbytes;          // number of bytes actually written
@@ -138 +138 @@
     hal_enable_irq( &save_sr );
 
-    // action depend on file type
+    // action depend on file type:
+
     if( file_type == INODE_TYPE_FILE )  // write to a file mapper 
     {
@@ -159 +160 @@
                                 vaddr, 
                                 count );
-        if ( nbytes != count )
-        {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] cannot write %d bytes into file %d\n",
-__FUNCTION__ , process->pid, this->trdid, count, file_id );
-#endif
-            hal_restore_irq( save_sr );
-            this->errno = EIO;
-            return -1;
-
-        }
-
-        // update file size in inode descriptor
-        // only if (file_offset + count) > current_size
-        // note: the parent directory entry in mapper will
-        // be updated by the close syscall      
-        xptr_t inode_xp = XPTR( file_cxy , inode_ptr );
-        vfs_inode_update_size( inode_xp , file_offset + count );
     }
     else if( file_type == INODE_TYPE_DEV )  // write to TXT device
@@ -186 +168 @@
                                   vaddr,
                                   count );
-        if( nbytes != count )
-        {
+    }
+    else  // not FILE and not DEV
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : thread[%x,%x] / illegal inode type %\n",
+__FUNCTION__, vfs_inode_type_str( file_type ) );
+#endif
+        hal_restore_irq( save_sr );
+                this->errno = EBADFD;
+                return -1;
+    }
+
+    // chek error
+    if( nbytes == 0xFFFFFFFF )
+    {
 
 #if DEBUG_SYSCALLS_ERROR
@@ -193 +189 @@
 __FUNCTION__ , process->pid, this->trdid, file_id );
 #endif
-            hal_restore_irq( save_sr );
-            this->errno = EIO;
-            return -1;
-        }
-    }
-    else  // not FILE and not DEV
-    {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] / illegal inode type %\n",
-__FUNCTION__, vfs_inode_type_str( file_type ) );
-#endif
         hal_restore_irq( save_sr );
-                this->errno = EBADFD;
-                return -1;
+        this->errno = EIO;
+        return -1;
     }