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

 /** @addtogroup libc
  * @{
  */
 /** @file
  */
 #include <vfs/vfs.h>
 #include <vfs/canonify.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <async.h>
 #include <atomic.h>
 #include <futex.h>
 #include <errno.h>
 #include <string.h>
+#include <ipc/devmap.h>
-#include "../../srv/vfs/vfs.h"
+#include "../../../srv/vfs/vfs.h"
 int vfs_phone = -1;
 futex_t vfs_phone_futex = FUTEX_INITIALIZER;
 futex_t cwd_futex = FUTEX_INITIALIZER;
 DIR *cwd_dir = NULL;
 char *cwd_path = NULL;
 size_t cwd_len = 0;
-static char *absolutize(const char *path, size_t *retlen)
+char *absolutize(const char *path, size_t *retlen)
+{
     char *ncwd_path;
+    char *ncwd_path_nc;
     futex_down(&cwd_futex);
     size_t len = strlen(path);
     if (*path != '/') {
         if (!cwd_path) {
             futex_up(&cwd_futex);
             return NULL;
+        }
-        ncwd_path = malloc(len + cwd_len + 1);
+        ncwd_path_nc = malloc(cwd_len + 1 + len + 1);
-        if (!ncwd_path) {
+        if (!ncwd_path_nc) {
             futex_up(&cwd_futex);
             return NULL;
+        }
-        strcpy(ncwd_path, cwd_path);
+        strcpy(ncwd_path_nc, cwd_path);
-        ncwd_path[cwd_len] = '/';
+        ncwd_path_nc[cwd_len] = '/';
-        ncwd_path[cwd_len + 1] = '\0';
+        ncwd_path_nc[cwd_len + 1] = '\0';
     } else {
-        ncwd_path = malloc(len + 1);
+        ncwd_path_nc = malloc(len + 1);
-        if (!ncwd_path) {
+        if (!ncwd_path_nc) {
             futex_up(&cwd_futex);
             return NULL;
+        }
-        ncwd_path[0] = '\0';
+        ncwd_path_nc[0] = '\0';
+    }
-    strcat(ncwd_path, path);
+    strcat(ncwd_path_nc, path);
-    if (!canonify(ncwd_path, retlen)) {
+    ncwd_path = canonify(ncwd_path_nc, retlen);
+    if (!ncwd_path) {
+        futex_up(&cwd_futex);
+        free(ncwd_path_nc);
+        return NULL;
+    }
+    /*
+     * We need to clone ncwd_path because canonify() works in-place and thus
+     * the address in ncwd_path need not be the same as ncwd_path_nc, even
+     * though they both point into the same dynamically allocated buffer.
+     */
+    ncwd_path = strdup(ncwd_path);
+    free(ncwd_path_nc);
+    if (!ncwd_path) {
         futex_up(&cwd_futex);
-        free(ncwd_path);
         return NULL;
+    }
     futex_up(&cwd_futex);
     return ncwd_path;
+}
-static int vfs_connect(void)
+static void vfs_connect(void)
+{
-    if (vfs_phone < 0)
+    while (vfs_phone < 0)
-        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
+        vfs_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VFS, 0, 0);
-    return vfs_phone;
+}
+static int device_get_handle(const char *name, dev_handle_t *handle,
+    const unsigned int flags)
+{
+    int phone;
+    if (flags & IPC_FLAG_BLOCKING)
+        phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+    else
+        phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+    if (phone < 0)
+        return phone;
+    ipc_call_t answer;
+    aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0,
+        &answer);
+    ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1);
+    if (retval != EOK) {
+        async_wait_for(req, NULL);
+        ipc_hangup(phone);
+        return retval;
+    }
+    async_wait_for(req, &retval);
+    if (handle != NULL)
+        *handle = -1;
+    if (retval == EOK) {
+        if (handle != NULL)
+            *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+    }
+    ipc_hangup(phone);
+    return retval;
+}
-int mount(const char *fs_name, const char *mp, const char *dev)
+int mount(const char *fs_name, const char *mp, const char *dev,
+    const unsigned int flags)
+{
     int res;
     ipcarg_t rc;
     aid_t req;
+    dev_handle_t dev_handle;
-    dev_handle_t dev_handle = 0;    /* TODO */
+    res = device_get_handle(dev, &dev_handle, flags);
+    if (res != EOK)
+        return res;
     size_t mpa_len;
     char *mpa = absolutize(mp, &mpa_len);
     if (!mpa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(mpa);
-            return res;
-        }
-    }
-    req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
+    req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
-    rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
+    rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(mpa);
         return (int) rc;
