Changeset c955be91 in mainline

Timestamp:

2011-06-23T18:33:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

53eb588

Parents:

01accb7

Message:

Add a function to remove a dentry from a given directory.

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_dentry.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -48 +48 @@
 #define NAME            "mfs"
 
-#define DEBUG_MODE
+//#define DEBUG_MODE
 
 #define min(a, b)       ((a) < (b) ? (a) : (b))
@@ -211 +211 @@
 
 extern int
+remove_dentry(struct mfs_node *mnode, const char *d_name);
+
+extern int
 insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum);
 

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -141 +141 @@
 
 int
+remove_dentry(struct mfs_node *mnode, const char *d_name)
+{
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
+        struct mfs_dentry_info *d_info;
+        int i, r;
+
+        const size_t name_len = str_size(d_name);
+
+        if (name_len > sbi->max_name_len)
+                return ENAMETOOLONG;
+
+        /*Search the directory entry to be removed*/
+        for (i = 0; ; ++i) {
+                r = read_directory_entry(mnode, &d_info, i);
+                on_error(r, return r);
+
+                if (!d_info) {
+                        /*Reached the end of the dentries list*/
+                        break;
+                }
+
+                if (!bcmp(d_info->d_name, d_name, name_len)) {
+                        d_info->d_inum = 0;
+                        r = write_dentry(d_info);
+                        return r;
+                }
+        }
+
+        return ENOENT;
+}
+
+int
 insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum)
 {
@@ -150 +182 @@
         const size_t name_len = str_size(d_name);
 
-        assert(name_len <= sbi->max_name_len);
+        if (name_len > sbi->max_name_len)
+                return ENAMETOOLONG;
 
         /*Search for an empty dentry*/