Changeset b7f9087 in mainline

Timestamp:

2008-07-07T13:07:11Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c98e6ee

Parents:

412a31e

Message:

Instead of aborting or crashing, return EBADF when an invalid file descriptor
is passed to vfs_close().

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_file.c (modified) (1 diff)
• vfs_ops.c (modified) (1 diff)

uspace/srv/vfs/vfs.h

@@ -283 +283 @@
 extern vfs_file_t *vfs_file_get(int);
 extern int vfs_fd_alloc(void);
-extern void vfs_fd_free(int);
+extern int vfs_fd_free(int);
 
 extern void vfs_file_addref(vfs_file_t *);

uspace/srv/vfs/vfs_file.c

@@ -98 +98 @@
  *
  * @param fd            File descriptor being released.
+ *
+ * @return              EOK on success or EBADF if fd is an invalid file
+ *                      descriptor.
  */
-void vfs_fd_free(int fd)
+int vfs_fd_free(int fd)
 {
-        assert(fd < MAX_OPEN_FILES);
-        assert(files[fd] != NULL);
+        if ((fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
+                return EBADF;
         vfs_file_delref(files[fd]);
         files[fd] = NULL;
+        return EOK;
 }
 

uspace/srv/vfs/vfs_ops.c

@@ -375 +375 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        if (fd >= MAX_OPEN_FILES) {
-                ipc_answer_0(rid, EBADF);
-                return;
-        }
-        vfs_fd_free(fd);
-        ipc_answer_0(rid, EOK);
+        int rc = vfs_fd_free(fd);
+        ipc_answer_0(rid, rc);
 }