Make cin be static

[oweals/busybox.git] / mkfs_minix.c

diff --git a/mkfs_minix.c b/mkfs_minix.c
index dec310d3072a419611c159fb8c08b900a1424a27..e1ede6caa3357ba3c8ec4920aceb39498d5f7677 100644 (file)
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -62,7 +62,7 @@
  *     removed getopt based parser and added a hand rolled one.
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
@@ -72,7 +72,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <termios.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <mntent.h>
@@ -175,10 +174,6 @@ struct minix_dir_entry {
 #endif
 
 
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
-#endif
-
 #ifndef __linux__
 #define volatile
 #endif
@@ -191,7 +186,7 @@ struct minix_dir_entry {
 
 #define UPPER(size,n) (((size)+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 #define INODE_SIZE2 (sizeof(struct minix2_inode))
 #define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
                                    : MINIX_INODES_PER_BLOCK))
@@ -219,7 +214,7 @@ static char root_block[BLOCK_SIZE] = "\0";
 static char *inode_buffer = NULL;
 
 #define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 #define Inode2 (((struct minix2_inode *) inode_buffer)-1)
 #endif
 static char super_block_buffer[BLOCK_SIZE];
@@ -227,7 +222,7 @@ static char boot_block_buffer[512];
 
 #define Super (*(struct minix_super_block *)super_block_buffer)
 #define INODES ((unsigned long)Super.s_ninodes)
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
 #else
 #define ZONES ((unsigned long)(Super.s_nzones))
@@ -247,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)))
@@ -263,7 +262,7 @@ static unsigned long req_nr_inodes = 0;
  */
 static volatile void die(char *str)
 {
-       errorMsg("%s\n", str);
+       error_msg("%s\n", str);
        exit(8);
 }
 
@@ -330,11 +329,8 @@ static int get_size(const char *file)
        int fd;
        long size;
 
-       fd = open(file, O_RDWR);
-       if (fd < 0) {
-               perror(file);
-               exit(1);
-       }
+       if ((fd = open(file, O_RDWR)) < 0)
+               perror_msg_and_die("%s", file);
        if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
                close(fd);
                return (size * 512);
@@ -463,7 +459,7 @@ static void make_bad_inode(void)
                write_block(dind, (char *) dind_block);
 }
 
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 static void make_bad_inode2(void)
 {
        struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
@@ -536,7 +532,7 @@ static void make_root_inode(void)
        write_block(inode->i_zone[0], root_block);
 }
 
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
 static void make_root_inode2(void)
 {
        struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
@@ -577,7 +573,7 @@ static void setup_tables(void)
        else
                inodes = req_nr_inodes;
        /* Round up inode count to fill block size */
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
        if (version2)
                inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
                                  ~(MINIX2_INODES_PER_BLOCK - 1));
@@ -729,7 +725,7 @@ extern int mkfs_minix_main(int argc, char **argv)
 
        if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
                die("bad inode size");
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
        if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
                die("bad inode size");
 #endif
@@ -794,10 +790,10 @@ extern int mkfs_minix_main(int argc, char **argv)
                                                        break;
                                                }
                                        case 'v':
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
                                                version2 = 1;
 #else
-                                               errorMsg("%s: not compiled with minix v2 support\n",
+                                               error_msg("%s: not compiled with minix v2 support\n",
                                                                device_name);
                                                exit(-1);
 #endif
@@ -826,7 +822,7 @@ goodbye:
        if (!device_name || BLOCKS < 10) {
                show_usage();
        }
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
        if (version2) {
                if (namelen == 14)
                        magic = MINIX2_SUPER_MAGIC;
@@ -860,7 +856,7 @@ goodbye:
                check_blocks();
        else if (listfile)
                get_list_blocks(listfile);
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
        if (version2) {
                make_root_inode2();
                make_bad_inode2();