Changeset d18c404 in mainline

Timestamp:

2013-07-25T12:47:58Z (11 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

d60ce4a

Parents:

20c071d

Message:

Use unlink2() to implement unlink() and rmdir().

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (2 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -388 +388 @@
 }
 
+// TODO: Versioning for read.
+
 ssize_t read(int fildes, void *buf, size_t nbyte) 
 {
@@ -665 +667 @@
 }
 
-static int _unlink(const char *path, int lflag)
+static int _vfs_unlink2(int parent, const char *path, int expect, int wflag)
 {
         sysarg_t rc;
         aid_t req;
         
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        req = async_send_3(exch, VFS_IN_UNLINK2, parent, expect, wflag, NULL);
+        rc = async_data_write_start(exch, path, str_size(path));
+        
+        vfs_exchange_end(exch);
+        
+        sysarg_t rc_orig;
+        async_wait_for(req, &rc_orig);
+        
+        if (rc_orig != EOK) {
+                return (int) rc_orig;
+        }
+        return rc;
+}
+
+int unlink(const char *path)
+{
         size_t pa_size;
         char *pa = absolutize(path, &pa_size);
-        if (!pa)
+        if (!pa) {
                 return ENOMEM;
-        
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        req = async_send_1(exch, VFS_IN_UNLINK, lflag, NULL);
-        rc = async_data_write_start(exch, pa, pa_size);
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-                free(pa);
-
-                sysarg_t rc_orig;
-                async_wait_for(req, &rc_orig);
-
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-        vfs_exchange_end(exch);
-        free(pa);
-        async_wait_for(req, &rc);
-        return rc;
-}
-
-int unlink(const char *path)
-{
-        return _unlink(path, L_NONE);
+        }
+        
+        return _vfs_unlink2(-1, pa, -1, 0);
 }
 
 int rmdir(const char *path)
 {
-        return _unlink(path, L_DIRECTORY);
+        size_t pa_size;
+        char *pa = absolutize(path, &pa_size);
+        if (!pa) {
+                return ENOMEM;
+        }
+        
+        return _vfs_unlink2(-1, pa, -1, WALK_DIRECTORY);
 }