WebSVN – HelenOS – Diff – /branches/dd/uspace/lib/libc/generic/vfs/vfs.c

 #include <vfs/canonify.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <stdio.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
 #include <atomic.h>
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
+    req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
     rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
+    req = async_send_3(vfs_phone, VFS_IN_OPEN, lflag, oflag, 0, &answer);
     rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
     ipc_call_t answer;
-    aid_t req = async_send_4(vfs_phone, VFS_OPEN_NODE, node->fs_handle,
+    aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle,
         node->dev_handle, node->index, oflag, &answer);
     ipcarg_t rc;
     async_wait_for(req, &rc);
     async_serialize_end();
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
+    rc = async_req_1_0(vfs_phone, VFS_IN_CLOSE, fildes);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     return (int)rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
+    req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer);
     rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
+    req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer);
     rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         return (ssize_t) IPC_GET_ARG1(answer);
     else
         return -1;
+}
-int fd_phone(int fildes)
+int fsync(int fildes)
+{
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    ipcarg_t device;
-    ipcarg_t rc = async_req_1_1(vfs_phone, VFS_DEVICE, fildes, &device);
+    ipcarg_t rc = async_req_1_0(vfs_phone, VFS_IN_SYNC, fildes);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
-    if (rc != EOK)
-        return -1;
+    return (int) rc;
-    return devmap_device_connect((dev_handle_t) device, 0);
+}
-int fd_node(int fildes, fdi_node_t *node)
+off_t lseek(int fildes, off_t offset, int whence)
+{
+    ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    ipcarg_t fs_handle;
-    ipcarg_t dev_handle;
-    ipcarg_t index;
+    ipcarg_t newoffs;
-    ipcarg_t rc = async_req_1_3(vfs_phone, VFS_NODE, fildes, &fs_handle,
+    rc = async_req_3_1(vfs_phone, VFS_IN_SEEK, fildes, offset, whence,
-        &dev_handle, &index);
+        &newoffs);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
+    if (rc != EOK)
+        return (off_t) -1;
-    if (rc == EOK) {
-        node->fs_handle = (fs_handle_t) fs_handle;
-        node->dev_handle = (dev_handle_t) dev_handle;
-        node->index = (fs_index_t) index;
-    }
-    return rc;
+    return (off_t) newoffs;
+}
-int fsync(int fildes)
+int ftruncate(int fildes, off_t length)
+{
+    ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    ipcarg_t rc = async_req_1_0(vfs_phone, VFS_SYNC, fildes);
+    rc = async_req_2_0(vfs_phone, VFS_IN_TRUNCATE, fildes, length);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     return (int) rc;
+}
-off_t lseek(int fildes, off_t offset, int whence)
+int fstat(int fildes, struct stat *stat)
+{
     ipcarg_t rc;
+    ipc_call_t answer;
+    aid_t req;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
+    req = async_send_1(vfs_phone, VFS_IN_FSTAT, fildes, NULL);
+    rc = ipc_data_read_start(vfs_phone, (void *)stat, sizeof(struct stat));
-    ipcarg_t newoffs;
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
-    rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
+        futex_up(&vfs_phone_futex);
-        &newoffs);
+        return (ssize_t) rc;
+    }
+    async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
-    if (rc != EOK)
-        return (off_t) -1;
+    return rc;
-    return (off_t) newoffs;
+}
-int ftruncate(int fildes, off_t length)
+int stat(const char *path, struct stat *stat)
+{
     ipcarg_t rc;
+    aid_t req;
+    size_t pa_size;
+    char *pa = absolutize(path, &pa_size);
+    if (!pa)
+        return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
+    req = async_send_0(vfs_phone, VFS_IN_STAT, NULL);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_size);
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(pa);
+        return (int) rc;
+    }
+    rc = ipc_data_read_start(vfs_phone, stat, sizeof(struct stat));
+    if (rc != EOK) {
+        async_wait_for(req, NULL);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(pa);
+        return (int) rc;
+    }
+    async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
+    free(pa);
-    return (int) rc;
+    return rc;
+}
 DIR *opendir(const char *dirname)
+{
     DIR *dirp = malloc(sizeof(DIR));
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
+    req = async_send_1(vfs_phone, VFS_IN_MKDIR, mode, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
+    req = async_send_0(vfs_phone, VFS_IN_UNLINK, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     vfs_connect();
-    req = async_send_0(vfs_phone, VFS_RENAME, NULL);
+    req = async_send_0(vfs_phone, VFS_IN_RENAME, NULL);
     rc = ipc_data_write_start(vfs_phone, olda, olda_size);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
     str_cpy(buf, size, cwd_path);
     futex_up(&cwd_futex);
     return buf;
+}
+int fd_phone(int fildes)
+{
+    struct stat stat;
+    int rc;
+    rc = fstat(fildes, &stat);
+    if (!stat.devfs_stat.device)
+        return -1;
+    return devmap_device_connect(stat.devfs_stat.device, 0);
+}
+int fd_node(int fildes, fdi_node_t *node)
+{
+    struct stat stat;
+    int rc;
+    rc = fstat(fildes, &stat);
+    if (rc == EOK) {
+        node->fs_handle = stat.fs_handle;
+        node->dev_handle = stat.dev_handle;
+        node->index = stat.index;
+    }
+    return rc;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dd/uspace/lib/libc/generic/vfs/vfs.c @ 4688 – Rev 4537 → 4668