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

Timestamp:

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

Author:

alain

Message:

Introduce syscalls.

File:

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

trunk/kernel/syscalls/sys_close.c

@@ -1 +1 @@
 /*
- * sys_close.c  close a process open file
+ * sys_close.c  close an open file
  * 
- * Copyright (c) 2008,2009,2010,2011,2012 Ghassan Almaless
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * Author    Alain Greiner (2016,2017)
  *
- * This file is part of ALMOS-kernel.
+ * Copyright (c) UPMC Sorbonne Universites
  *
- * ALMOS-kernel is free software; you can redistribute it and/or modify it
+ * This file is part of ALMOS-MKH.
+ *
+ * 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
@@ -17 +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 <chdev.h>
-#include <driver.h>
+#include <kernel_config.h>
+#include <hal_types.h>
+#include <hal_special.h>
 #include <vfs.h>
-#include <sys-vfs.h>
 #include <process.h>
 #include <thread.h>
-#include <config.h>
+#include <printk.h>
 
-/////////////////////////////
-int sys_close ( uint32_t fd )
+//////////////////////////////////
+int sys_close ( uint32_t file_id )
 {
-        register process_t * process = current_process;
-        register thread_t  * this    = current_thread;
-        struct vfs_file_s  * file    = NULL;
-        error_t              err;
-  
-        if(( fd >= CONFIG_TASK_FILE_MAX_NR ) || (process_fd_lookup( process , fd , &file )))
+    error_t     error;
+    xptr_t      file_xp;
+
+        thread_t  * this    = CURRENT_THREAD;
+        process_t * process = this->process;
+
+    // check file_id argument
+        if( file_id >= CONFIG_PROCESS_FILE_MAX_NR )
         {
-                this->info.errno = EBADFD;
+        printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
+               __FUNCTION__ , file_id );
+                this->errno = EBADFD;
                 return -1;
         }
 
-        err = vfs_close( file , NULL );
-        if( err )
+    // get extended pointer on remote file descriptor
+    file_xp = process_fd_get_xptr( process , file_id );
+
+    if( file_xp == XPTR_NULL )
+    {
+        printk("\n[ERROR] in %s : undefined file descriptor = %d\n",
+               __FUNCTION__ , file_id );
+                this->errno = EBADFD;
+                return -1;
+    }
+
+    // call the relevant VFS function
+        error = vfs_close( file_xp , file_id );
+
+        if( error )
         {
-                this->info.errno = err;
+        printk("\n[ERROR] in %s : cannot close file descriptor = %d\n",
+               __FUNCTION__ , file_id );
+                this->errno = error;
                 return -1;
         }
 
-        process_fd_release( process , fd );
-        cpu_wbflush();
+        hal_wbflush();
+
         return 0;
 }