Both of these commands were subtly broken. Fortunately when used together the

damage was only ugly fscks.  Reverted to the static inline code so they work
correctly again,
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@1071 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 6 insertions, 2 deletions

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 1bbccd978..fafcc230e 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -242,8 +242,12 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
 static int used_good_blocks = 0;
 static unsigned long req_nr_inodes = 0;
 
-#define inode_in_use(x) (isset(inode_map,(x)))
-#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
+static inline int bit(char * a,unsigned int i)
+{
+          return (a[i >> 3] & (1<<(i & 7))) != 0;
+}
+#define inode_in_use(x) (bit(inode_map,(x)))
+#define zone_in_use(x) (bit(zone_map,(x)-FIRSTZONE+1))
 
 #define mark_inode(x) (setbit(inode_map,(x)))
 #define unmark_inode(x) (clrbit(inode_map,(x)))