Changeset 449c246 in mainline

Timestamp:

2007-12-30T21:32:31Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

badbd888

Parents:

92688eb

Message:

Add libc VFS wrapper for VFS_WRITE. Fix a small bug in read(). Place open(),
read() and write() declarations in their respective headers according to SUSv3.

Location:

uspace

Files:

• app/tester/vfs/vfs1.c (modified) (1 diff)
• lib/libc/generic/vfs.c (modified) (3 diffs)
• lib/libc/include/fcntl.h (added)
• lib/libc/include/vfs.h (modified) (1 diff)

uspace/app/tester/vfs/vfs1.c

@@ -33 +33 @@
 #include <sys/types.h>
 #include <vfs.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include "../tester.h"
 

uspace/lib/libc/generic/vfs.c

@@ -34 +34 @@
  
 #include <vfs.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -141 +143 @@
                 }
         }
-        req = async_send_1(vfs_phone, VFS_READ, 0, &answer);
+        req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
         if (ipc_data_read_send(vfs_phone, buf, sizeof(buf)) != EOK) {
                 async_wait_for(req, NULL);
@@ -154 +156 @@
 }
 
+ssize_t write(int fildes, const void *buf, size_t nbyte) 
+{
+        int res;
+        ipcarg_t rc;
+        ipc_call_t answer;
+        aid_t req;
+
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        if (vfs_phone < 0) {
+                res = vfs_connect();
+                if (res < 0) {
+                        async_serialize_end();
+                        futex_up(&vfs_phone_futex);
+                        return res;
+                }
+        }
+        req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
+        if (ipc_data_write_send(vfs_phone, buf, sizeof(buf)) != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                return (ssize_t) rc;
+        }
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return (ssize_t) IPC_GET_ARG1(answer);
+}
 /** @}
  */

uspace/lib/libc/include/vfs.h

@@ -36 +36 @@
 #define LIBC_VFS_H_
 
-#include <sys/types.h>
-
 extern int mount(const char *, const char *, const char *);
-extern int open(const char *, int, ...);
-extern ssize_t read(int, void *, size_t); 
 
 #endif