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

Timestamp:

Dec 6, 2019, 12:07:51 PM (4 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_display.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_display.c

@@ -300 +300 @@
             xptr_t        mapper_xp;
             mapper_t    * mapper_ptr;
+            xptr_t        page_xp;
 
             char          kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
@@ -315 +316 @@
  __FUNCTION__ );
 #endif
-                this->errno = ENFILE;
-                return -1;
-            }
-
+                this->errno = EINVAL;
+                return -1;
+            }
+
+            // check nbytes
+            if( nbytes >= 4096 )
+            {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s for MAPPER : nbytes cannot be larger than 4096\n",
+ __FUNCTION__ );
+#endif
+                this->errno = EINVAL;
+                return -1;
+            }
+            
             // copy pathname in kernel space
             hal_strcpy_from_uspace( XPTR( local_cxy , kbuf ),
@@ -366 +379 @@
             mapper_xp  = XPTR( inode_cxy , mapper_ptr );
 
-            // display mapper
-            error = mapper_display_page( mapper_xp , page_id , nbytes );
-
-            if( error )
+            // get extended pointer on target page
+            page_xp = mapper_remote_get_page( mapper_xp , page_id );
+
+            if( page_xp == XPTR_NULL )
                 {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s for MAPPER : cannot display page %d\n",
+printk("\n[ERROR] in %s for MAPPER : cannot get page %d\n",
 __FUNCTION__ , page_id );
 #endif
@@ -379 +392 @@
                         return -1;
                 }
+
+            // display mapper
+            mapper_display_page( mapper_xp , page_xp , nbytes );
+
 
             break;
@@ -463 +480 @@
                 uint32_t page = (uint32_t)arg0;
 
-                fatfs_display_fat( page , entries );
+                fatfs_display_fat( page , 0 , entries );
             }