Changeset eaf9794 in mainline

Timestamp:

2011-03-03T19:40:43Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7413683

Parents:

e3675427

Message:

Add some comments to mkminix

Location:

uspace/app/mkminix

Files:

• mfs.h (modified) (1 diff)
• mkminix.c (modified) (6 diffs)

uspace/app/mkminix/mfs.h

@@ -62 +62 @@
 #define MFS_MAGIC_V3            0x4D5A
 #define MFS_MAGIC_V3R           0x5A4D
+
+#define MFS_VALID_FS            0x0001
+#define MFS_ERROR_FS            0x0002
 
 struct mfs_superblock {

uspace/app/mkminix/mkminix.c

@@ -83 +83 @@
         uint32_t block_size = MFS_MAX_BLOCK_SIZE;
         size_t devblock_size;
-        unsigned long total_inodes = 0;
+        unsigned long n_inodes = 0;
+
+        struct mfs_superblock *sb;
+        sb = (struct mfs_superblock *) malloc(sizeof(struct mfs_superblock));
 
         if (argc == 1) {
@@ -109 +112 @@
                         break;
                 case 'b':
-                        block_size = (unsigned long) strtol(optarg, NULL, 10);
+                        block_size = (uint32_t) strtol(optarg, NULL, 10);
                         break;
                 case 'i':
-                        total_inodes = (unsigned long) strtol(optarg, NULL, 10);
+                        n_inodes = (unsigned long) strtol(optarg, NULL, 10);
                         break;
                 }
@@ -120 +123 @@
                 printf(NAME ":Error! Invalid block size.\n");
                 exit(0);
-        } else if (num_of_set_bits((uint32_t) block_size) != 1) {
+        } else if (num_of_set_bits(block_size) != 1) {
+                /*Block size must be a power of 2.*/
                 printf(NAME ":Error! Invalid block size.\n");
                 exit(0);
@@ -129 +133 @@
         }
 
-        argc -= optind;
         argv += optind;
 
@@ -171 +174 @@
 
         printf("Creating Minix file system on device\n");
+
+        /*Prepare superblock*/
 
         return 0;
@@ -185 +190 @@
                 "-3         Make a Minix version 3 filesystem\n"
                 "-b ##      Specify the block size in bytes (V3 only),\n"
-                "           valid block size are 1024, 2048 and 4096 bytes per block\n"
+                "           valid block size values are 1024, 2048 and 4096 bytes per block\n"
                 "-i ##      Specify the number of inodes for the filesystem\n");
         }