Allow short reads as we are looping anyway.

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

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 9a53a705e60a11ec3a9123c189ffd2b227fd7fe3..dbe4f74b3c7fa0dc0e1a2d63cb9d3eaa135ec1d1 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -98,12 +98,6 @@
 #include <sys/param.h>
 #include "busybox.h"
 
- 
- typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
-
 static const int MINIX_ROOT_INO = 1;
 static const int MINIX_LINK_MAX = 250;
 static const int MINIX2_LINK_MAX = 65530;
@@ -130,13 +124,13 @@ static const int MINIX_V2 = 0x0002;               /* minix V2 fs */
  * Note the 8-bit gid and atime and ctime.
  */
 struct minix_inode {
-       u16 i_mode;
-       u16 i_uid;
-       u32 i_size;
-       u32 i_time;
-       u8  i_gid;
-       u8  i_nlinks;
-       u16 i_zone[9];
+       u_int16_t i_mode;
+       u_int16_t i_uid;
+       u_int32_t i_size;
+       u_int32_t i_time;
+       u_int8_t  i_gid;
+       u_int8_t  i_nlinks;
+       u_int16_t i_zone[9];
 };
 
 /*
@@ -146,35 +140,35 @@ struct minix_inode {
  * now 16-bit. The inode is now 64 bytes instead of 32.
  */
 struct minix2_inode {
-       u16 i_mode;
-       u16 i_nlinks;
-       u16 i_uid;
-       u16 i_gid;
-       u32 i_size;
-       u32 i_atime;
-       u32 i_mtime;
-       u32 i_ctime;
-       u32 i_zone[10];
+       u_int16_t i_mode;
+       u_int16_t i_nlinks;
+       u_int16_t i_uid;
+       u_int16_t i_gid;
+       u_int32_t i_size;
+       u_int32_t i_atime;
+       u_int32_t i_mtime;
+       u_int32_t i_ctime;
+       u_int32_t i_zone[10];
 };
 
 /*
  * minix super-block data on disk
  */
 struct minix_super_block {
-       u16 s_ninodes;
-       u16 s_nzones;
-       u16 s_imap_blocks;
-       u16 s_zmap_blocks;
-       u16 s_firstdatazone;
-       u16 s_log_zone_size;
-       u32 s_max_size;
-       u16 s_magic;
-       u16 s_state;
-       u32 s_zones;
+       u_int16_t s_ninodes;
+       u_int16_t s_nzones;
+       u_int16_t s_imap_blocks;
+       u_int16_t s_zmap_blocks;
+       u_int16_t s_firstdatazone;
+       u_int16_t s_log_zone_size;
+       u_int32_t s_max_size;
+       u_int16_t s_magic;
+       u_int16_t s_state;
+       u_int32_t s_zones;
 };
 
 struct minix_dir_entry {
-       u16 inode;
+       u_int16_t inode;
        char name[0];
 };
 
@@ -197,7 +191,7 @@ static const int ROOT_INO = 1;
 
 #define UPPER(size,n) ((size+((n)-1))/(n))
 #define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 #define INODE_SIZE2 (sizeof(struct minix2_inode))
 #define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
                                    : MINIX_INODES_PER_BLOCK))
@@ -238,7 +232,7 @@ static char super_block_buffer[BLOCK_SIZE];
 
 #define Super (*(struct minix_super_block *)super_block_buffer)
 #define INODES ((unsigned long)Super.s_ninodes)
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
 #else
 #define ZONES ((unsigned long)(Super.s_nzones))
@@ -258,7 +252,7 @@ static unsigned char *inode_count = NULL;
 static unsigned char *zone_count = NULL;
 
 static void recursive_check(unsigned int ino);
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void recursive_check2(unsigned int ino);
 #endif
 
@@ -414,7 +408,7 @@ static int check_zone_nr(unsigned short *nr, int *corrected)
        return 0;
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static int check_zone_nr2(unsigned int *nr, int *corrected)
 {
        if (!*nr)
@@ -521,7 +515,7 @@ static int map_block(struct minix_inode *inode, unsigned int blknr)
        return result;
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static int map_block2(struct minix2_inode *inode, unsigned int blknr)
 {
        unsigned int ind[BLOCK_SIZE >> 2];
@@ -619,7 +613,7 @@ static void get_dirsize(void)
        char blk[BLOCK_SIZE];
        int size;
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
        if (version2)
                block = Inode2[ROOT_INO].i_zone[0];
        else
@@ -650,7 +644,7 @@ static void read_superblock(void)
                namelen = 30;
                dirsize = 32;
                version2 = 0;
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
        } else if (MAGIC == MINIX2_SUPER_MAGIC) {
                namelen = 14;
                dirsize = 16;
@@ -701,7 +695,7 @@ static void read_tables(void)
        }
 }
 
