just include fcntl.h not sys/fcntl.h

[oweals/busybox.git] / util-linux / mkfs_minix.c

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 264569a94880afbc2c5a62ff6d1e181bfc6232b0..d9388b1d7ef05cd37661a9783d2111079d2400d8 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -192,21 +192,21 @@ struct minix_dir_entry {
 
 #define BITS_PER_BLOCK (BLOCK_SIZE<<3)
 
-static char *device_name = NULL;
+static char *device_name;
 static int DEV = -1;
-static uint32_t BLOCKS = 0;
-static int check = 0;
-static int badblocks = 0;
+static uint32_t BLOCKS;
+static int check;
+static int badblocks;
 static int namelen = 30;               /* default (changed to 30, per Linus's
 
                                                                   suggestion, Sun Nov 21 08:05:07 1993) */
 static int dirsize = 32;
 static int magic = MINIX_SUPER_MAGIC2;
-static int version2 = 0;
+static int version2;
 
-static char root_block[BLOCK_SIZE] = "\0";
+static char root_block[BLOCK_SIZE];
 
-static char *inode_buffer = NULL;
+static char *inode_buffer;
 
 #define Inode (((struct minix_inode *) inode_buffer)-1)
 #ifdef CONFIG_FEATURE_MINIX2
@@ -234,8 +234,8 @@ static char *inode_map;
 static char *zone_map;
 
 static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
-static int used_good_blocks = 0;
-static unsigned long req_nr_inodes = 0;
+static int used_good_blocks;
+static unsigned long req_nr_inodes;
 
 static inline int bit(char * a,unsigned int i)
 {
@@ -307,8 +307,7 @@ static inline int get_size(const char *file)
        int fd;
        long size;
 
-       if ((fd = open(file, O_RDWR)) < 0)
-               bb_perror_msg_and_die("%s", file);
+       fd = bb_xopen3(file, O_RDWR, 0);
        if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
                close(fd);
                return (size * 512);
@@ -632,7 +631,7 @@ static inline long do_check(char *buffer, int try, unsigned int current_block)
        return got;
 }
 
-static unsigned int currently_testing = 0;
+static unsigned int currently_testing;
 
 static void alarm_intr(int alnum)
 {
@@ -694,7 +693,7 @@ static void get_list_blocks(char *filename)
                printf("one bad block\n");
 }
 
-extern int mkfs_minix_main(int argc, char **argv)
+int mkfs_minix_main(int argc, char **argv)
 {
        int i=1;
        char *tmp;
@@ -821,9 +820,7 @@ goodbye:
        tmp += dirsize;
        *(short *) tmp = 2;
        strcpy(tmp + 2, ".badblocks");
-       DEV = open(device_name, O_RDWR);
-       if (DEV < 0)
-               bb_error_msg_and_die("unable to open %s", device_name);
+       DEV = bb_xopen3(device_name, O_RDWR, 0);
        if (fstat(DEV, &statbuf) < 0)
                bb_error_msg_and_die("unable to stat %s", device_name);
        if (!S_ISBLK(statbuf.st_mode))
@@ -847,6 +844,6 @@ goodbye:
        }
        mark_good_blocks();
        write_tables();
-       return( 0);
+       return 0;
 
 }