Changeset fd282ad in mainline

Timestamp:

2011-03-08T18:10:20Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c64506b

Parents:

3c616f6

Message:

Insert directory entries . and .. in root dir

File:

• uspace/app/mkminix/mkminix.c (modified) (9 diffs)

uspace/app/mkminix/mkminix.c

@@ -48 +48 @@
 #include <getopt.h>
 #include <mem.h>
+#include <str.h>
 #include <minix.h>
 
@@ -56 +57 @@
 
 #define UPPER(n, size) (((n) / (size)) + (((n) % (size)) != 0))
+#define NEXT_DENTRY(p, dirsize) (p += dirsize)
 
 typedef enum {
@@ -75 +77 @@
         int log2_zone_size;
         int ino_per_block;
+        int dirsize;
         uint32_t max_file_size;
         uint16_t magic;
@@ -92 +95 @@
 static void     make_root_ino3(struct mfs_sb_info *sb);
 static void     mark_bmap(uint32_t *bmap, int idx, int v);
+static void     insert_dentries(struct mfs_sb_info *sb);
 
 static struct option const long_options[] = {
@@ -137 +141 @@
                         sb.fs_version = 1;
                         sb.ino_per_block = V1_INODES_PER_BLOCK;
+                        sb.dirsize = MFS_DIRSIZE;
                         break;
                 case '2':
@@ -143 +148 @@
                         sb.fs_version = 2;
                         sb.ino_per_block = V2_INODES_PER_BLOCK;
+                        sb.dirsize = MFS_DIRSIZE;
                         break;
                 case '3':
@@ -148 +154 @@
                         sb.fs_version = 3;
                         sb.block_size = MFS_MAX_BLOCKSIZE;
+                        sb.dirsize = MFS3_DIRSIZE;
                         break;
                 case 'b':
@@ -157 +164 @@
                 case 'l':
                         sb.longnames = true;
+                        sb.dirsize = MFSL_DIRSIZE;
                         break;
                 }
@@ -232 +240 @@
         init_inode_table(&sb);
 
+        /*Insert directory entries . and ..*/
+        insert_dentries(&sb);
+
         return 0;
+}
+
+static void insert_dentries(struct mfs_sb_info *sb)
+{
+        void *root_block;
+        const long root_dblock = sb->first_data_zone * (sb->block_size / MFS_MIN_BLOCKSIZE);
+
+        root_block = (void *) malloc(MFS_MIN_BLOCKSIZE);
+        
+        if (sb->fs_version != 3) {
+                /*Directories entry for V1/V2 filesystem*/
+                struct mfs_dentry *dentry = root_block;
+
+                dentry->d_inum = MFS_ROOT_INO;
+                str_cpy(dentry->d_name, 1, ".");
+
+                NEXT_DENTRY(dentry, sb->dirsize);
+
+                dentry->d_inum = MFS_ROOT_INO;
+                str_cpy(dentry->d_name, 2, "..");
+        } else {
+                /*Directories entry for V1/V2 filesystem*/
+                struct mfs3_dentry *dentry = root_block;
+
+                dentry->d_inum = MFS_ROOT_INO;
+                str_cpy(dentry->d_name, 1, ".");
+
+                NEXT_DENTRY(dentry, sb->dirsize);
+
+                dentry->d_inum = MFS_ROOT_INO;
+                str_cpy(dentry->d_name, 2, "..");
+        }
+
+        block_write_direct(sb->handle, root_dblock, 1, root_block);
+
+        free(root_block);
 }