Changeset 415c7e0d in mainline for uspace/srv

Timestamp:

2009-06-28T21:41:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bfd247f

Parents:

75160a6

Message:

Implement stat() and VFS_IN_STAT.
Modify bdsh() to use stat() during ls.
In devfs, allow lookups that don't
specify one of L_FILE and L_DIRECTORY.

Location:

uspace/srv

Files:

• fs/devfs/devfs_ops.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (1 diff)

uspace/srv/fs/devfs/devfs_ops.c

@@ -165 +165 @@
         if (first >= last) {
                 /* Root entry */
-                if (lflag & L_DIRECTORY)
+                if (!(lflag & L_FILE))
                         ipc_answer_5(rid, EOK, devfs_reg.fs_handle, dev_handle, 0, 0, 0);
                 else
                         ipc_answer_0(rid, ENOENT);
         } else {
-                if (lflag & L_FILE) {
+                if (!(lflag & L_DIRECTORY)) {
                         size_t len;
                         if (last >= first)

uspace/srv/vfs/vfs_ops.c

@@ -964 +964 @@
 void vfs_stat(ipc_callid_t rid, ipc_call_t *request)
 {
+        size_t len;
+        ipc_callid_t callid;
+
+        if (!ipc_data_write_receive(&callid, &len)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        char *path = malloc(len + 1);
+        if (!path) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        int rc;
+        if ((rc = ipc_data_write_finalize(callid, path, len))) {
+                ipc_answer_0(rid, rc);
+                free(path);
+                return;
+        }
+        path[len] = '\0';
+
+        if (!ipc_data_read_receive(&callid, NULL)) {
+                free(path);
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        vfs_lookup_res_t lr;
+        fibril_rwlock_read_lock(&namespace_rwlock);
+        rc = vfs_lookup_internal(path, L_NONE, &lr, NULL);
+        free(path);
+        if (rc != EOK) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
+                ipc_answer_0(callid, rc);
+                ipc_answer_0(rid, rc);
+                return;
+        }
+        vfs_node_t *node = vfs_node_get(&lr);
+        if (!node) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+
+        fibril_rwlock_read_unlock(&namespace_rwlock);
+
+        int fs_phone = vfs_grab_phone(node->fs_handle);
+        aid_t msg;
+        msg = async_send_3(fs_phone, VFS_OUT_STAT, node->dev_handle,
+            node->index, false, NULL);
+        ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+        async_wait_for(msg, &rc);
+        vfs_release_phone(fs_phone);
+
+        ipc_answer_0(rid, rc);
+
+        vfs_node_put(node);
 }