Changeset 23 for trunk/kernel/syscalls/sys_rmdir.c

Timestamp:

Jun 18, 2017, 10:06:41 PM (7 years ago)

Author:

alain

Message:

Introduce syscalls.

File:

• trunk/kernel/syscalls/sys_rmdir.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_rmdir.c

@@ -1 +1 @@
 /*
- * sys_rmdir: remove a directory
+ * sys_rmdir.c - Remove a directory from file system.
+ *
+ * Author    Alain Greiner (2016,2017)
  *
  * Copyright (c) 2015 UPMC Sorbonne Universites
  *
- * This file is part of ALMOS-kernel.
+ * This file is part of ALMOS-MKH.
  *
- * ALMOS-kernel is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-kernel is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16 +18 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <cpu.h>
+#include <hal_types.h>
+#include <hal_uspace.h>
+#include <printk.h>
+#include <errno.h>
 #include <vfs.h>
-#include <sys-vfs.h>
+#include <vmm.h>
 #include <thread.h>
-#include <task.h>
+#include <process.h>
 
+////////////////////////////////
+int sys_rmdir( char * pathname )
+{
+    error_t     error;
+    paddr_t     paddr;
+    uint32_t    length;
+    char        kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
+        
+        thread_t  * this    = CURRENT_THREAD;
+        process_t * process = this->process;
 
-int sys_rmdir (char *pathname)
-{
-        register struct thread_s *this;
-        register struct task_s *task;
-        struct ku_obj ku_path;
-        error_t err = 0;
-        
-        this = current_thread;
-        task = current_task;
+    // check pathname in user space
+    error = vmm_v2p_translate( false , pathname , &paddr );
 
-        if(!pathname)
+        if( error )
         {
-                this->info.errno = EINVAL;
+        printk("\n[ERROR] in %s : user buffer unmapped  for thread %x in process %x\n",
+               __FUNCTION__ , this->trdid , process->pid );
+                this->errno = EINVAL;
+                return -1;
+        }       
+
+    // get pathname length
+    length = hal_strlen_from_uspace( pathname );
+
+    if( length >= CONFIG_VFS_MAX_PATH_LENGTH )
+    {
+        printk("\n[ERROR] in %s : pathname too long\n", __FUNCTION__ );
+                this->errno = ENFILE;
+        return -1;
+    }
+ 
+        // get pathname copy in kernel space
+    hal_copy_from_uspace( kbuf, pathname, length );
+
+    // 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 extended pointer on cwd inode
+    xptr_t cwd_xp = hal_remote_lwd( XPTR( ref_cxy , &ref_ptr->vfs_cwd_xp ) );
+   
+    // get the cwd lock in read mode from reference process
+        remote_rwlock_rd_lock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+
+    // call the relevant VFS function
+        error = vfs_rmdir( cwd_xp,
+                       kbuf );
+
+    // release the cwd lock
+        remote_rwlock_rd_unlock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+
+    if( error )
+        {
+        printk("\n[ERROR] in %s : cannot remove directory %s\n",
+               __FUNCTION__ , kbuf );
+                this->errno = error;
                 return -1;
         }
+   
+        return 0;
 
-        KU_BUFF(ku_path, pathname);
-        rwlock_wrlock(&task->cwd_lock);
-
-        if((err = vfs_rmdir(&current_task->vfs_cwd, &ku_path)))
-        {
-                current_thread->info.errno = (err < 0) ? -err : err;
-                rwlock_unlock(&task->cwd_lock); 
-                return -1;
-        }
-        
-        rwlock_unlock(&task->cwd_lock); 
-        return 0;
-}
+}  // end sys_rmdir()