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

Timestamp:

Jan 11, 2019, 6:35:07 PM (6 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_opendir.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_opendir.c

@@ -1 +1 @@
 /*
- * sys_opendir.c - Open a VFS directory.
+ * sys_opendir.c - Open an user accessible VFS directory.
  * 
  * Author        Alain Greiner (2016,2017,2018)
@@ -27 +27 @@
 #include <thread.h>
 #include <process.h>
-#include <remote_dir.h>
+#include <user_dir.h>
 #include <printk.h>
 #include <errno.h>
@@ -45 +45 @@
     cxy_t          inode_cxy;              // directory inode cluster
     uint32_t       inode_type;             // to check directory inode type
-    xptr_t         dir_xp;                 // extended pointer on remote_dir_t
-    remote_dir_t * dir_ptr;                // local pointer on remote_dir_t
-    cxy_t          dir_cxy;                // remote_dir_t cluster identifier
+    user_dir_t   * dir_ptr;                // local pointer on user_dir_t
     vseg_t       * vseg;                   // for user space checking
     intptr_t       ident;                  // dirent array pointer in user space                  
@@ -145 +143 @@
         }
    
-    // allocate, initialize, and register a new remote_dir_t structure
-    // in the calling process reference cluster
-    dir_xp  = remote_dir_create( inode_xp );
-    dir_ptr = GET_PTR( dir_xp );
-    dir_cxy = GET_CXY( dir_xp );
+    // create a new user_dir_t structure in inode cluster 
+    // and get the user space pointer on dirent array
+    if( inode_cxy == local_cxy )
+    {
+        dir_ptr = user_dir_create( inode_ptr );
+    }
+    else
+    {
+        rpc_user_dir_create_client( inode_cxy,
+                                    inode_ptr,
+                                    &dir_ptr );
+    }
 
-    if( dir_xp == XPTR_NULL )
+    if( dir_ptr == NULL )
         {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : cannot create remote_dir for <%s>\n",
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot create user_dir for <%s>\n",
 __FUNCTION__ , process->pid , this->trdid , kbuf );
 #endif
@@ -162 +167 @@
         }
    
-    // get ident from remote_dir structure
-    ident = (intptr_t)hal_remote_lpt( XPTR( dir_cxy , &dir_ptr->ident ) );
+    // get ident from user_dir structure
+    ident = (intptr_t)hal_remote_lpt( XPTR( inode_cxy , &dir_ptr->ident ) );
 
     // set ident value in user buffer