-struct minix_inode *get_inode(unsigned int nr)
+static struct minix_inode *get_inode(unsigned int nr)
 {
        struct minix_inode *inode;
 
@@ -748,8 +742,8 @@ struct minix_inode *get_inode(unsigned int nr)
        return inode;
 }
 
-#ifdef BB_FEATURE_MINIX2
-struct minix2_inode *get_inode2(unsigned int nr)
+#ifdef CONFIG_FEATURE_MINIX2
+static struct minix2_inode *get_inode2(unsigned int nr)
 {
        struct minix2_inode *inode;
 
@@ -804,7 +798,7 @@ static void check_root(void)
                die("root inode isn't a directory");
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void check_root2(void)
 {
        struct minix2_inode *inode = Inode2 + ROOT_INO;
@@ -847,7 +841,7 @@ static int add_zone(unsigned short *znr, int *corrected)
        return block;
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static int add_zone2(unsigned int *znr, int *corrected)
 {
        int result;
@@ -898,7 +892,7 @@ static void add_zone_ind(unsigned short *znr, int *corrected)
                write_block(block, blk);
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void add_zone_ind2(unsigned int *znr, int *corrected)
 {
        static char blk[BLOCK_SIZE];
@@ -932,7 +926,7 @@ static void add_zone_dind(unsigned short *znr, int *corrected)
                write_block(block, blk);
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void add_zone_dind2(unsigned int *znr, int *corrected)
 {
        static char blk[BLOCK_SIZE];
@@ -983,7 +977,7 @@ static void check_zones(unsigned int i)
        add_zone_dind(8 + inode->i_zone, &changed);
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void check_zones2(unsigned int i)
 {
        struct minix2_inode *inode;
@@ -1068,7 +1062,7 @@ static void check_file(struct minix_inode *dir, unsigned int offset)
        return;
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void check_file2(struct minix2_inode *dir, unsigned int offset)
 {
        static char blk[BLOCK_SIZE];
@@ -1149,7 +1143,7 @@ static void recursive_check(unsigned int ino)
                check_file(dir, offset);
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void recursive_check2(unsigned int ino)
 {
        struct minix2_inode *dir;
@@ -1227,7 +1221,7 @@ static void check_counts(void)
        }
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void check_counts2(void)
 {
        int i;
@@ -1289,7 +1283,7 @@ static void check(void)
        check_counts();
 }
 
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
 static void check2(void)
 {
        memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count));
@@ -1311,7 +1305,7 @@ static void alloc_name_list(void)
                name_list[i] = xmalloc(sizeof(char) * BUFSIZ + 1);
 }
 
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
 /* execute this atexit() to deallocate name_list[] */
 /* piptigger was here */
 static void free_name_list(void)
@@ -1336,7 +1330,7 @@ extern int fsck_minix_main(int argc, char **argv)
        int retcode = 0;
 
        alloc_name_list();
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
        /* Don't bother to free memory.  Exit does
         * that automagically, so we can save a few bytes */
        atexit(free_name_list);
@@ -1344,7 +1338,7 @@ extern int fsck_minix_main(int argc, char **argv)
 
        if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
                die("bad inode size");
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
        if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
                die("bad v2 inode size");
 #endif
@@ -1428,7 +1422,7 @@ extern int fsck_minix_main(int argc, char **argv)
                tcsetattr(0, TCSANOW, &tmp);
                termios_set = 1;
        }
-#ifdef BB_FEATURE_MINIX2
+#ifdef CONFIG_FEATURE_MINIX2
        if (version2) {
                check_root2();
                check2();
@@ -1439,18 +1433,18 @@ extern int fsck_minix_main(int argc, char **argv)
                check();
        }
        if (verbose) {
-               int i, free;
+               int i, free_cnt;
 
-               for (i = 1, free = 0; i <= INODES; i++)
+               for (i = 1, free_cnt = 0; i <= INODES; i++)
                        if (!inode_in_use(i))
-                               free++;
-               printf("\n%6ld inodes used (%ld%%)\n", (INODES - free),
-                          100 * (INODES - free) / INODES);
-               for (i = FIRSTZONE, free = 0; i < ZONES; i++)
+                               free_cnt++;
+               printf("\n%6ld inodes used (%ld%%)\n", (INODES - free_cnt),
+                          100 * (INODES - free_cnt) / INODES);
+               for (i = FIRSTZONE, free_cnt = 0; i < ZONES; i++)
                        if (!zone_in_use(i))
-                               free++;
-               printf("%6ld zones used (%ld%%)\n", (ZONES - free),
-                          100 * (ZONES - free) / ZONES);
+                               free_cnt++;
+               printf("%6ld zones used (%ld%%)\n", (ZONES - free_cnt),
+                          100 * (ZONES - free_cnt) / ZONES);
                printf("\n%6d regular files\n"
                           "%6d directories\n"
                           "%6d character device files\n"