Changeset 13ecdac9 in mainline

Timestamp:

2011-05-30T20:00:24Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1affcdf3

Parents:

ff2e72e

Message:

Add support to directories (mkdir now works)

Location:

uspace/srv/fs/minixfs

Files:

• mfs_dentry.c (modified) (1 diff)
• mfs_ops.c (modified) (3 diffs)

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -154 +154 @@
         /*Search for an empty dentry*/
 
-        for (i = 2; ; ++i) {
+        for (i = 0; ; ++i) {
                 r = read_directory_entry(mnode, &d_info, i);
                 if (r != EOK)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -265 +265 @@
         on_error(r, return r);
 
-        if (flags & L_DIRECTORY) {
-                /*Not yet supported*/
-                return ENOTSUP;
-        }
-
         /*Alloc a new inode*/
         r = mfs_alloc_bit(inst, &inum, BMAP_INODE);
@@ -294 +289 @@
         }
 
-        ino_i->i_mode = S_IFREG;
+        if (flags & L_DIRECTORY)
+                ino_i->i_mode = S_IFDIR;
+        else
+                ino_i->i_mode = S_IFREG;
+
         ino_i->i_nlinks = 1;
         ino_i->i_uid = 0;
@@ -527 +526 @@
 
         int r = insert_dentry(parent, name, child->ino_i->index);
-
+        on_error(r, goto exit_error);
+
+        if (S_ISDIR(child->ino_i->i_mode)) {
+                r = insert_dentry(child, ".", child->ino_i->index);
+                on_error(r, goto exit_error);
+                r = insert_dentry(child, "..", parent->ino_i->index);
+        }
+
+exit_error:
         return r;
 }