summaryrefslogtreecommitdiff
path: root/util-linux/mkfs_minix.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-10-24 05:00:29 +0000
committerEric Andersen <andersen@codepoet.org>2001-10-24 05:00:29 +0000
commitbdfd0d78bc44e73d693510e70087857785b3b521 (patch)
tree153a573095afac8d8d0ea857759ecabd77fb28b7 /util-linux/mkfs_minix.c
parent9260fc5552a3ee52eb95823aa6689d52a1ffd33c (diff)
downloadbusybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.gz
busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.tar.bz2
busybox-w32-bdfd0d78bc44e73d693510e70087857785b3b521.zip
Major rework of the directory structure and the entire build system.
-Erik
Diffstat (limited to 'util-linux/mkfs_minix.c')
-rw-r--r--util-linux/mkfs_minix.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index ccc0e85d7..a388d0ab0 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -180,7 +180,7 @@ struct minix_dir_entry {
180 180
181#define UPPER(size,n) (((size)+((n)-1))/(n)) 181#define UPPER(size,n) (((size)+((n)-1))/(n))
182#define INODE_SIZE (sizeof(struct minix_inode)) 182#define INODE_SIZE (sizeof(struct minix_inode))
183#ifdef BB_FEATURE_MINIX2 183#ifdef CONFIG_FEATURE_MINIX2
184#define INODE_SIZE2 (sizeof(struct minix2_inode)) 184#define INODE_SIZE2 (sizeof(struct minix2_inode))
185#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \ 185#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
186 : MINIX_INODES_PER_BLOCK)) 186 : MINIX_INODES_PER_BLOCK))
@@ -208,7 +208,7 @@ static char root_block[BLOCK_SIZE] = "\0";
208static char *inode_buffer = NULL; 208static char *inode_buffer = NULL;
209 209
210#define Inode (((struct minix_inode *) inode_buffer)-1) 210#define Inode (((struct minix_inode *) inode_buffer)-1)
211#ifdef BB_FEATURE_MINIX2 211#ifdef CONFIG_FEATURE_MINIX2
212#define Inode2 (((struct minix2_inode *) inode_buffer)-1) 212#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
213#endif 213#endif
214static char super_block_buffer[BLOCK_SIZE]; 214static char super_block_buffer[BLOCK_SIZE];
@@ -216,7 +216,7 @@ static char boot_block_buffer[512];
216 216
217#define Super (*(struct minix_super_block *)super_block_buffer) 217#define Super (*(struct minix_super_block *)super_block_buffer)
218#define INODES ((unsigned long)Super.s_ninodes) 218#define INODES ((unsigned long)Super.s_ninodes)
219#ifdef BB_FEATURE_MINIX2 219#ifdef CONFIG_FEATURE_MINIX2
220#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones)) 220#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
221#else 221#else
222#define ZONES ((unsigned long)(Super.s_nzones)) 222#define ZONES ((unsigned long)(Super.s_nzones))
@@ -436,7 +436,7 @@ static void make_bad_inode(void)
436 write_block(dind, (char *) dind_block); 436 write_block(dind, (char *) dind_block);
437} 437}
438 438
439#ifdef BB_FEATURE_MINIX2 439#ifdef CONFIG_FEATURE_MINIX2
440static void make_bad_inode2(void) 440static void make_bad_inode2(void)
441{ 441{
442 struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; 442 struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
@@ -509,7 +509,7 @@ static void make_root_inode(void)
509 write_block(inode->i_zone[0], root_block); 509 write_block(inode->i_zone[0], root_block);
510} 510}
511 511
512#ifdef BB_FEATURE_MINIX2 512#ifdef CONFIG_FEATURE_MINIX2
513static void make_root_inode2(void) 513static void make_root_inode2(void)
514{ 514{
515 struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; 515 struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
@@ -550,7 +550,7 @@ static void setup_tables(void)
550 else 550 else
551 inodes = req_nr_inodes; 551 inodes = req_nr_inodes;
552 /* Round up inode count to fill block size */ 552 /* Round up inode count to fill block size */
553#ifdef BB_FEATURE_MINIX2 553#ifdef CONFIG_FEATURE_MINIX2
554 if (version2) 554 if (version2)
555 inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) & 555 inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
556 ~(MINIX2_INODES_PER_BLOCK - 1)); 556 ~(MINIX2_INODES_PER_BLOCK - 1));
@@ -699,7 +699,7 @@ extern int mkfs_minix_main(int argc, char **argv)
699 699
700 if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) 700 if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
701 error_msg_and_die("bad inode size"); 701 error_msg_and_die("bad inode size");
702#ifdef BB_FEATURE_MINIX2 702#ifdef CONFIG_FEATURE_MINIX2
703 if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) 703 if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
704 error_msg_and_die("bad inode size"); 704 error_msg_and_die("bad inode size");
705#endif 705#endif
@@ -764,7 +764,7 @@ extern int mkfs_minix_main(int argc, char **argv)
764 break; 764 break;
765 } 765 }
766 case 'v': 766 case 'v':
767#ifdef BB_FEATURE_MINIX2 767#ifdef CONFIG_FEATURE_MINIX2
768 version2 = 1; 768 version2 = 1;
769#else 769#else
770 error_msg("%s: not compiled with minix v2 support", 770 error_msg("%s: not compiled with minix v2 support",
@@ -796,7 +796,7 @@ goodbye:
796 if (!device_name || BLOCKS < 10) { 796 if (!device_name || BLOCKS < 10) {
797 show_usage(); 797 show_usage();
798 } 798 }
799#ifdef BB_FEATURE_MINIX2 799#ifdef CONFIG_FEATURE_MINIX2
800 if (version2) { 800 if (version2) {
801 if (namelen == 14) 801 if (namelen == 14)
802 magic = MINIX2_SUPER_MAGIC; 802 magic = MINIX2_SUPER_MAGIC;
@@ -830,7 +830,7 @@ goodbye:
830 check_blocks(); 830 check_blocks();
831 else if (listfile) 831 else if (listfile)
832 get_list_blocks(listfile); 832 get_list_blocks(listfile);
833#ifdef BB_FEATURE_MINIX2 833#ifdef CONFIG_FEATURE_MINIX2
834 if (version2) { 834 if (version2) {
835 make_root_inode2(); 835 make_root_inode2();
836 make_bad_inode2(); 836 make_bad_inode2();