Changeset f15cf1a6 in mainline for uspace/lib/libc/generic/vfs.c

Timestamp:

2008-02-17T16:22:10Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cf19ab5

Parents:

e704503

Message:

Support for rmdir(), unlink() and the respective VFS operations.

File:

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

uspace/lib/libc/generic/vfs.c

@@ -311 +311 @@
         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_MKDIR, mode, &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_MKDIR, mode, NULL);
         rc = ipc_data_write_start(vfs_phone, path, strlen(path));
         if (rc != EOK) {
@@ -336 +335 @@
         futex_up(&vfs_phone_futex);
         return EOK; 
+}
+
+static int _unlink(const char *path, int lflag)
+{
+        int res;
+        ipcarg_t rc;
+        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_0(vfs_phone, VFS_UNLINK, NULL);
+        rc = ipc_data_write_start(vfs_phone, path, strlen(path));
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                return (int) rc;
+        }
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        return EOK; 
+}
+
+int unlink(const char *path)
+{
+        return _unlink(path, L_NONE);
+}
+
+int rmdir(const char *path)
+{
+        return _unlink(path, L_DIRECTORY);
 }