Changeset 84226f0 in mainline

Timestamp:

2011-03-09T15:06:31Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

e2abab03

Parents:

a210bc7

Message:

ext2fs: Check for dot filenames in the other place too

File:

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

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -76 +76 @@
 static void ext2fs_read_file(ipc_callid_t, ipc_callid_t, aoff64_t,
         size_t, ext2fs_instance_t *, ext2_inode_ref_t *);
+static bool ext2fs_is_dots(const uint8_t *, size_t);
 
 /*
@@ -337 +338 @@
         int rc;
         bool found = false;
+        size_t name_size;
 
         fs = enode->instance->filesystem;
@@ -356 +358 @@
         while (it.current != NULL) {
                 if (it.current->inode != 0) {
-                        found = true;
-                        break;
+                        name_size = ext2_directory_entry_ll_get_name_length(fs->superblock,
+                                it.current);
+                        if (!ext2fs_is_dots(&it.current->name, name_size)) {
+                                found = true;
+                                break;
+                        }
                 }
                 
@@ -625 +631 @@
 }
 
+/**
+ * Determine whether given directory entry name is . or ..
+ */
+bool ext2fs_is_dots(const uint8_t *name, size_t name_size) {
+        if (name_size == 1 && name[0] == '.') {
+                return true;
+        }
+        
+        if (name_size == 2 && name[0] == '.' && name[1] == '.') {
+                return true;
+        }
+        
+        return false;
+}
+
 void ext2fs_read_directory(ipc_callid_t rid, ipc_callid_t callid, aoff64_t pos,
         size_t size, ext2fs_instance_t *inst, ext2_inode_ref_t *inode_ref)
@@ -657 +678 @@
                 
                 // skip . and ..
-                if ((name_size == 1 || name_size == 2) && it.current->name == '.') {
-                        if (name_size == 1) {
-                                goto skip;
-                        }
-                        else if (name_size == 2 && *(&it.current->name+1) == '.') {
-                                goto skip;
-                        }
+                if (ext2fs_is_dots(&it.current->name, name_size)) {
+                        goto skip;
                 }