Changeset bd64680 in mainline

Timestamp:

2011-03-31T19:29:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2cada66

Parents:

147c9f6

Message:

Link mfs_match() to the libfs_ops structure

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_ops.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -43 +43 @@
 
 #define DEBUG_MODE
+
+#define min(a, b)       ((a) < (b) ? (a) : (b))
 
 #ifdef DEBUG_MODE
@@ -89 +91 @@
         int ino_per_block;
         int dirsize;
+        unsigned max_name_len;
         bool long_names;
         bool native;

uspace/srv/fs/minixfs/mfs_ops.c

@@ -55 +55 @@
 static devmap_handle_t mfs_device_get(fs_node_t *fsnode);
 static aoff64_t mfs_size_get(fs_node_t *node);
+static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
 
 static
@@ -74 +75 @@
         .node_open = mfs_node_open,
         .index_get = mfs_index_get,
+        .match = mfs_match,
         .plb_get_char = mfs_plb_get_char,
         .has_children = mfs_has_children,
@@ -190 +192 @@
                 sbi->block_size = conv16(native, sb3->s_block_size);
                 sbi->dirsize = MFS3_DIRSIZE;
+                sbi->max_name_len = MFS3_MAX_NAME_LEN;
         } else {
                 sbi->ninodes = conv16(native, sb->s_ninodes);
@@ -202 +205 @@
                         sbi->nzones = conv32(native, sb->s_nzones2);
                 sbi->dirsize = longnames ? MFSL_DIRSIZE : MFS_DIRSIZE;
+                sbi->max_name_len = longnames ? MFS_L_MAX_NAME_LEN :
+                                MFS_MAX_NAME_LEN;
         }
  
@@ -238 +243 @@
         struct mfs_node *node = fsnode->data;
         return node->instance->handle;
+}
+
+static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
+{
+        struct mfs_node *mnode = pfn->data;
+        struct mfs_ino_info *ino_i = mnode->ino_i;
+        struct mfs_dentry_info *d_info;
+
+        if (!S_ISDIR(ino_i->i_mode))
+                return ENOTDIR;
+
+        mfsdebug("mfs_match()\n");
+
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
+        const size_t comp_size = str_size(component);
+
+        int i = 2;
+        while (1) {
+                d_info = read_directory_entry(mnode, i++);
+                if (!d_info) {
+                        /*Reached the end of the directory entry list*/
+                        break;
+                }
+
+                if (!d_info->d_inum) {
+                        /*This entry is not used*/
+                        continue;
+                }
+
+                if (!bcmp(component, d_info->d_name, min(sbi->max_name_len,
+                                comp_size))) {
+                        /*Hit!*/
+                        mfs_node_core_get(rfn, mnode->instance,
+                                d_info->d_inum);
+                        goto found;
+                }
+        }
+        *rfn = NULL;
+        return ENOENT;
+found:
+        return EOK;
 }
 
@@ -475 +521 @@
 
         for (link = inst_list.next; link != &inst_list; link = link->next) {
-                instance_ptr = list_get_instance(link, struct mfs_instance, link);
+                instance_ptr = list_get_instance(link, struct mfs_instance,
+                                link);
                 
                 if (instance_ptr->handle == handle) {