X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffsck_minix.c;h=f958bdfc97ae9c0350da3c9296a1d38f35d3330e;hb=6ced427a6debb71967a8b9cebc12e31c08de0f6a;hp=9a53a705e60a11ec3a9123c189ffd2b227fd7fe3;hpb=cbe31dace5fb24304694d399b9eb267fbe752516;p=oweals%2Fbusybox.git diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 9a53a705e..f958bdfc9 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -7,7 +7,7 @@ */ /* - * 09.11.91 - made the first rudimetary functions + * 09.11.91 - made the first rudimentary functions * * 10.11.91 - updated, does checking, no repairs yet. * Sent out to the mailing-list for testing. @@ -49,15 +49,15 @@ * 01.07.96 - Fixed the v2 fs stuff to use the right #defines and such * for modern libcs (janl@math.uio.no, Nicolai Langfeldt) * - * 02.07.96 - Added C bit fiddling routines from rmk@ecs.soton.ac.uk + * 02.07.96 - Added C bit fiddling routines from rmk@ecs.soton.ac.uk * (Russell King). He made them for ARM. It would seem * that the ARM is powerful enough to do this in C whereas * i386 and m64k must use assembly to get it fast >:-) - * This should make minix fsck systemindependent. + * This should make minix fsck system-independent. * (janl@math.uio.no, Nicolai Langfeldt) * * 04.11.96 - Added minor fixes from Andreas Schwab to avoid compiler - * warnings. Added mc68k bitops from + * warnings. Added mc68k bitops from * Joerg Dorchain . * * 06.11.96 - Added v2 code submitted by Joerg Dorchain, but written by @@ -73,7 +73,7 @@ * unless you can be sure nobody is writing to it (and remember that the * kernel can write to it when it searches for files). * - * Usuage: fsck [-larvsm] device + * Usage: fsck [-larvsm] device * -l for a listing of all the filenames * -a for automatic repairs (not implemented) * -r for repairs (interactive) (not implemented) @@ -83,7 +83,7 @@ * -f force filesystem check even if filesystem marked as valid * * The device may be a block device or a image of one, but this isn't - * enforced (but it's not much fun on a character device :-). + * enforced (but it's not much fun on a character device :-). */ #include @@ -98,45 +98,18 @@ #include #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; - -static const int MINIX_I_MAP_SLOTS = 8; -static const int MINIX_Z_MAP_SLOTS = 64; -static const int MINIX_SUPER_MAGIC = 0x137F; /* original minix fs */ -static const int MINIX_SUPER_MAGIC2 = 0x138F; /* minix fs, 30 char names */ -static const int MINIX2_SUPER_MAGIC = 0x2468; /* minix V2 fs */ -static const int MINIX2_SUPER_MAGIC2 = 0x2478; /* minix V2 fs, 30 char names */ -static const int MINIX_VALID_FS = 0x0001; /* Clean fs. */ -static const int MINIX_ERROR_FS = 0x0002; /* fs has errors. */ - -#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) -#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode))) - -static const int MINIX_V1 = 0x0001; /* original minix fs */ -static const int MINIX_V2 = 0x0002; /* minix V2 fs */ - -#define INODE_VERSION(inode) inode->i_sb->u.minix_sb.s_version - /* * This is the original minix inode layout on disk. * 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]; + uint16_t i_mode; + uint16_t i_uid; + uint32_t i_size; + uint32_t i_time; + uint8_t i_gid; + uint8_t i_nlinks; + uint16_t i_zone[9]; }; /* @@ -146,40 +119,61 @@ 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]; + uint16_t i_mode; + uint16_t i_nlinks; + uint16_t i_uid; + uint16_t i_gid; + uint32_t i_size; + uint32_t i_atime; + uint32_t i_mtime; + uint32_t i_ctime; + uint32_t i_zone[10]; }; +enum { + MINIX_ROOT_INO = 1, + MINIX_LINK_MAX = 250, + MINIX2_LINK_MAX = 65530, + + MINIX_I_MAP_SLOTS = 8, + MINIX_Z_MAP_SLOTS = 64, + MINIX_SUPER_MAGIC = 0x137F, /* original minix fs */ + MINIX_SUPER_MAGIC2 = 0x138F, /* minix fs, 30 char names */ + MINIX2_SUPER_MAGIC = 0x2468, /* minix V2 fs */ + MINIX2_SUPER_MAGIC2 = 0x2478, /* minix V2 fs, 30 char names */ + MINIX_VALID_FS = 0x0001, /* Clean fs. */ + MINIX_ERROR_FS = 0x0002, /* fs has errors. */ + + MINIX_INODES_PER_BLOCK = ((BLOCK_SIZE)/(sizeof (struct minix_inode))), + MINIX2_INODES_PER_BLOCK = ((BLOCK_SIZE)/(sizeof (struct minix2_inode))), + + MINIX_V1 = 0x0001, /* original minix fs */ + MINIX_V2 = 0x0002 /* minix V2 fs */ +}; + +#define INODE_VERSION(inode) inode->i_sb->u.minix_sb.s_version + /* * 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; + uint16_t s_ninodes; + uint16_t s_nzones; + uint16_t s_imap_blocks; + uint16_t s_zmap_blocks; + uint16_t s_firstdatazone; + uint16_t s_log_zone_size; + uint32_t s_max_size; + uint16_t s_magic; + uint16_t s_state; + uint32_t s_zones; }; struct minix_dir_entry { - u16 inode; + uint16_t inode; char name[0]; }; -#define BLOCK_SIZE_BITS 10 -#define BLOCK_SIZE (1<> 3] & (1<<(i & 7))) != 0; } @@ -275,7 +260,7 @@ static inline int bit(char * a,unsigned int i) #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1) #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1) -static void leave(int) __attribute__ ((noreturn)); +static void leave(int) ATTRIBUTE_NORETURN; static void leave(int status) { if (termios_set) @@ -285,22 +270,59 @@ static void leave(int status) static void die(const char *str) { - error_msg("%s", str); + bb_error_msg("%s", str); leave(8); } -/* - * This simply goes through the file-name data and prints out the - * current file. - */ -static void print_current_name(void) +/* File-name data */ +enum { MAX_DEPTH = 32 }; +static int name_depth; +static char *current_name; +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) { - int i = 0; + current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1)); + current_name[0] = '/'; + current_name[1] = '\0'; + name_component[0] = ¤t_name[0]; +} - while (i < name_depth) - printf("/%.*s", namelen, name_list[i++]); - if (i == 0) - printf("/"); +#ifdef CONFIG_FEATURE_CLEAN_UP +/* execute this atexit() to deallocate name_list[] */ +/* piptigger was here */ +static inline void free_current_name(void) +{ + free(current_name); +} +#endif + +static void push_filename(const char *name) +{ + // /dir/dir/dir/file + // ^ ^ ^ + // [0] [1] [2] <-name_component[i] + if (name_depth < MAX_DEPTH) { + int len; + char *p = name_component[name_depth]; + *p++ = '/'; + len = sprintf(p, "%.*s", namelen, name); + name_component[name_depth + 1] = p + len; + } + name_depth++; +} + +static void pop_filename(void) { + name_depth--; + if (name_depth < MAX_DEPTH) { + *name_component[name_depth] = '\0'; + if (!name_depth) { + current_name[0] = '/'; + current_name[1] = '\0'; + } + } } static int ask(const char *string, int def) @@ -377,13 +399,12 @@ 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); - else - cont = 0; if (!cont) { - printf("check aborted.\n"); + printf("Check aborted\n"); exit(0); } return; @@ -395,18 +416,18 @@ static void check_mount(void) * if an error was corrected, and returns the zone (0 for no zone * or a bad zone-number). */ -static int check_zone_nr(unsigned short *nr, int *corrected) +static int check_zone_nr2(uint32_t *nr, int *corrected) { + const char *msg; if (!*nr) return 0; if (*nr < FIRSTZONE) - printf("Zone nr < FIRSTZONE in file `"); + msg = "< FIRSTZONE"; else if (*nr >= ZONES) - printf("Zone nr >= ZONES in file `"); + msg = ">= ZONES"; else return *nr; - print_current_name(); - printf("'."); + printf("Zone nr %s in file '%s'. ", msg, current_name); if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; @@ -414,26 +435,13 @@ static int check_zone_nr(unsigned short *nr, int *corrected) return 0; } -#ifdef BB_FEATURE_MINIX2 -static int check_zone_nr2(unsigned int *nr, int *corrected) +static int check_zone_nr(uint16_t *nr, int *corrected) { - if (!*nr) - return 0; - if (*nr < FIRSTZONE) - printf("Zone nr < FIRSTZONE in file `"); - else if (*nr >= ZONES) - printf("Zone nr >= ZONES in file `"); - else - return *nr; - print_current_name(); - printf("'."); - if (ask("Remove block", 1)) { - *nr = 0; - *corrected = 1; - } - return 0; + uint32_t nr32 = *nr; + int r = check_zone_nr2(&nr32, corrected); + *nr = (uint16_t)nr32; + return r; } -#endif /* * read-block reads block nr into the buffer at addr. @@ -445,17 +453,15 @@ 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 '"); - print_current_name(); - printf("'\n"); - memset(addr, 0, BLOCK_SIZE); + printf("%s: unable to seek to block in file '%s'\n", + bb_msg_read_error, current_name); errors_uncorrected = 1; - } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) { - printf("Read error: bad block in file '"); - print_current_name(); - printf("'\n"); memset(addr, 0, BLOCK_SIZE); + } else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) { + printf("%s: bad block in file '%s'\n", + bb_msg_read_error, current_name); errors_uncorrected = 1; + memset(addr, 0, BLOCK_SIZE); } } @@ -473,24 +479,23 @@ 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 '"); - print_current_name(); - printf("'\n"); + printf("%s: bad block in file '%s'\n", + bb_msg_write_error, current_name); errors_uncorrected = 1; } } /* - * map-block calculates the absolute block nr of a block in a file. + * map_block calculates the absolute block nr of a block in a file. * It sets 'changed' if the inode has needed changing, and re-writes * any indirect blocks with errors. */ static int map_block(struct minix_inode *inode, unsigned int blknr) { - unsigned short ind[BLOCK_SIZE >> 1]; - unsigned short dind[BLOCK_SIZE >> 1]; + uint16_t ind[BLOCK_SIZE >> 1]; + uint16_t dind[BLOCK_SIZE >> 1]; int blk_chg, block, result; if (blknr < 7) @@ -521,12 +526,12 @@ 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]; - unsigned int dind[BLOCK_SIZE >> 2]; - unsigned int tind[BLOCK_SIZE >> 2]; + uint32_t ind[BLOCK_SIZE >> 2]; + uint32_t dind[BLOCK_SIZE >> 2]; + uint32_t tind[BLOCK_SIZE >> 2]; int blk_chg, block, result; if (blknr < 7) @@ -594,11 +599,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"); - - return; + die("Unable to write super-block"); } static void write_tables(void) @@ -619,7 +622,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 @@ -639,21 +642,20 @@ 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; + version2 = 0; + */ if (MAGIC == MINIX_SUPER_MAGIC) { - namelen = 14; - dirsize = 16; - version2 = 0; } else if (MAGIC == MINIX_SUPER_MAGIC2) { namelen = 30; dirsize = 32; - version2 = 0; -#ifdef BB_FEATURE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 } else if (MAGIC == MINIX2_SUPER_MAGIC) { - namelen = 14; - dirsize = 16; version2 = 1; } else if (MAGIC == MINIX2_SUPER_MAGIC2) { namelen = 30; @@ -661,21 +663,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, sizeof(inode_map)); - memset(zone_map, 0, sizeof(zone_map)); + 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); @@ -686,22 +686,29 @@ 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(); if (show) { - printf("%ld inodes\n", INODES); - printf("%ld blocks\n", ZONES); - printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); - printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); - printf("Maxsize=%ld\n", MAXSIZE); - printf("Filesystem state=%d\n", Super.s_state); - printf("namelen=%d\n\n", namelen); + printf("%ld inodes\n" + "%ld blocks\n" + "Firstdatazone=%ld (%ld)\n" + "Zonesize=%d\n" + "Maxsize=%ld\n" + "Filesystem state=%d\n" + "namelen=%d\n\n", + INODES, + ZONES, + FIRSTZONE, NORM_FIRSTZONE, + BLOCK_SIZE << ZONESIZE, + MAXSIZE, + Super.s_state, + namelen); } } -struct minix_inode *get_inode(unsigned int nr) +static struct minix_inode *get_inode(unsigned int nr) { struct minix_inode *inode; @@ -711,11 +718,10 @@ 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 '", nr); - print_current_name(); - printf("'\n"); + 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; @@ -734,22 +740,21 @@ struct minix_inode *get_inode(unsigned int nr) else if (S_ISSOCK(inode->i_mode)); else if (S_ISFIFO(inode->i_mode)); else { - print_current_name(); - printf(" has mode %05o\n", inode->i_mode); + printf("%s has mode %05o\n", current_name, inode->i_mode); } } else links++; if (!++inode_count[nr]) { - printf("Warning: inode count too big.\n"); + printf("Warning: inode count too big\n"); inode_count[nr]--; errors_uncorrected = 1; } 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; @@ -759,11 +764,10 @@ 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 '", nr); - print_current_name(); - printf("'\n"); + 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; @@ -782,13 +786,12 @@ struct minix2_inode *get_inode2(unsigned int nr) else if (S_ISSOCK(inode->i_mode)); else if (S_ISFIFO(inode->i_mode)); else { - print_current_name(); - printf(" has mode %05o\n", inode->i_mode); + printf("%s has mode %05o\n", current_name, inode->i_mode); } } else links++; if (!++inode_count[nr]) { - printf("Warning: inode count too big.\n"); + printf("Warning: inode count too big\n"); inode_count[nr]--; errors_uncorrected = 1; } @@ -801,20 +804,20 @@ 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 BB_FEATURE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 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 -static int add_zone(unsigned short *znr, int *corrected) +static int add_zone(uint16_t *znr, int *corrected) { int result; int block; @@ -824,21 +827,18 @@ static int add_zone(unsigned short *znr, int *corrected) if (!block) return 0; if (zone_count[block]) { - printf("Block has been used before. Now in file `"); - print_current_name(); - printf("'."); + printf("Already used block is reused in file '%s'. ", + current_name); if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; + return 0; } } - if (!block) - return 0; if (!zone_in_use(block)) { - printf("Block %d in file `", block); - print_current_name(); - printf("' 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); } @@ -847,8 +847,8 @@ static int add_zone(unsigned short *znr, int *corrected) return block; } -#ifdef BB_FEATURE_MINIX2 -static int add_zone2(unsigned int *znr, int *corrected) +#ifdef CONFIG_FEATURE_MINIX2 +static int add_zone2(uint32_t *znr, int *corrected) { int result; int block; @@ -858,21 +858,18 @@ static int add_zone2(unsigned int *znr, int *corrected) if (!block) return 0; if (zone_count[block]) { - printf("Block has been used before. Now in file `"); - print_current_name(); - printf("'."); + printf("Already used block is reused in file '%s'. ", + current_name); if (ask("Clear", 1)) { *znr = 0; block = 0; *corrected = 1; + return 0; } } - if (!block) - return 0; if (!zone_in_use(block)) { - printf("Block %d in file `", block); - print_current_name(); - printf("' 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); } @@ -882,7 +879,7 @@ static int add_zone2(unsigned int *znr, int *corrected) } #endif -static void add_zone_ind(unsigned short *znr, int *corrected) +static void add_zone_ind(uint16_t *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, chg_blk = 0; @@ -893,13 +890,13 @@ static void add_zone_ind(unsigned short *znr, int *corrected) return; read_block(block, blk); for (i = 0; i < (BLOCK_SIZE >> 1); i++) - add_zone(i + (unsigned short *) blk, &chg_blk); + add_zone(i + (uint16_t *) blk, &chg_blk); if (chg_blk) write_block(block, blk); } -#ifdef BB_FEATURE_MINIX2 -static void add_zone_ind2(unsigned int *znr, int *corrected) +#ifdef CONFIG_FEATURE_MINIX2 +static void add_zone_ind2(uint32_t *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, chg_blk = 0; @@ -910,13 +907,13 @@ static void add_zone_ind2(unsigned int *znr, int *corrected) return; read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone2(i + (unsigned int *) blk, &chg_blk); + add_zone2(i + (uint32_t *) blk, &chg_blk); if (chg_blk) write_block(block, blk); } #endif -static void add_zone_dind(unsigned short *znr, int *corrected) +static void add_zone_dind(uint16_t *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; @@ -927,13 +924,13 @@ static void add_zone_dind(unsigned short *znr, int *corrected) return; read_block(block, blk); for (i = 0; i < (BLOCK_SIZE >> 1); i++) - add_zone_ind(i + (unsigned short *) blk, &blk_chg); + add_zone_ind(i + (uint16_t *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } -#ifdef BB_FEATURE_MINIX2 -static void add_zone_dind2(unsigned int *znr, int *corrected) +#ifdef CONFIG_FEATURE_MINIX2 +static void add_zone_dind2(uint32_t *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; @@ -944,12 +941,12 @@ static void add_zone_dind2(unsigned int *znr, int *corrected) return; read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_ind2(i + (unsigned int *) blk, &blk_chg); + add_zone_ind2(i + (uint32_t *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } -static void add_zone_tind2(unsigned int *znr, int *corrected) +static void add_zone_tind2(uint32_t *znr, int *corrected) { static char blk[BLOCK_SIZE]; int i, blk_chg = 0; @@ -960,7 +957,7 @@ static void add_zone_tind2(unsigned int *znr, int *corrected) return; read_block(block, blk); for (i = 0; i < BLOCK_SIZE >> 2; i++) - add_zone_dind2(i + (unsigned int *) blk, &blk_chg); + add_zone_dind2(i + (uint32_t *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } @@ -983,7 +980,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; @@ -1015,60 +1012,49 @@ static void check_file(struct minix_inode *dir, unsigned int offset) block = map_block(dir, offset / BLOCK_SIZE); read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; - ino = *(unsigned short *) (name - 2); + ino = *(uint16_t *) (name - 2); if (ino > INODES) { - print_current_name(); - printf(" contains a bad inode number for file '"); - printf("%.*s'.", namelen, name); - if (ask(" Remove", 1)) { - *(unsigned short *) (name - 2) = 0; + printf("%s contains a bad inode number for file '%.*s'. ", + current_name, namelen, name); + if (ask("Remove", 1)) { + *(uint16_t *) (name - 2) = 0; write_block(block, blk); } ino = 0; } - if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth], name, namelen); - name_depth++; + push_filename(name); inode = get_inode(ino); - name_depth--; + pop_filename(); if (!offset) { if (!inode || strcmp(".", name)) { - print_current_name(); - printf(": bad directory: '.' isn't first\n"); + printf("%s: bad directory: '.' isn't first\n", current_name); errors_uncorrected = 1; } else return; } if (offset == dirsize) { if (!inode || strcmp("..", name)) { - print_current_name(); - printf(": bad directory: '..' isn't second\n"); + printf("%s: bad directory: '..' isn't second\n", current_name); errors_uncorrected = 1; } else return; } if (!inode) return; - if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth], name, namelen); - name_depth++; + push_filename(name); if (list) { if (verbose) printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); - print_current_name(); - if (S_ISDIR(inode->i_mode)) - printf(":\n"); - else - printf("\n"); + printf("%s%s\n", current_name, S_ISDIR(inode->i_mode) ? ":" : ""); } check_zones(ino); if (inode && S_ISDIR(inode->i_mode)) recursive_check(ino); - name_depth--; + pop_filename(); 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]; @@ -1080,54 +1066,45 @@ static void check_file2(struct minix2_inode *dir, unsigned int offset) block = map_block2(dir, offset / BLOCK_SIZE); read_block(block, blk); name = blk + (offset % BLOCK_SIZE) + 2; - ino = *(unsigned short *) (name - 2); + ino = *(uint16_t *) (name - 2); if (ino > INODES) { - print_current_name(); - printf(" contains a bad inode number for file '"); - printf("%.*s'.", namelen, name); - if (ask(" Remove", 1)) { - *(unsigned short *) (name - 2) = 0; + printf("%s contains a bad inode number for file '%.*s'. ", + current_name, namelen, name); + if (ask("Remove", 1)) { + *(uint16_t *) (name - 2) = 0; write_block(block, blk); } ino = 0; } - if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth], name, namelen); - name_depth++; + push_filename(name); inode = get_inode2(ino); - name_depth--; + pop_filename(); if (!offset) { if (!inode || strcmp(".", name)) { - print_current_name(); - printf(": bad directory: '.' isn't first\n"); + printf("%s: bad directory: '.' isn't first\n", current_name); errors_uncorrected = 1; } else return; } if (offset == dirsize) { if (!inode || strcmp("..", name)) { - print_current_name(); - printf(": bad directory: '..' isn't second\n"); + printf("%s: bad directory: '..' isn't second\n", current_name); errors_uncorrected = 1; } else return; } if (!inode) return; - name_depth++; + push_filename(name); if (list) { if (verbose) printf("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); - print_current_name(); - if (S_ISDIR(inode->i_mode)) - printf(":\n"); - else - printf("\n"); + printf("%s%s\n", current_name, S_ISDIR(inode->i_mode) ? ":" : ""); } check_zones2(ino); if (inode && S_ISDIR(inode->i_mode)) recursive_check2(ino); - name_depth--; + pop_filename(); return; } #endif @@ -1139,17 +1116,16 @@ 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) { - print_current_name(); - printf(": bad directory: size<32"); + printf("%s: bad directory: size<32", current_name); errors_uncorrected = 1; } for (offset = 0; offset < dir->i_size; offset += dirsize) check_file(dir, offset); } -#ifdef BB_FEATURE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 static void recursive_check2(unsigned int ino) { struct minix2_inode *dir; @@ -1157,10 +1133,9 @@ 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) { - print_current_name(); - printf(": bad directory: size < 32"); + printf("%s: bad directory: size<32", current_name); errors_uncorrected = 1; } for (offset = 0; offset < dir->i_size; offset += dirsize) @@ -1173,7 +1148,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)); } @@ -1182,8 +1157,8 @@ static void check_counts(void) int i; for (i = 1; i <= INODES; i++) { - if (!inode_in_use(i) && Inode[i].i_mode && warn_mode) { - printf("Inode %d mode not cleared.", i); + if (warn_mode && Inode[i].i_mode && !inode_in_use(i)) { + printf("Inode %d has non-zero mode. ", i); if (ask("Clear", 1)) { Inode[i].i_mode = 0; changed = 1; @@ -1192,18 +1167,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]; @@ -1217,7 +1192,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; @@ -1227,14 +1202,14 @@ static void check_counts(void) } } -#ifdef BB_FEATURE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 static void check_counts2(void) { int i; for (i = 1; i <= INODES; i++) { - if (!inode_in_use(i) && Inode2[i].i_mode && warn_mode) { - printf("Inode %d mode not cleared.", i); + if (warn_mode && Inode2[i].i_mode && !inode_in_use(i)) { + printf("Inode %d has non-zero mode. ", i); if (ask("Clear", 1)) { Inode2[i].i_mode = 0; changed = 1; @@ -1243,18 +1218,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)) { @@ -1269,7 +1244,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; @@ -1289,7 +1264,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)); @@ -1300,59 +1275,29 @@ static void check2(void) } #endif -/* Wed Feb 9 15:17:06 MST 2000 */ -/* dynamically allocate name_list (instead of making it static) */ -static void alloc_name_list(void) -{ - int i; - - name_list = xmalloc(sizeof(char *) * MAX_DEPTH); - for (i = 0; i < MAX_DEPTH; i++) - name_list[i] = xmalloc(sizeof(char) * BUFSIZ + 1); -} - -#ifdef BB_FEATURE_CLEAN_UP -/* execute this atexit() to deallocate name_list[] */ -/* piptigger was here */ -static void free_name_list(void) -{ - int i; - - if (name_list) { - for (i = 0; i < MAX_DEPTH; i++) { - if (name_list[i]) { - free(name_list[i]); - } - } - free(name_list); - } -} -#endif - -extern int fsck_minix_main(int argc, char **argv) +int fsck_minix_main(int argc, char **argv) { struct termios tmp; - int count; int retcode = 0; - alloc_name_list(); -#ifdef BB_FEATURE_CLEAN_UP + alloc_current_name(); +#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); + atexit(free_current_name); #endif if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); -#ifdef BB_FEATURE_MINIX2 + 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++; if (argv[0][0] != '-') { if (device_name) - show_usage(); + bb_show_usage(); else device_name = argv[0]; } else @@ -1382,41 +1327,40 @@ extern int fsck_minix_main(int argc, char **argv) force = 1; break; default: - show_usage(); + bb_show_usage(); } } if (!device_name) - show_usage(); + bb_show_usage(); 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); } - for (count = 0; count < 3; count++) - sync(); + sync(); /* paranoia? */ read_superblock(); /* * Determine whether or not we should continue with the checking. * This is based on the status of the filesystem valid and error - * flags and whether or not the -f switch was specified on the + * flags and whether or not the -f switch was specified on the * command line. */ - printf("%s, %s\n", applet_name, program_version); + printf("%s, %s\n", bb_applet_name, program_version); 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); + printf("Forcing filesystem check on %s\n", device_name); else if (repair) - printf("Filesystem on %s is dirty, needs checking.\n", + printf("Filesystem on %s is dirty, needs checking\n", device_name); read_tables(); @@ -1428,7 +1372,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,19 +1383,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); - printf("\n%6d regular files\n" + free_cnt++; + printf("%6ld zones used (%ld%%)\n\n" + "%6d regular files\n" "%6d directories\n" "%6d character device files\n" "%6d block device files\n" @@ -1459,17 +1402,15 @@ extern 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"); - for (count = 0; count < 3; count++) - sync(); + printf("FILE SYSTEM HAS BEEN CHANGED\n"); + sync(); } else if (repair) write_super_block();