X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffsck_minix.c;h=c0dda2f1fef1492f4277a56e5f7e89e498de9b10;hb=cc9962d7fb3bcd109f02fdaf76028d8e87e11951;hp=f764597e3500f315ad6f85f5f26209565776b7ea;hpb=3ea66a805d4d10a66cf5b5422f44dca0bbdd0b18;p=oweals%2Fbusybox.git diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index f764597e3..c0dda2f1f 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -2,8 +2,9 @@ /* * fsck.c - a file system consistency checker for Linux. * - * (C) 1991, 1992 Linus Torvalds. This file may be redistributed - * as per the GNU copyleft. + * (C) 1991, 1992 Linus Torvalds. + * + * Licensed under GPLv2, see file LICENSE in this tarball for details. */ /* @@ -86,20 +87,8 @@ * enforced (but it's not much fun on a character device :-). */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "busybox.h" - -#define BLOCK_SIZE_BITS 10 -#define BLOCK_SIZE (1< /* * This is the original minix inode layout on disk. @@ -215,10 +204,10 @@ static int changed; /* flags if the filesystem has been changed */ static int errors_uncorrected; /* flag if some error was not corrected */ static int dirsize = 16; static int namelen = 14; -static int version2; static struct termios termios; static int termios_set; +static char *inode_buffer; #define Inode (((struct minix_inode *) inode_buffer)-1) #define Inode2 (((struct minix2_inode *) inode_buffer)-1) static char super_block_buffer[BLOCK_SIZE]; @@ -226,6 +215,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 CONFIG_FEATURE_MINIX2 +static int version2; #define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones)) #else #define ZONES ((unsigned long)(Super.s_nzones)) @@ -249,7 +239,7 @@ static void recursive_check(unsigned int ino); static void recursive_check2(unsigned int ino); #endif -static inline int bit(char * a,unsigned int i) +static int bit(char *a, unsigned int i) { return (a[i >> 3] & (1<<(i & 7))) != 0; } @@ -284,7 +274,7 @@ static char *name_component[MAX_DEPTH+1]; /* Wed Feb 9 15:17:06 MST 2000 */ /* dynamically allocate name_list (instead of making it static) */ -static inline void alloc_current_name(void) +static void alloc_current_name(void) { current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1)); current_name[0] = '/'; @@ -295,7 +285,7 @@ static inline void alloc_current_name(void) #ifdef CONFIG_FEATURE_CLEAN_UP /* execute this atexit() to deallocate name_list[] */ /* piptigger was here */ -static inline void free_current_name(void) +static void free_current_name(void) { free(current_name); } @@ -401,7 +391,7 @@ static void check_mount(void) else close(fd); - printf("%s is mounted. ", device_name); + printf("%s is mounted. ", device_name); cont = 0; if (isatty(0) && isatty(1)) cont = ask("Do you really want to continue", 0); @@ -429,7 +419,7 @@ static int check_zone_nr2(uint32_t *nr, int *corrected) msg = ">= ZONES"; else return *nr; - printf("Zone nr %s in file '%s'.", msg, current_name); + printf("Zone nr %s in file '%s'. ", msg, current_name); if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; @@ -455,12 +445,13 @@ static void read_block(unsigned int nr, char *addr) return; } if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { - printf("Read error: unable to seek to block in file '%s'\n", - current_name); + printf("%s: unable to seek to block in file '%s'\n", + bb_msg_read_error, current_name); errors_uncorrected = 1; memset(addr, 0, BLOCK_SIZE); } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) { - printf("Read error: bad block in file '%s'\n", current_name); + printf("%s: bad block in file '%s'\n", + bb_msg_read_error, current_name); errors_uncorrected = 1; memset(addr, 0, BLOCK_SIZE); } @@ -480,9 +471,10 @@ static void write_block(unsigned int nr, char *addr) return; } if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) - die("seek failed in write_block"); + die("Seek failed in write_block"); if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) { - printf("Write error: bad block in file '%s'\n", current_name); + printf("%s: bad block in file '%s'\n", + bb_msg_write_error, current_name); errors_uncorrected = 1; } } @@ -599,9 +591,9 @@ static void write_super_block(void) Super.s_state &= ~MINIX_ERROR_FS; if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET)) - die("seek failed in write_super_block"); + die("Seek failed in write_super_block"); if (BLOCK_SIZE != write(IN, super_block_buffer, BLOCK_SIZE)) - die("unable to write super-block"); + die("Unable to write super-block"); } static void write_tables(void) @@ -642,9 +634,9 @@ static void get_dirsize(void) static void read_superblock(void) { if (BLOCK_SIZE != lseek(IN, BLOCK_SIZE, SEEK_SET)) - die("seek failed"); + die("Seek failed"); if (BLOCK_SIZE != read(IN, super_block_buffer, BLOCK_SIZE)) - die("unable to read super block"); + die("Unable to read super block"); /* already initialized to: namelen = 14; dirsize = 16; @@ -663,21 +655,19 @@ static void read_superblock(void) version2 = 1; #endif } else - die("bad magic number in super-block"); + die("Bad magic number in super-block"); if (ZONESIZE != 0 || BLOCK_SIZE != 1024) die("Only 1k blocks/zones supported"); if (IMAPS * BLOCK_SIZE * 8 < INODES + 1) - die("bad s_imap_blocks field in super-block"); + die("Bad s_imap_blocks field in super-block"); if (ZMAPS * BLOCK_SIZE * 8 < ZONES - FIRSTZONE + 1) - die("bad s_zmap_blocks field in super-block"); + die("Bad s_zmap_blocks field in super-block"); } static void read_tables(void) { - inode_map = xmalloc(IMAPS * BLOCK_SIZE); - zone_map = xmalloc(ZMAPS * BLOCK_SIZE); - memset(inode_map, 0, IMAPS * BLOCK_SIZE); - memset(zone_map, 0, ZMAPS * BLOCK_SIZE); + inode_map = xzalloc(IMAPS * BLOCK_SIZE); + zone_map = xzalloc(ZMAPS * BLOCK_SIZE); inode_buffer = xmalloc(INODE_BUFFER_SIZE); inode_count = xmalloc(INODES + 1); zone_count = xmalloc(ZONES); @@ -688,7 +678,7 @@ static void read_tables(void) if (INODE_BUFFER_SIZE != read(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to read inodes"); if (NORM_FIRSTZONE != FIRSTZONE) { - printf("Warning: Firstzone != Norm_firstzone\n"); + printf("Warning: Firstzone!=Norm_firstzone\n"); errors_uncorrected = 1; } get_dirsize(); @@ -720,10 +710,10 @@ static struct minix_inode *get_inode(unsigned int nr) inode = Inode + nr; if (!inode_count[nr]) { if (!inode_in_use(nr)) { - printf("Inode %d marked not used, but used for file " - "'%s'\n", nr, current_name); + printf("Inode %d is marked as 'unused', but it is used " + "for file '%s'\n", nr, current_name); if (repair) { - if (ask("Mark in use", 1)) + if (ask("Mark as 'in use'", 1)) mark_inode(nr); } else { errors_uncorrected = 1; @@ -766,10 +756,10 @@ static struct minix2_inode *get_inode2(unsigned int nr) inode = Inode2 + nr; if (!inode_count[nr]) { if (!inode_in_use(nr)) { - printf("Inode %d marked not used, but used for file " - "'%s'\n", nr, current_name); + printf("Inode %d is marked as 'unused', but it is used " + "for file '%s'\n", nr, current_name); if (repair) { - if (ask("Mark in use", 1)) + if (ask("Mark as 'in use'", 1)) mark_inode(nr); else errors_uncorrected = 1; @@ -806,7 +796,7 @@ static void check_root(void) struct minix_inode *inode = Inode + ROOT_INO; if (!inode || !S_ISDIR(inode->i_mode)) - die("root inode isn't a directory"); + die("Root inode isn't a directory"); } #ifdef CONFIG_FEATURE_MINIX2 @@ -815,7 +805,7 @@ static void check_root2(void) struct minix2_inode *inode = Inode2 + ROOT_INO; if (!inode || !S_ISDIR(inode->i_mode)) - die("root inode isn't a directory"); + die("Root inode isn't a directory"); } #endif @@ -829,7 +819,7 @@ static int add_zone(uint16_t *znr, int *corrected) if (!block) return 0; if (zone_count[block]) { - printf("Block has been used before. Now in file '%s'.", + printf("Already used block is reused in file '%s'. ", current_name); if (ask("Clear", 1)) { *znr = 0; @@ -839,7 +829,7 @@ static int add_zone(uint16_t *znr, int *corrected) } } if (!zone_in_use(block)) { - printf("Block %d in file '%s' is marked not in use.", + printf("Block %d in file '%s' is marked as 'unused'. ", block, current_name); if (ask("Correct", 1)) mark_zone(block); @@ -860,7 +850,7 @@ static int add_zone2(uint32_t *znr, int *corrected) if (!block) return 0; if (zone_count[block]) { - printf("Block has been used before. Now in file '%s'.", + printf("Already used block is reused in file '%s'. ", current_name); if (ask("Clear", 1)) { *znr = 0; @@ -870,7 +860,7 @@ static int add_zone2(uint32_t *znr, int *corrected) } } if (!zone_in_use(block)) { - printf("Block %d in file '%s' is marked not in use.", + printf("Block %d in file '%s' is marked as 'unused'. ", block, current_name); if (ask("Correct", 1)) mark_zone(block); @@ -1016,9 +1006,9 @@ static void check_file(struct minix_inode *dir, unsigned int offset) name = blk + (offset % BLOCK_SIZE) + 2; ino = *(uint16_t *) (name - 2); if (ino > INODES) { - printf("%s contains a bad inode number for file '%.*s'.", + printf("%s contains a bad inode number for file '%.*s'. ", current_name, namelen, name); - if (ask(" Remove", 1)) { + if (ask("Remove", 1)) { *(uint16_t *) (name - 2) = 0; write_block(block, blk); } @@ -1070,9 +1060,9 @@ static void check_file2(struct minix2_inode *dir, unsigned int offset) name = blk + (offset % BLOCK_SIZE) + 2; ino = *(uint16_t *) (name - 2); if (ino > INODES) { - printf("%s contains a bad inode number for file '%.*s'.", + printf("%s contains a bad inode number for file '%.*s'. ", current_name, namelen, name); - if (ask(" Remove", 1)) { + if (ask("Remove", 1)) { *(uint16_t *) (name - 2) = 0; write_block(block, blk); } @@ -1118,7 +1108,7 @@ static void recursive_check(unsigned int ino) dir = Inode + ino; if (!S_ISDIR(dir->i_mode)) - die("internal error"); + die("Internal error"); if (dir->i_size < 2 * dirsize) { printf("%s: bad directory: size<32", current_name); errors_uncorrected = 1; @@ -1135,7 +1125,7 @@ static void recursive_check2(unsigned int ino) dir = Inode2 + ino; if (!S_ISDIR(dir->i_mode)) - die("internal error"); + die("Internal error"); if (dir->i_size < 2 * dirsize) { printf("%s: bad directory: size<32", current_name); errors_uncorrected = 1; @@ -1150,7 +1140,7 @@ static int bad_zone(int i) char buffer[1024]; if (BLOCK_SIZE * i != lseek(IN, BLOCK_SIZE * i, SEEK_SET)) - die("seek failed in bad_zone"); + die("Seek failed in bad_zone"); return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE)); } @@ -1160,7 +1150,7 @@ static void check_counts(void) for (i = 1; i <= INODES; i++) { if (warn_mode && Inode[i].i_mode && !inode_in_use(i)) { - printf("Inode %d mode not cleared.", i); + printf("Inode %d has non-zero mode. ", i); if (ask("Clear", 1)) { Inode[i].i_mode = 0; changed = 1; @@ -1169,18 +1159,18 @@ static void check_counts(void) if (!inode_count[i]) { if (!inode_in_use(i)) continue; - printf("Inode %d not used, marked used in the bitmap.", i); + printf("Unused inode %d is marked as 'used' in the bitmap. ", i); if (ask("Clear", 1)) unmark_inode(i); continue; } if (!inode_in_use(i)) { - printf("Inode %d used, marked unused in the bitmap.", i); + printf("Inode %d is used, but marked as 'unused' in the bitmap. ", i); if (ask("Set", 1)) mark_inode(i); } if (Inode[i].i_nlinks != inode_count[i]) { - printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", + printf("Inode %d (mode=%07o), i_nlinks=%d, counted=%d. ", i, Inode[i].i_mode, Inode[i].i_nlinks, inode_count[i]); if (ask("Set i_nlinks to count", 1)) { Inode[i].i_nlinks = inode_count[i]; @@ -1194,7 +1184,7 @@ static void check_counts(void) if (!zone_count[i]) { if (bad_zone(i)) continue; - printf("Zone %d: marked in use, no file uses it.", i); + printf("Zone %d is marked 'in use', but no file uses it. ", i); if (ask("Unmark", 1)) unmark_zone(i); continue; @@ -1211,7 +1201,7 @@ static void check_counts2(void) for (i = 1; i <= INODES; i++) { if (warn_mode && Inode2[i].i_mode && !inode_in_use(i)) { - printf("Inode %d mode not cleared.", i); + printf("Inode %d has non-zero mode. ", i); if (ask("Clear", 1)) { Inode2[i].i_mode = 0; changed = 1; @@ -1220,18 +1210,18 @@ static void check_counts2(void) if (!inode_count[i]) { if (!inode_in_use(i)) continue; - printf("Inode %d not used, marked used in the bitmap.", i); + printf("Unused inode %d is marked as 'used' in the bitmap. ", i); if (ask("Clear", 1)) unmark_inode(i); continue; } if (!inode_in_use(i)) { - printf("Inode %d used, marked unused in the bitmap.", i); + printf("Inode %d is used, but marked as 'unused' in the bitmap. ", i); if (ask("Set", 1)) mark_inode(i); } if (Inode2[i].i_nlinks != inode_count[i]) { - printf("Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", + printf("Inode %d (mode=%07o), i_nlinks=%d, counted=%d. ", i, Inode2[i].i_mode, Inode2[i].i_nlinks, inode_count[i]); if (ask("Set i_nlinks to count", 1)) { @@ -1246,7 +1236,7 @@ static void check_counts2(void) if (!zone_count[i]) { if (bad_zone(i)) continue; - printf("Zone %d: marked in use, no file uses it.", i); + printf("Zone %d is marked 'in use', but no file uses it. ", i); if (ask("Unmark", 1)) unmark_zone(i); continue; @@ -1290,10 +1280,10 @@ int fsck_minix_main(int argc, char **argv) #endif if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + die("Bad inode size"); #ifdef CONFIG_FEATURE_MINIX2 if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad v2 inode size"); + die("Bad v2 inode size"); #endif while (argc-- > 1) { argv++; @@ -1337,11 +1327,11 @@ int fsck_minix_main(int argc, char **argv) check_mount(); /* trying to check a mounted filesystem? */ if (repair && !automatic) { if (!isatty(0) || !isatty(1)) - die("need terminal for interactive repairs"); + die("Need terminal for interactive repairs"); } IN = open(device_name, repair ? O_RDWR : O_RDONLY); if (IN < 0){ - fprintf(stderr,"unable to open device '%s'\n",device_name); + printf("Unable to open device '%s'\n", device_name); leave(8); } sync(); /* paranoia? */ @@ -1357,7 +1347,7 @@ int fsck_minix_main(int argc, char **argv) if (!(Super.s_state & MINIX_ERROR_FS) && (Super.s_state & MINIX_VALID_FS) && !force) { if (repair) - printf("%s is clean, no check\n", device_name); + printf("%s is clean, check is skipped\n", device_name); return retcode; } else if (force) printf("Forcing filesystem check on %s\n", device_name); @@ -1395,9 +1385,8 @@ int fsck_minix_main(int argc, char **argv) for (i = FIRSTZONE, free_cnt = 0; i < ZONES; i++) if (!zone_in_use(i)) free_cnt++; - printf("%6ld zones used (%ld%%)\n", (ZONES - free_cnt), - 100 * (ZONES - free_cnt) / ZONES); - printf("\n%6d regular files\n" + printf("%6ld zones used (%ld%%)\n\n" + "%6d regular files\n" "%6d directories\n" "%6d character device files\n" "%6d block device files\n" @@ -1405,15 +1394,14 @@ int fsck_minix_main(int argc, char **argv) "%6d symbolic links\n" "------\n" "%6d files\n", + (ZONES - free_cnt), 100 * (ZONES - free_cnt) / ZONES, regular, directory, chardev, blockdev, links - 2 * directory + 1, symlinks, total - 2 * directory + 1); } if (changed) { write_tables(); - printf("----------------------------\n" - "FILE SYSTEM HAS BEEN CHANGED\n" - "----------------------------\n"); + printf("FILE SYSTEM HAS BEEN CHANGED\n"); sync(); } else if (repair) write_super_block();