Changeset 3f3e5b5 in mainline

Timestamp:

2011-07-07T18:07:31Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

367d67fe

Parents:

b89281b

Message:

The first two dentries (dot and dotdot) must be ignored from the mfs_has_children() function

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -539 +539 @@
         r = mfs_has_children(&has_children, cfn);
         on_error(r, return r);
+
         if (has_children)
                 return ENOTEMPTY;
@@ -570 +571 @@
         /* The first two dentries are always . and .. */
         unsigned i;
-        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+        for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = read_directory_entry(mnode, &d_info, i);
                 on_error(r, return r);
@@ -623 +624 @@
                 struct mfs_sb_info *sbi = mnode->instance->sbi;
 
-                unsigned i;
-                for (i = pos; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+                for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) {
                         rc = read_directory_entry(mnode, &d_info, pos);
                         on_error(rc, goto out_error);
@@ -632 +632 @@
                                 goto found;
                         }
-                        pos++;
                 }