Changeset 610 for trunk/kernel/syscalls/sys_unlink.c

Timestamp:

Dec 27, 2018, 7:38:58 PM (5 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

• trunk/kernel/syscalls/sys_unlink.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_unlink.c

@@ -1 +1 @@
 /*
- * sys_unlink.c - file unlink a file
+ * sys_unlink.c - unlink a file or directorya from VFS
  *
  * Author     Alain Greiner (2016,2017,2018)
@@ -37 +37 @@
 {
     error_t   error;
+    xptr_t    root_inode_xp;           // extended pointer on path root inode
+
     char      kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
 
@@ -66 +68 @@
 #endif
  
-    // get cluster and local pointer on reference process
-    xptr_t      ref_xp  = process->ref_xp;
-    process_t * ref_ptr = (process_t *)GET_PTR( ref_xp );
-    cxy_t       ref_cxy = GET_CXY( ref_xp );
+    // compute root inode for path 
+    if( kbuf[0] == '/' )                        // absolute path
+    {
+        // use extended pointer on VFS root inode
+        root_inode_xp = process->vfs_root_xp;
+    }
+    else                                        // relative path
+    {
+        // get cluster and local pointer on reference process
+        xptr_t      ref_xp  = process->ref_xp;
+        process_t * ref_ptr = (process_t *)GET_PTR( ref_xp );
+        cxy_t       ref_cxy = GET_CXY( ref_xp );
 
-    // get the cwd lock in write mode from reference process
-    remote_rwlock_wr_acquire( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+        // use extended pointer on CWD inode
+        root_inode_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->cwd_xp ) );
+    }
 
-    // get extended pointer on cwd inode
-    xptr_t cwd_xp = hal_remote_l64( XPTR( ref_cxy , &ref_ptr->vfs_cwd_xp ) );
-
-    // call relevant VFS function
-    error  = vfs_unlink( cwd_xp , kbuf );
-
-    // release the cwd lock in reference process
-    remote_rwlock_wr_release( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+    // call the relevant VFS function
+    error  = vfs_unlink( root_inode_xp , kbuf );
 
     if( error )