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

Timestamp:

Jul 31, 2017, 2:46:50 PM (7 years ago)

Author:

max@…

Message:

Style, and use hal_strcpy_from_uspace.

File:

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

trunk/kernel/syscalls/sys_rmdir.c

@@ -35 +35 @@
 {
     error_t     error;
-    paddr_t     paddr;
-    uint32_t    length;
     char        kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
         
@@ -42 +40 @@
         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\n", __FUNCTION__ );
@@ -62 +49 @@
         return -1;
     }
- 
-        // get pathname copy in kernel space
-    hal_copy_from_uspace( kbuf, pathname, length );
 
     // get cluster and local pointer on reference process