Changeset fcce9e1 in mainline

Timestamp:

2011-03-18T18:47:16Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8b86ed26

Parents:

cfff7a8f

Message:

fix directory entries initialization

File:

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

uspace/app/mkminix/mkminix.c

@@ -57 +57 @@
 
 #define UPPER(n, size)                  (((n) / (size)) + (((n) % (size)) != 0))
-#define NEXT_DENTRY(p, dirsize)         (p += dirsize)
+#define NEXT_DENTRY(p, dirsize)         (p += (dirsize))
 
 typedef enum {
@@ -161 +161 @@
                         sb.block_size = MFS_MAX_BLOCKSIZE;
                         sb.dirsize = MFS3_DIRSIZE;
+                        sb.ino_per_block = V3_INODES_PER_BLOCK(sb.block_size);
                         break;
                 case 'b':
@@ -285 +286 @@
 {
         void *root_block;
+        uint8_t *dentry_ptr;
         int rc;
         const long root_dblock = sb->first_data_zone;
@@ -293 +295 @@
         if (!root_block)
                 return ENOMEM;
+
+        dentry_ptr = root_block;
         
         if (sb->fs_version != 3) {
@@ -301 +305 @@
                 memcpy(dentry->d_name, ".\0", 2);
 
-                NEXT_DENTRY(dentry, sb->dirsize);
+                dentry = (struct mfs_dentry *) NEXT_DENTRY(dentry_ptr,
+                                                        sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;
@@ -312 +317 @@
                 memcpy(dentry->d_name, ".\0", 2);
 
-                NEXT_DENTRY(dentry, sb->dirsize);
+                dentry = (struct mfs3_dentry *) NEXT_DENTRY(dentry_ptr,
+                                                        sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;