Changeset 301 for trunk/kernel

Timestamp:

Jul 31, 2017, 2:30:23 PM (7 years ago)

Author:

max@…

Message:

Style, and use hal_strcpy_from_uspace.

File:

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

trunk/kernel/syscalls/sys_chdir.c

@@ -1 +1 @@
 /*
  * sys_chdir: change process current working directory
- * 
+ *
  * Author    Alain Greiner (2016,2017)
  *
@@ -35 +35 @@
 int sys_chdir ( char * pathname )
 {
-        error_t   error;
-    paddr_t   paddr;
-    uint32_t  length;
+    error_t   error;
     char      kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
 
-        thread_t  * this    = CURRENT_THREAD;
+    thread_t  * this    = CURRENT_THREAD;
     process_t * process = this->process;
 
-    // check pathname in user space
-    error = vmm_v2p_translate( false , pathname , &paddr );
+    // get pathname copy in kernel space
+    error = hal_strcpy_from_uspace( kbuf, pathname, CONFIG_VFS_MAX_PATH_LENGTH );
 
-        if( error )
-        {
-        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 )
+    if( error )
     {
         printk("\n[ERROR] in %s : pathname too long for thread %x in process %x\n",
                __FUNCTION__ , this->trdid , process->pid );
-                this->errno = ENFILE;
+        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
@@ -75 +59 @@
     // get extended pointer on cwd lock in reference process
     xptr_t lock_xp = hal_remote_lwd( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
-        
-    // get cwd lock in read mode 
-        remote_rwlock_rd_lock( lock_xp );
+
+    // get cwd lock in read mode
+    remote_rwlock_rd_lock( lock_xp );
 
     // call relevant VFS function
-        error = vfs_chdir( process->vfs_cwd_xp , kbuf );
+    error = vfs_chdir( process->vfs_cwd_xp , kbuf );
 
-    // release cwd lock 
-        remote_rwlock_rd_unlock( lock_xp );
+    // release cwd lock
+    remote_rwlock_rd_unlock( lock_xp );
 
-        if( error )
-        {
+    if( error )
+    {
         printk("\n[ERROR] in %s : cannot change current directory\n", __FUNCTION__ );
-                this->errno = error;
-                return -1;
-        }
-   
-        return 0;
+        this->errno = error;
+        return -1;
+    }
+
+    return 0;
 }