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

Timestamp:

Jan 9, 2019, 3:02:51 PM (5 years ago)

Author:

alain

Message:

Introduce sigificant modifs in VFS to support the <ls> command,
and the . and .. directories entries.

File:

• trunk/kernel/syscalls/sys_opendir.c (modified) (6 diffs)

trunk/kernel/syscalls/sys_opendir.c

@@ -1 +1 @@
 /*
- * sys_opendir.c - open a directory.
+ * sys_opendir.c - Open a VFS directory.
  * 
  * Author        Alain Greiner (2016,2017,2018)
@@ -22 +22 @@
  */
 
+#include <kernel_config.h>
 #include <hal_kernel_types.h>
 #include <hal_uspace.h>
 #include <thread.h>
 #include <process.h>
+#include <remote_dir.h>
 #include <printk.h>
 #include <errno.h>
+#include <vseg.h>
 #include <vfs.h>
 #include <syscalls.h>
@@ -36 +39 @@
                   DIR  ** dirp )
 {
-    error_t       error;
-    vseg_t      * vseg;                   // for user space checking
-    xptr_t        root_inode_xp;          // extended pointer on path root inode
-
+    error_t        error;
+    xptr_t         root_inode_xp;          // extended pointer on path root inode
+    xptr_t         inode_xp;               // extended pointer on directory inode
+    vfs_inode_t  * inode_ptr;              // local pointer on directory inode
+    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
+    vseg_t       * vseg;                   // for user space checking
+    intptr_t       ident;                  // dirent array pointer in user space                  
     char          kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
         
-        thread_t  * this    = CURRENT_THREAD;
-        process_t * process = this->process;
+        thread_t     * this    = CURRENT_THREAD;  // client thread
+        process_t    * process = this->process;   // client process
 
 #if (DEBUG_SYS_OPENDIR || CONFIG_INSTRUMENTATION_SYSCALLS)
@@ -85 +95 @@
 #endif
 
-    // compute root inode for path 
+    // compute root inode for pathname 
     if( kbuf[0] == '/' )                        // absolute path
     {
@@ -102 +112 @@
     }
 
-/*
-    // call the relevant VFS function ???
-    error = vfs_opendir( root_inode_xp,
-                         kbuf );
+    // get extended pointer on directory inode
+    error = vfs_lookup( root_inode_xp,
+                        kbuf,
+                        0,
+                        &inode_xp,
+                        NULL );
     if( error )
         {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s / thread[%x,%x] : cannot open directory <%s>\n",
-__FUNCTION__ , process->pid , this->trdid , pathname );
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot found directory <%s>\n",
+__FUNCTION__ , process->pid , this->trdid , kbuf );
 #endif
                 this->errno = ENFILE;
@@ -117 +129 @@
         }
    
-    // copy to user space ???
-*/
+    // check inode type 
+    inode_ptr  = GET_PTR( inode_xp );
+    inode_cxy  = GET_CXY( inode_xp );
+    inode_type = hal_remote_l32( XPTR( inode_cxy , &inode_ptr->type ) );
+
+    if( inode_type != INODE_TYPE_DIR )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot found directory <%s>\n",
+__FUNCTION__ , process->pid , this->trdid , kbuf );
+#endif
+                this->errno = ENFILE;
+                return -1;
+        }
+   
+    // 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 );
+
+    if( dir_xp == XPTR_NULL )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s / thread[%x,%x] : cannot create remote_dir for <%s>\n",
+__FUNCTION__ , process->pid , this->trdid , kbuf );
+#endif
+                this->errno = ENFILE;
+                return -1;
+        }
+   
+    // get ident from remote_dir structure
+    ident = (intptr_t)hal_remote_lpt( XPTR( dir_cxy , &dir_ptr->ident ) );
+
+    // set ident value in user buffer
+    hal_copy_to_uspace( dirp , &ident , sizeof(intptr_t) );
 
     hal_fence();