Changeset 304 for trunk/kernel

Timestamp:

Jul 31, 2017, 2:42:36 PM (7 years ago)

Author:

max@…

Message:

Style, and use hal_strcpy_from_uspace.

File:

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

trunk/kernel/syscalls/sys_mkfifo.c

@@ -1 +1 @@
 /*
  * sys_mkfifo.c - creates a named FIFO file.
- * 
+ *
  * Author    Alain Greiner (2016,2017)
  *
@@ -34 +34 @@
 {
     error_t        error;
-    uint32_t       length;                           // pathname length (bytes)
     char           kbuf[CONFIG_VFS_MAX_PATH_LENGTH];
 
     thread_t  * this    = CURRENT_THREAD;
-        process_t * process = this->process;
-
-        if( pathname == NULL )
-        {
-        printk("\n[ERROR] in %s : pathname is NULL\n", __FUNCTION__ );
-                this->errno = EINVAL;
-                return -1;
-        }       
+    process_t * process = this->process;
 
     // check fd_array not full
-        if( process_fd_array_full() )
-        {
+    if( process_fd_array_full() )
+    {
         printk("\n[ERROR] in %s : file descriptor array full for process %x\n",
                __FUNCTION__ , process->pid );
-                this->errno = ENFILE;
+        this->errno = ENFILE;
         return -1;
-        }
-   
-    // get pathname length
-    length = hal_strlen_from_uspace( pathname );
+    }
 
-    if( length >= CONFIG_VFS_MAX_PATH_LENGTH )
+    // 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 : pathname too long\n", __FUNCTION__ );
-                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
@@ -76 +65 @@
     // 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 ) );
+    remote_rwlock_rd_lock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
 
     // call the relevant VFS function
-        error = vfs_mkfifo( cwd_xp,
+    error = vfs_mkfifo( cwd_xp,
                         kbuf,
                         mode );
 
     // release the cwd lock
-        remote_rwlock_rd_unlock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
+    remote_rwlock_rd_unlock( XPTR( ref_cxy , &ref_ptr->cwd_lock ) );
 
     if( error )
-        {
+    {
         printk("\n[ERROR] in %s : cannot create named FIFO %s\n",
                __FUNCTION__ , kbuf );
-                this->errno = error;
-                return -1;
-        }
-   
-        return 0;
+        this->errno = error;
+        return -1;
+    }
+
+    return 0;
 
 } // end sys_mkfifo()