Changeset e4f8c77 in mainline for uspace/srv/fs/ext2fs/ext2fs_ops.c

Timestamp:

2011-07-13T22:39:18Z (13 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:

e6910c8

Parents:

5974661 (diff), 8ecef91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (10 diffs)

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -187 +187 @@
 {
         EXT2FS_DBG("(%" PRIun ", -)", devmap_handle);
-        link_t *link;
         ext2fs_instance_t *tmp;
         
@@ -198 +197 @@
         }
 
-        for (link = instance_list.next; link != &instance_list; link = link->next) {
+        list_foreach(instance_list, link) {
                 tmp = list_get_instance(link, ext2fs_instance_t, link);
                 
@@ -241 +240 @@
         }
         
-        rc = ext2_directory_iterator_init(&it, fs, eparent->inode_ref);
+        rc = ext2_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
         if (rc != EOK) {
                 return rc;
@@ -479 +478 @@
         }
         
-        rc = ext2_directory_iterator_init(&it, fs, enode->inode_ref);
+        rc = ext2_directory_iterator_init(&it, fs, enode->inode_ref, 0);
         if (rc != EOK) {
                 EXT2FS_DBG("error %u", rc);
@@ -819 +818 @@
 {
         ext2_directory_iterator_t it;
-        aoff64_t cur;
+        aoff64_t next;
         uint8_t *buf;
         size_t name_size;
@@ -825 +824 @@
         bool found = false;
         
-        rc = ext2_directory_iterator_init(&it, inst->filesystem, inode_ref);
+        rc = ext2_directory_iterator_init(&it, inst->filesystem, inode_ref, pos);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -832 +831 @@
         }
         
-        /* Find the index we want to read
-         * Note that we need to iterate and count as
-         * the underlying structure is a linked list
-         * Moreover, we want to skip . and .. entries
+        /* Find next interesting directory entry.
+         * We want to skip . and .. entries
          * as these are not used in HelenOS
          */
-        cur = 0;
         while (it.current != NULL) {
                 if (it.current->inode == 0) {
@@ -852 +848 @@
                 }
                 
-                /* Is this the dir entry we want to read? */
-                if (cur == pos) {
-                        /* The on-disk entry does not contain \0 at the end
-                         * end of entry name, so we copy it to new buffer
-                         * and add the \0 at the end
-                         */
-                        buf = malloc(name_size+1);
-                        if (buf == NULL) {
-                                ext2_directory_iterator_fini(&it);
-                                async_answer_0(callid, ENOMEM);
-                                async_answer_0(rid, ENOMEM);
-                                return;
-                        }
-                        memcpy(buf, &it.current->name, name_size);
-                        *(buf+name_size) = 0;
-                        found = true;
-                        (void) async_data_read_finalize(callid, buf, name_size+1);
-                        free(buf);
-                        break;
-                }
-                cur++;
+                /* The on-disk entry does not contain \0 at the end
+                        * end of entry name, so we copy it to new buffer
+                        * and add the \0 at the end
+                        */
+                buf = malloc(name_size+1);
+                if (buf == NULL) {
+                        ext2_directory_iterator_fini(&it);
+                        async_answer_0(callid, ENOMEM);
+                        async_answer_0(rid, ENOMEM);
+                        return;
+                }
+                memcpy(buf, &it.current->name, name_size);
+                *(buf+name_size) = 0;
+                found = true;
+                (void) async_data_read_finalize(callid, buf, name_size+1);
+                free(buf);
+                break;
                 
 skip:
@@ -884 +876 @@
         }
         
+        if (found) {
+                rc = ext2_directory_iterator_next(&it);
+                if (rc != EOK) {
+                        async_answer_0(rid, rc);
+                        return;
+                }
+                next = it.current_offset;
+        }
+        
         rc = ext2_directory_iterator_fini(&it);
         if (rc != EOK) {
@@ -891 +892 @@
         
         if (found) {
-                async_answer_1(rid, EOK, 1);
+                async_answer_1(rid, EOK, next-pos);
         }
         else {