X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Ffsck_minix.c;h=f958bdfc97ae9c0350da3c9296a1d38f35d3330e;hb=6ced427a6debb71967a8b9cebc12e31c08de0f6a;hp=09111c5dce1cc2a795fcaa8946de93d409272ac4;hpb=fac10d7c59f7db0facd5fb94de273310b9ec86e6;p=oweals%2Fbusybox.git diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 09111c5dc..f958bdfc9 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * fsck.c - a file system consistency checker for Linux. * @@ -6,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. @@ -48,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 @@ -72,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) @@ -82,10 +83,9 @@ * -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 "internal.h" #include #include #include @@ -95,25 +95,103 @@ #include #include #include -#include -#include /* for PATH_MAX */ +#include +#include "busybox.h" -#include -#include +/* + * This is the original minix inode layout on disk. + * Note the 8-bit gid and atime and ctime. + */ +struct minix_inode { + 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]; +}; + +/* + * The new minix inode has all the time entries, as well as + * long block numbers and a third indirect block (7+1+1+1 + * instead of 7+1+1). Also, some previously 8-bit values are + * now 16-bit. The inode is now 64 bytes instead of 32. + */ +struct minix2_inode { + 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 -#ifdef MINIX2_SUPER_MAGIC2 -#define HAVE_MINIX2 1 +/* + * minix super-block data on disk + */ +struct minix_super_block { + 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 { + uint16_t inode; + char name[0]; +}; + + +#define NAME_MAX 255 /* # chars in a file name */ + +#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) + +#ifndef BLKGETSIZE +#define BLKGETSIZE _IO(0x12,96) /* return device size */ #endif #ifndef __linux__ #define volatile #endif -#define ROOT_INO 1 +enum { ROOT_INO = 1 }; #define UPPER(size,n) ((size+((n)-1))/(n)) #define INODE_SIZE (sizeof(struct minix_inode)) -#ifdef HAVE_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)) @@ -124,35 +202,28 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char * program_name = "fsck.minix"; -static char * program_version = "1.2 - 11/11/96"; -static char * device_name = NULL; +static char *program_version = "1.2 - 11/11/96"; +static char *device_name; static int IN; -static int repair=0, automatic=0, verbose=0, list=0, show=0, warn_mode=0, - force=0; -static int directory=0, regular=0, blockdev=0, chardev=0, links=0, - symlinks=0, total=0; +static int repair, automatic, verbose, list, show, warn_mode, force; +static int directory, regular, blockdev, chardev, links, symlinks, total; -static int changed = 0; /* flags if the filesystem has been changed */ -static int errors_uncorrected = 0; /* flag if some error was not corrected */ +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 = 0; static struct termios termios; -static int termios_set = 0; - -/* File-name data */ -#define MAX_DEPTH 50 -static int name_depth = 0; -static char name_list[MAX_DEPTH][PATH_MAX + 1]; +static int termios_set; -static char * inode_buffer = NULL; +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]; + #define Super (*(struct minix_super_block *)super_block_buffer) #define INODES ((unsigned long)Super.s_ninodes) -#ifdef HAVE_MINIX2 +#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)) @@ -168,12 +239,18 @@ static char super_block_buffer[BLOCK_SIZE]; static char *inode_map; static char *zone_map; -static unsigned char * inode_count = NULL; -static unsigned char * zone_count = NULL; +static unsigned char *inode_count; +static unsigned char *zone_count; static void recursive_check(unsigned int ino); +#ifdef CONFIG_FEATURE_MINIX2 static void recursive_check2(unsigned int ino); +#endif +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)) @@ -183,7 +260,7 @@ static void recursive_check2(unsigned int ino); #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) @@ -191,41 +268,64 @@ static void leave(int status) exit(status); } -static void show_usage(void) { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); - fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n\n", program_name); - fprintf(stderr, "Performs a consistency check for MINIX filesystems.\n\n"); - fprintf(stderr, "OPTIONS:\n"); - fprintf(stderr, "\t-l\tLists all filenames\n"); - fprintf(stderr, "\t-r\tPerform interactive repairs\n"); - fprintf(stderr, "\t-a\tPerform automatic repairs\n"); - fprintf(stderr, "\t-v\tverbose\n"); - fprintf(stderr, "\t-s\tOutputs super-block information\n"); - fprintf(stderr, "\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"); - fprintf(stderr, "\t-f\tForce file system check.\n\n"); - leave(16); +static void die(const char *str) +{ + bb_error_msg("%s", str); + leave(8); } -static void die(const char *str) { - fprintf(stderr, "%s: %s\n", program_name, str); - leave(8); +/* 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) +{ + current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1)); + current_name[0] = '/'; + current_name[1] = '\0'; + name_component[0] = ¤t_name[0]; } -/* - * This simply goes through the file-name data and prints out the - * current file. - */ -static void print_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) +{ + free(current_name); +} +#endif + +static void push_filename(const char *name) { - int i=0; + // /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++; +} - while (imnt_fsname) == 0) + while ((mnt = getmntent(f)) != NULL) + if (strcmp(device_name, mnt->mnt_fsname) == 0) break; - endmntent (f); + endmntent(f); if (!mnt) return; @@ -298,15 +398,14 @@ static void check_mount(void) return; 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"); - exit (0); + printf("Check aborted\n"); + exit(0); } return; } @@ -317,108 +416,92 @@ 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("'."); - if (ask("Remove block",1)) { + printf("Zone nr %s in file '%s'. ", msg, current_name); + if (ask("Remove block", 1)) { *nr = 0; *corrected = 1; } return 0; } -#ifdef HAVE_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. */ -static void read_block(unsigned int nr, char * addr) +static void read_block(unsigned int nr, char *addr) { if (!nr) { - memset(addr,0,BLOCK_SIZE); + memset(addr, 0, BLOCK_SIZE); 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); + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { + 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 '"); - print_current_name(); - printf("'\n"); - memset(addr,0,BLOCK_SIZE); + printf("%s: bad block in file '%s'\n", + bb_msg_read_error, current_name); errors_uncorrected = 1; + memset(addr, 0, BLOCK_SIZE); } } /* * write_block writes block nr to disk. */ -static void write_block(unsigned int nr, char * addr) +static void write_block(unsigned int nr, char *addr) { if (!nr) return; if (nr < FIRSTZONE || nr >= ZONES) { printf("Internal error: trying to write bad block\n" - "Write request ignored\n"); + "Write request ignored\n"); errors_uncorrected = 1; return; } - if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) - die("seek failed in write_block"); + if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) + 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) +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) + if (blknr < 7) return check_zone_nr(inode->i_zone + blknr, &changed); blknr -= 7; - if (blknr<512) { + if (blknr < 512) { block = check_zone_nr(inode->i_zone + 7, &changed); read_block(block, (char *) ind); blk_chg = 0; @@ -431,73 +514,73 @@ static int map_block(struct minix_inode * inode, unsigned int blknr) block = check_zone_nr(inode->i_zone + 8, &changed); read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr(dind + (blknr/512), &blk_chg); + result = check_zone_nr(dind + (blknr / 512), &blk_chg); if (blk_chg) write_block(block, (char *) dind); block = result; read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr(ind + (blknr%512), &blk_chg); + result = check_zone_nr(ind + (blknr % 512), &blk_chg); if (blk_chg) write_block(block, (char *) ind); return result; } -#ifdef HAVE_MINIX2 -static int map_block2 (struct minix2_inode *inode, unsigned int blknr) +#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) - return check_zone_nr2 (inode->i_zone + blknr, &changed); + return check_zone_nr2(inode->i_zone + blknr, &changed); blknr -= 7; if (blknr < 256) { - block = check_zone_nr2 (inode->i_zone + 7, &changed); - read_block (block, (char *) ind); + block = check_zone_nr2(inode->i_zone + 7, &changed); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (blknr + ind, &blk_chg); + result = check_zone_nr2(blknr + ind, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256; if (blknr >= 256 * 256) { - block = check_zone_nr2 (inode->i_zone + 8, &changed); - read_block (block, (char *) dind); + block = check_zone_nr2(inode->i_zone + 8, &changed); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + blknr / 256, &blk_chg); + result = check_zone_nr2(dind + blknr / 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } blknr -= 256 * 256; - block = check_zone_nr2 (inode->i_zone + 9, &changed); - read_block (block, (char *) tind); + block = check_zone_nr2(inode->i_zone + 9, &changed); + read_block(block, (char *) tind); blk_chg = 0; - result = check_zone_nr2 (tind + blknr / (256 * 256), &blk_chg); + result = check_zone_nr2(tind + blknr / (256 * 256), &blk_chg); if (blk_chg) - write_block (block, (char *) tind); + write_block(block, (char *) tind); block = result; - read_block (block, (char *) dind); + read_block(block, (char *) dind); blk_chg = 0; - result = check_zone_nr2 (dind + (blknr / 256) % 256, &blk_chg); + result = check_zone_nr2(dind + (blknr / 256) % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) dind); + write_block(block, (char *) dind); block = result; - read_block (block, (char *) ind); + read_block(block, (char *) ind); blk_chg = 0; - result = check_zone_nr2 (ind + blknr % 256, &blk_chg); + result = check_zone_nr2(ind + blknr % 256, &blk_chg); if (blk_chg) - write_block (block, (char *) ind); + write_block(block, (char *) ind); return result; } #endif @@ -510,46 +593,44 @@ static void write_super_block(void) * unconditionally set if we get this far. */ Super.s_state |= MINIX_VALID_FS; - if ( errors_uncorrected ) + if (errors_uncorrected) Super.s_state |= MINIX_ERROR_FS; else 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) { write_super_block(); - if (IMAPS*BLOCK_SIZE != write(IN,inode_map,IMAPS*BLOCK_SIZE)) + if (IMAPS * BLOCK_SIZE != write(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to write inode map"); - if (ZMAPS*BLOCK_SIZE != write(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != write(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to write zone map"); - if (INODE_BUFFER_SIZE != write(IN,inode_buffer,INODE_BUFFER_SIZE)) + if (INODE_BUFFER_SIZE != write(IN, inode_buffer, INODE_BUFFER_SIZE)) die("Unable to write inodes"); } -static void get_dirsize (void) +static void get_dirsize(void) { int block; char blk[BLOCK_SIZE]; int size; -#if HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 if (version2) block = Inode2[ROOT_INO].i_zone[0]; else #endif block = Inode[ROOT_INO].i_zone[0]; - read_block (block, blk); + read_block(block, blk); for (size = 16; size < BLOCK_SIZE; size <<= 1) { - if (strcmp (blk + size + 2, "..") == 0) { + if (strcmp(blk + size + 2, "..") == 0) { dirsize = size; namelen = size - 2; return; @@ -561,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 HAVE_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; @@ -583,59 +663,54 @@ 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 = malloc(IMAPS * BLOCK_SIZE); - if (!inode_map) - die("Unable to allocate buffer for inode map"); - zone_map = malloc(ZMAPS * BLOCK_SIZE); - if (!inode_map) - die("Unable to allocate buffer for zone map"); - memset(inode_map,0,sizeof(inode_map)); - memset(zone_map,0,sizeof(zone_map)); - inode_buffer = malloc(INODE_BUFFER_SIZE); - if (!inode_buffer) - die("Unable to allocate buffer for inodes"); - inode_count = malloc(INODES + 1); - if (!inode_count) - die("Unable to allocate buffer for inode count"); - zone_count = malloc(ZONES); - if (!zone_count) - die("Unable to allocate buffer for zone count"); - if (IMAPS*BLOCK_SIZE != read(IN,inode_map,IMAPS*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); + if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE)) die("Unable to read inode map"); - if (ZMAPS*BLOCK_SIZE != read(IN,zone_map,ZMAPS*BLOCK_SIZE)) + if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE)) die("Unable to read zone map"); - if (INODE_BUFFER_SIZE != read(IN,inode_buffer,INODE_BUFFER_SIZE)) + 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 (); + 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< INODES) return NULL; @@ -643,15 +718,13 @@ 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; + errors_uncorrected = 1; } } if (S_ISDIR(inode->i_mode)) @@ -664,28 +737,24 @@ struct minix_inode * get_inode(unsigned int nr) blockdev++; else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK(inode->i_mode)) - ; - else if (S_ISFIFO(inode->i_mode)) - ; + 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 HAVE_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; @@ -694,37 +763,35 @@ get_inode2 (unsigned int nr) total++; 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"); + if (!inode_in_use(nr)) { + 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)) - mark_inode (nr); + if (ask("Mark as 'in use'", 1)) + mark_inode(nr); else errors_uncorrected = 1; } } - if (S_ISDIR (inode->i_mode)) + if (S_ISDIR(inode->i_mode)) directory++; - else if (S_ISREG (inode->i_mode)) + else if (S_ISREG(inode->i_mode)) regular++; - else if (S_ISCHR (inode->i_mode)) + else if (S_ISCHR(inode->i_mode)) chardev++; - else if (S_ISBLK (inode->i_mode)) + else if (S_ISBLK(inode->i_mode)) blockdev++; - else if (S_ISLNK (inode->i_mode)) + else if (S_ISLNK(inode->i_mode)) symlinks++; - else if (S_ISSOCK (inode->i_mode)); - else if (S_ISFIFO (inode->i_mode)); + 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; } @@ -734,23 +801,23 @@ get_inode2 (unsigned int nr) static void check_root(void) { - struct minix_inode * inode = Inode + ROOT_INO; + 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 HAVE_MINIX2 -static void check_root2 (void) +#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"); + if (!inode || !S_ISDIR(inode->i_mode)) + 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; @@ -760,22 +827,19 @@ 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("'."); - if (ask("Clear",1)) { + 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."); - if (ask("Correct",1)) + printf("Block %d in file '%s' is marked as 'unused'. ", + block, current_name); + if (ask("Correct", 1)) mark_zone(block); } if (!++zone_count[block]) @@ -783,34 +847,31 @@ static int add_zone(unsigned short * znr, int * corrected) return block; } -#ifdef HAVE_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; result = 0; - block = check_zone_nr2 (znr, corrected); + block = check_zone_nr2(znr, corrected); if (!block) return 0; if (zone_count[block]) { - printf ("Block has been used before. Now in file `"); - print_current_name (); - printf ("'."); - if (ask ("Clear", 1)) { + 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."); - if (ask ("Correct", 1)) - mark_zone (block); + if (!zone_in_use(block)) { + printf("Block %d in file '%s' is marked as 'unused'. ", + block, current_name); + if (ask("Correct", 1)) + mark_zone(block); } if (!++zone_count[block]) zone_count[block]--; @@ -818,198 +879,183 @@ 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; + int i, chg_blk = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) - add_zone(i + (unsigned short *) blk, &chg_blk); + for (i = 0; i < (BLOCK_SIZE >> 1); i++) + add_zone(i + (uint16_t *) blk, &chg_blk); if (chg_blk) write_block(block, blk); } -#ifdef HAVE_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; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + 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); + 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; + int i, blk_chg = 0; int block; block = add_zone(znr, corrected); if (!block) return; read_block(block, blk); - for (i=0 ; i < (BLOCK_SIZE>>1) ; i++) - add_zone_ind(i + (unsigned short *) blk, &blk_chg); + for (i = 0; i < (BLOCK_SIZE >> 1); i++) + add_zone_ind(i + (uint16_t *) blk, &blk_chg); if (blk_chg) write_block(block, blk); } -#ifdef HAVE_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; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + 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); + 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; int block; - block = add_zone2 (znr, corrected); + block = add_zone2(znr, corrected); if (!block) return; - read_block (block, blk); + 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); + write_block(block, blk); } #endif static void check_zones(unsigned int i) { - struct minix_inode * inode; + struct minix_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode + i; if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) && - !S_ISLNK(inode->i_mode)) - return; - for (i=0 ; i<7 ; i++) + !S_ISLNK(inode->i_mode)) return; + for (i = 0; i < 7; i++) add_zone(i + inode->i_zone, &changed); add_zone_ind(7 + inode->i_zone, &changed); add_zone_dind(8 + inode->i_zone, &changed); } -#ifdef HAVE_MINIX2 -static void -check_zones2 (unsigned int i) +#ifdef CONFIG_FEATURE_MINIX2 +static void check_zones2(unsigned int i) { struct minix2_inode *inode; if (!i || i > INODES) return; - if (inode_count[i] > 1) /* have we counted this file already? */ + if (inode_count[i] > 1) /* have we counted this file already? */ return; inode = Inode2 + i; - if (!S_ISDIR (inode->i_mode) && !S_ISREG (inode->i_mode) - && !S_ISLNK (inode->i_mode)) + if (!S_ISDIR(inode->i_mode) && !S_ISREG(inode->i_mode) + && !S_ISLNK(inode->i_mode)) return; for (i = 0; i < 7; i++) - add_zone2 (i + inode->i_zone, &changed); - add_zone_ind2 (7 + inode->i_zone, &changed); - add_zone_dind2 (8 + inode->i_zone, &changed); - add_zone_tind2 (9 + inode->i_zone, &changed); + add_zone2(i + inode->i_zone, &changed); + add_zone_ind2(7 + inode->i_zone, &changed); + add_zone_dind2(8 + inode->i_zone, &changed); + add_zone_tind2(9 + inode->i_zone, &changed); } #endif -static void check_file(struct minix_inode * dir, unsigned int offset) +static void check_file(struct minix_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; - struct minix_inode * inode; + struct minix_inode *inode; int ino; - char * name; + char *name; int block; - block = map_block(dir,offset/BLOCK_SIZE); + 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"); + if (!inode || strcmp(".", name)) { + printf("%s: bad directory: '.' isn't first\n", current_name); errors_uncorrected = 1; - } else return; + } else + return; } if (offset == dirsize) { - if (!inode || strcmp("..",name)) { - print_current_name(); - printf(": bad directory: '..' isn't second\n"); + if (!inode || strcmp("..", name)) { + printf("%s: bad directory: '..' isn't second\n", current_name); errors_uncorrected = 1; - } else return; + } 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("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); + 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 HAVE_MINIX2 -static void -check_file2 (struct minix2_inode *dir, unsigned int offset) +#ifdef CONFIG_FEATURE_MINIX2 +static void check_file2(struct minix2_inode *dir, unsigned int offset) { static char blk[BLOCK_SIZE]; struct minix2_inode *inode; @@ -1017,95 +1063,83 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) char *name; int block; - block = map_block2 (dir, offset / BLOCK_SIZE); - read_block (block, blk); + 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; - write_block (block, blk); + 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++; - inode = get_inode2 (ino); - name_depth--; + push_filename(name); + inode = get_inode2(ino); + pop_filename(); if (!offset) { - if (!inode || strcmp (".", name)) { - print_current_name (); - printf (": bad directory: '.' isn't first\n"); + if (!inode || strcmp(".", name)) { + 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"); + if (!inode || strcmp("..", name)) { + 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("%6d %07o %3d ", ino, inode->i_mode, inode->i_nlinks); + 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--; + check_zones2(ino); + if (inode && S_ISDIR(inode->i_mode)) + recursive_check2(ino); + pop_filename(); return; } #endif static void recursive_check(unsigned int ino) { - struct minix_inode * dir; + struct minix_inode *dir; unsigned int offset; 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); + for (offset = 0; offset < dir->i_size; offset += dirsize) + check_file(dir, offset); } -#ifdef HAVE_MINIX2 -static void -recursive_check2 (unsigned int ino) +#ifdef CONFIG_FEATURE_MINIX2 +static void recursive_check2(unsigned int ino) { struct minix2_inode *dir; unsigned int offset; dir = Inode2 + ino; - if (!S_ISDIR (dir->i_mode)) - die ("internal error"); + if (!S_ISDIR(dir->i_mode)) + 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_file2 (dir, offset); + check_file2(dir, offset); } #endif @@ -1113,8 +1147,8 @@ 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"); + if (BLOCK_SIZE * i != lseek(IN, BLOCK_SIZE * i, SEEK_SET)) + die("Seek failed in bad_zone"); return (BLOCK_SIZE != read(IN, buffer, BLOCK_SIZE)); } @@ -1122,10 +1156,10 @@ 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 (ask("Clear",1)) { + for (i = 1; i <= INODES; 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; } @@ -1133,244 +1167,259 @@ 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); - if (ask("Clear",1)) + 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); - if (ask("Set",1)) + 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.", - 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]; - changed=1; + 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]; + changed = 1; } } } - for (i=FIRSTZONE ; i < ZONES ; i++) { + for (i = FIRSTZONE; i < ZONES; i++) { if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { if (bad_zone(i)) continue; - printf("Zone %d: marked in use, no file uses it.",i); - if (ask("Unmark",1)) + printf("Zone %d is marked 'in use', but no file uses it. ", i); + if (ask("Unmark", 1)) unmark_zone(i); continue; } - printf("Zone %d: %sin use, counted=%d\n", - i,zone_in_use(i)?"":"not ",zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } -#ifdef HAVE_MINIX2 -static void -check_counts2 (void) +#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 (ask ("Clear", 1)) { + 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; } } if (!inode_count[i]) { - if (!inode_in_use (i)) + if (!inode_in_use(i)) continue; - printf ("Inode %d not used, marked used in the bitmap.", i); - if (ask ("Clear", 1)) - unmark_inode (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); - if (ask ("Set", 1)) - mark_inode (i); + if (!inode_in_use(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.", - i, Inode2[i].i_mode, Inode2[i].i_nlinks, inode_count[i]); - if (ask ("Set i_nlinks to count", 1)) { + 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)) { Inode2[i].i_nlinks = inode_count[i]; changed = 1; } } } for (i = FIRSTZONE; i < ZONES; i++) { - if (zone_in_use (i) == zone_count[i]) + if (zone_in_use(i) == zone_count[i]) continue; if (!zone_count[i]) { - if (bad_zone (i)) + if (bad_zone(i)) continue; - printf ("Zone %d: marked in use, no file uses it.", i); - if (ask ("Unmark", 1)) - unmark_zone (i); + printf("Zone %d is marked 'in use', but no file uses it. ", i); + if (ask("Unmark", 1)) + unmark_zone(i); continue; } - printf ("Zone %d: %sin use, counted=%d\n", - i, zone_in_use (i) ? "" : "not ", zone_count[i]); + printf("Zone %d: %sin use, counted=%d\n", + i, zone_in_use(i) ? "" : "not ", zone_count[i]); } } #endif static void check(void) { - memset(inode_count,0,(INODES + 1) * sizeof(*inode_count)); - memset(zone_count,0,ZONES*sizeof(*zone_count)); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); check_zones(ROOT_INO); recursive_check(ROOT_INO); check_counts(); } -#ifdef HAVE_MINIX2 -static void -check2 (void) +#ifdef CONFIG_FEATURE_MINIX2 +static void check2(void) { - memset (inode_count, 0, (INODES + 1) * sizeof (*inode_count)); - memset (zone_count, 0, ZONES * sizeof (*zone_count)); - check_zones2 (ROOT_INO); - recursive_check2 (ROOT_INO); - check_counts2 (); + memset(inode_count, 0, (INODES + 1) * sizeof(*inode_count)); + memset(zone_count, 0, ZONES * sizeof(*zone_count)); + check_zones2(ROOT_INO); + recursive_check2(ROOT_INO); + check_counts2(); } #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; - if (argc && *argv) - program_name = *argv; + 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_current_name); +#endif + if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); -#ifdef HAVE_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 while (*++argv[0]) - switch (argv[0][0]) { - case 'l': list=1; break; - case 'a': automatic=1; repair=1; break; - case 'r': automatic=0; repair=1; break; - case 'v': verbose=1; break; - case 's': show=1; break; - case 'm': warn_mode=1; break; - case 'f': force=1; break; - default: show_usage(); - } + } else + while (*++argv[0]) + switch (argv[0][0]) { + case 'l': + list = 1; + break; + case 'a': + automatic = 1; + repair = 1; + break; + case 'r': + automatic = 0; + repair = 1; + break; + case 'v': + verbose = 1; + break; + case 's': + show = 1; + break; + case 'm': + warn_mode = 1; + break; + case 'f': + force = 1; + break; + default: + bb_show_usage(); + } } if (!device_name) - show_usage(); - check_mount(); /* trying to check a mounted filesystem? */ + 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) - die("unable to open '%s'"); - for (count=0 ; count<3 ; count++) - sync(); + IN = open(device_name, repair ? O_RDWR : O_RDONLY); + if (IN < 0){ + printf("Unable to open device '%s'\n", device_name); + leave(8); + } + 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", program_name, program_version); - if ( !(Super.s_state & MINIX_ERROR_FS) && - (Super.s_state & MINIX_VALID_FS) && - !force ) { + 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); + } else if (force) + printf("Forcing filesystem check on %s\n", device_name); else if (repair) - printf("Filesystem on %s is dirty, needs checking.\n",\ - device_name); + printf("Filesystem on %s is dirty, needs checking\n", + device_name); read_tables(); if (repair && !automatic) { - tcgetattr(0,&termios); + tcgetattr(0, &termios); tmp = termios; - tmp.c_lflag &= ~(ICANON|ECHO); - tcsetattr(0,TCSANOW,&tmp); + tmp.c_lflag &= ~(ICANON | ECHO); + tcsetattr(0, TCSANOW, &tmp); termios_set = 1; } - -#if HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 if (version2) { - check_root2 (); - check2 (); - } else + check_root2(); + check2(); + } else #endif - { + { check_root(); 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" - "%6d directories\n" - "%6d character device files\n" - "%6d block device files\n" - "%6d links\n" - "%6d symbolic links\n" - "------\n" - "%6d files\n", - regular,directory,chardev,blockdev, - links-2*directory+1,symlinks,total-2*directory+1); + 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" + "%6d links\n" + "%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(); - } - else if ( repair ) + printf("FILE SYSTEM HAS BEEN CHANGED\n"); + sync(); + } else if (repair) write_super_block(); - + if (repair && !automatic) - tcsetattr(0,TCSANOW,&termios); + tcsetattr(0, TCSANOW, &termios); if (changed) - retcode += 3; + retcode += 3; if (errors_uncorrected) - retcode += 4; + retcode += 4; return retcode; }