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

 #include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <async.h>
 #include <atomic.h>
 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)
+static char *absolutize(const char *path, size_t *retlen)
+{
     char *ncwd_path;
     futex_down(&cwd_futex);
     size_t len = strlen(path);
             return NULL;
+        }
         ncwd_path[0] = '\0';
+    }
     strcat(ncwd_path, path);
+    if (!canonify(ncwd_path, retlen)) {
+        futex_up(&cwd_futex);
+        free(ncwd_path);
+        return NULL;
+    }
     futex_up(&cwd_futex);
     return ncwd_path;
+}
 static int vfs_connect(void)
+{
     int res;
     ipcarg_t rc;
     aid_t req;
-    int dev_handle = 0; /* TODO */
+    dev_handle_t dev_handle = 0;    /* TODO */
+    size_t mpa_len;
-    char *mpa = absolutize(mp);
+    char *mpa = absolutize(mp, &mpa_len);
     if (!mpa)
         return ENOMEM;
-    size_t mpc_len;
-    char *mpc = canonify(mpa, &mpc_len);
-    if (!mpc) {
-        free(mpa);
-        return EINVAL;
-    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     if (vfs_phone < 0) {
         res = vfs_connect();
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(mpa);
         return (int) rc;
+    }
-    rc = ipc_data_write_start(vfs_phone, (void *)mpc, mpc_len);
+    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);
     int res;
     ipcarg_t rc;
     ipc_call_t answer;
     aid_t req;
+    size_t pa_len;
-    char *pa = absolutize(path);
+    char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
-    size_t pc_len;
-    char *pc = canonify(pa, &pc_len);
-    if (!pc) {
-        free(pa);
-        return EINVAL;
-    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     if (vfs_phone < 0) {
         res = vfs_connect();
             free(pa);
             return res;
+        }
+    }
     req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
-    rc = ipc_data_write_start(vfs_phone, pc, pc_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(pa);
+{
     int res;
     ipcarg_t rc;
     aid_t req;
+    size_t pa_len;
-    char *pa = absolutize(path);
+    char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
-    size_t pc_len;
-    char *pc = canonify(pa, &pc_len);
-    if (!pc) {
-        free(pa);
-        return EINVAL;
-    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     if (vfs_phone < 0) {
         res = vfs_connect();
             free(pa);
             return res;
+        }
+    }
     req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
-    rc = ipc_data_write_start(vfs_phone, pc, pc_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(pa);
+{
     int res;
     ipcarg_t rc;
     aid_t req;
+    size_t pa_len;
-    char *pa = absolutize(path);
+    char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
-    size_t pc_len;
-    char *pc = canonify(pa, &pc_len);
-    if (!pc) {
-        free(pa);
-        return EINVAL;
-    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     if (vfs_phone < 0) {
         res = vfs_connect();
         if (res < 0) {
             free(pa);
             return res;
+        }
+    }
     req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
-    rc = ipc_data_write_start(vfs_phone, pc, pc_len);
+    rc = ipc_data_write_start(vfs_phone, pa, pa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(pa);
+{
     int res;
     ipcarg_t rc;
     aid_t req;
+    size_t olda_len;
-    char *olda = absolutize(old);
+    char *olda = absolutize(old, &olda_len);
     if (!olda)
         return ENOMEM;
-    size_t oldc_len;
+    size_t newa_len;
-    char *oldc = canonify(olda, &oldc_len);
-    if (!oldc) {
-        free(olda);
-        return EINVAL;
-    }
-    char *newa = absolutize(new);
+    char *newa = absolutize(new, &newa_len);
     if (!newa) {
         free(olda);
         return ENOMEM;
+    }
-    size_t newc_len;
-    char *newc = canonify(newa, &newc_len);
-    if (!newc) {
-        free(olda);
-        free(newa);
-        return EINVAL;
-    }
     futex_down(&vfs_phone_futex);
     async_serialize_start();
     if (vfs_phone < 0) {
         res = vfs_connect();
             free(newa);
             return res;
+        }
+    }
     req = async_send_0(vfs_phone, VFS_RENAME, NULL);
-    rc = ipc_data_write_start(vfs_phone, oldc, oldc_len);
+    rc = ipc_data_write_start(vfs_phone, olda, olda_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(olda);
         free(newa);
         return (int) rc;
+    }
-    rc = ipc_data_write_start(vfs_phone, newc, newc_len);
+    rc = ipc_data_write_start(vfs_phone, newa, newa_len);
     if (rc != EOK) {
         async_wait_for(req, NULL);
         async_serialize_end();
         futex_up(&vfs_phone_futex);
         free(olda);
     return rc;
+}
 int chdir(const char *path)
+{
+    size_t pa_len;
-    char *pa = absolutize(path);
+    char *pa = absolutize(path, &pa_len);
     if (!pa)
         return ENOMEM;
-    size_t pc_len;
-    char *pc = canonify(pa, &pc_len);
-    if (!pc) {
-        free(pa);
-        return ENOENT;
-    }
-    DIR *d = opendir(pc);
+    DIR *d = opendir(pa);
     if (!d) {
         free(pa);
         return ENOENT;
+    }
         free(cwd_path);
         cwd_path = NULL;
         cwd_len = 0;
+    }
     cwd_dir = d;
-    cwd_path = pc;
+    cwd_path = pa;
-    cwd_len = pc_len;
+    cwd_len = pa_len;
     futex_up(&cwd_futex);
+}
 char *getcwd(char *buf, size_t size)
+{

Subversion Repositories HelenOS

(root)/trunk/uspace/lib/libc/generic/vfs/vfs.c – Rev 2763 → 2771