Changeset 5973fd0 in mainline for uspace/srv/fs/tmpfs

Timestamp:

2008-01-18T23:45:16Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ae78b530

Parents:

62da45a

Message:

Finish implementation of readdir(). Functions from this family are implemented
via using file descriptors for directories. For example, readdir() is
implemented as read() from an open directory. Of course, FS implementations
must understand that they are asked to read a directory and behave accordingly.

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -46 +46 @@
 #include <string.h>
 #include <stdio.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <libadt/hash_table.h>
@@ -308 +309 @@
         }
 
-        size_t bytes = max(0, min(dentry->size - pos, len));
-        (void) ipc_data_read_finalize(callid, dentry->data + pos, bytes);
+        size_t bytes;
+        if (dentry->type == TMPFS_FILE) {
+                bytes = max(0, min(dentry->size - pos, len));
+                (void) ipc_data_read_finalize(callid, dentry->data + pos,
+                    bytes);
+        } else {
+                int i;
+                tmpfs_dentry_t *cur = dentry->child;
+                
+                assert(dentry->type == TMPFS_DIRECTORY);
+                
+                /*
+                 * Yes, we really use O(n) algorithm here.
+                 * If it bothers someone, it could be fixed by introducing a
+                 * hash table.
+                 */
+                for (i = 0, cur = dentry->child; i < pos && cur; i++,
+                    cur = cur->sibling)
+                        ;
+
+                if (!cur) {
+                        ipc_answer_0(callid, ENOENT);
+                        ipc_answer_1(rid, ENOENT, 0);
+                        return;
+                }
+
+                (void) ipc_data_read_finalize(callid, cur->name,
+                    strlen(cur->name) + 1);
+                bytes = 1;
+        }
 
         /*