+    }
-    rc = ipc_data_write_start(vfs_phone, (void *)mpa, mpa_len);
+    rc = ipc_data_write_start(vfs_phone, (void *) fs_name, strlen(fs_name));
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(mpa);
         return (int) rc;
+    }
     async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     free(mpa);
     return (int) rc;
+}
 static int _open(const char *path, int lflag, int oflag, ...)
+{
-    int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
     size_t pa_len;
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
     req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
+    }
     async_wait_for(req, &rc);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     free(pa);
+    if (rc != EOK)
+        return (int) rc;
     return (int) IPC_GET_ARG1(answer);
+}
 int open(const char *path, int oflag, ...)
+{
     return _open(path, L_FILE, oflag);
+}
 int close(int fildes)
+{
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
     rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     return (int)rc;
+}
 ssize_t read(int fildes, 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();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
     req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
     rc = ipc_data_read_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     if (rc == EOK)
         return (ssize_t) IPC_GET_ARG1(answer);
     else
-        return -1;
+        return rc;
+}
 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();
+    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);
     rc = ipc_data_write_start(vfs_phone, (void *)buf, nbyte);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         return -1;
+}
 off_t lseek(int fildes, off_t offset, int whence)
+{
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
-    off_t newoffs;
+    ipcarg_t newoffs;
     rc = async_req_3_1(vfs_phone, VFS_SEEK, fildes, offset, whence,
-        (ipcarg_t)&newoffs);
+        &newoffs);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     if (rc != EOK)
         return (off_t) -1;
-    return newoffs;
+    return (off_t) newoffs;
+}
 int ftruncate(int fildes, off_t length)
+{
-    int res;
     ipcarg_t rc;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            return res;
-        }
-    }
     rc = async_req_2_0(vfs_phone, VFS_TRUNCATE, fildes, length);
     async_serialize_end();
     futex_up(&vfs_phone_futex);
     return (int) rc;
+}
     return 0;
+}
 int mkdir(const char *path, mode_t mode)
+{
-    int res;
     ipcarg_t rc;
     aid_t req;
     size_t pa_len;
     char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
     req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
     return rc;
+}
 static int _unlink(const char *path, int lflag)
+{
-    int res;
     ipcarg_t rc;
     aid_t req;
     size_t pa_len;
     char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(pa);
-            return res;
-        }
-    }
     req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
     rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
     return _unlink(path, L_DIRECTORY);
+}
 int rename(const char *old, const char *new)
+{
-    int res;
     ipcarg_t rc;
     aid_t req;
     size_t olda_len;
     char *olda = absolutize(old, &olda_len);
         return ENOMEM;
+    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
-    if (vfs_phone < 0) {
-        res = vfs_connect();
+    vfs_connect();
-        if (res < 0) {
-            async_serialize_end();
-            futex_up(&vfs_phone_futex);
-            free(olda);
-            free(newa);
-            return res;
-        }
-    }
     req = async_send_0(vfs_phone, VFS_RENAME, NULL);
     rc = ipc_data_write_start(vfs_phone, olda, olda_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
+    }
     cwd_dir = d;
     cwd_path = pa;
     cwd_len = pa_len;
     futex_up(&cwd_futex);
+    return EOK;
+}
 char *getcwd(char *buf, size_t size)
+{
     if (!size)

Subversion Repositories HelenOS

(root)/branches/dd/uspace/lib/libc/generic/vfs/vfs.c – Rev 3022 → 4055