Changeset 612 for trunk/kernel/syscalls/sys_readdir.c

Timestamp:

Jan 11, 2019, 6:35:07 PM (5 years ago)

Author:

alain

Message:

Fix several bugs in vfs.c, fatfs.c, and devfs.c to support
the <.> and <..> directory entries.

File:

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

trunk/kernel/syscalls/sys_readdir.c

@@ -30 +30 @@
 #include <vfs.h>
 #include <process.h>
-#include <remote_dir.h>
+#include <user_dir.h>
 #include <syscalls.h>
 #include <shared_syscalls.h>
@@ -40 +40 @@
     error_t         error;
     vseg_t        * vseg;               // for user space checking of buffer
-    xptr_t          dir_xp;             // extended pointer on remote_dir_t structure
-    remote_dir_t  * dir_ptr;            // local pointer on remote_dir_t structure
-    cxy_t           dir_cxy;            // remote_dir_t stucture cluster identifier
+    xptr_t          dir_xp;             // extended pointer on user_dir structure
+    user_dir_t    * dir_ptr;            // local pointer on user_dir structure
+    cxy_t           dir_cxy;            // user_dir stucture cluster identifier
     struct dirent * direntp;            // dirent pointer in user space  
     uint32_t        entries;            // total number of dirent entries
@@ -75 +75 @@
         }       
 
-    // get pointers on remote_dir_t structure from dirp
-    dir_xp  = remote_dir_from_ident( (intptr_t)dirp );
+    // get pointers on user_dir structure from dirp
+    dir_xp  = user_dir_from_ident( (intptr_t)dirp );
     dir_ptr = GET_PTR( dir_xp );
     dir_cxy = GET_CXY( dir_xp );
@@ -91 +91 @@
         }       
 
-    // get "current" and "entries_nr" values from remote_dir_t structure
+    // get "current" and "entries_nr" values from user_dir_t structure
     current = hal_remote_l32( XPTR( dir_cxy , &dir_ptr->current ) );
     entries = hal_remote_l32( XPTR( dir_cxy , &dir_ptr->entries ) );
@@ -114 +114 @@
     hal_copy_to_uspace( buffer, &direntp , sizeof(void *) );
 
-    // update current index in "remote_dir_t" structure
+    // update current index in user_dir structure
     hal_remote_atomic_add( XPTR( dir_cxy , &dir_ptr->current ) , 1 );