X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmkfs_minix.c;h=ed9cb45123a87106a491d5e267c7a9a2208ea5c1;hb=88621d73980a3cb53c1f35e64a06d7cd64188987;hp=9493f2b2b3db6f0d3a5766705746f8fc5e989f62;hpb=2086e3d679464c5c443ff66310adb9a6d0b70e6a;p=oweals%2Fbusybox.git diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 9493f2b2b..ed9cb4512 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -35,7 +35,7 @@ * * 30.10.94 - added support for v2 filesystem * (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de) - * + * * 09.11.94 - Added test to prevent overwrite of mounted fs adapted * from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs * program. (Daniel Quinlan, quinlan@yggdrasil.com) @@ -49,41 +49,111 @@ * * Usage: mkfs [-c | -l filename ] [-v] [-nXX] [-iXX] device [size-in-blocks] * - * -c for readablility checking (SLOW!) + * -c for readability checking (SLOW!) * -l for getting a list of bad blocks from a file. * -n for namelength (currently the kernel only uses 14 or 30) * -i for number of inodes * -v for v2 filesystem * * 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 :-). * * Modified for BusyBox by Erik Andersen -- * removed getopt based parser and added a hand rolled one. */ -#include "internal.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "busybox.h" #include -#include -#include +#define MINIX_ROOT_INO 1 +#define MINIX_LINK_MAX 250 +#define MINIX2_LINK_MAX 65530 + +#define MINIX_I_MAP_SLOTS 8 +#define MINIX_Z_MAP_SLOTS 64 +#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ +#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ +#define MINIX2_SUPER_MAGIC 0x2468 /* minix V2 fs */ +#define MINIX2_SUPER_MAGIC2 0x2478 /* minix V2 fs, 30 char names */ +#define MINIX_VALID_FS 0x0001 /* Clean fs. */ +#define 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))) + +#define MINIX_V1 0x0001 /* original minix fs */ +#define 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 { + 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]; +}; -#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))) + +#define MINIX_VALID_FS 0x0001 /* Clean fs. */ +#define MINIX_ERROR_FS 0x0002 /* fs has errors. */ + +#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */ +#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */ + +#ifndef BLKGETSIZE +#define BLKGETSIZE _IO(0x12,96) /* return device size */ #endif + #ifndef __linux__ #define volatile #endif @@ -96,7 +166,7 @@ #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)) @@ -107,42 +177,41 @@ #define BITS_PER_BLOCK (BLOCK_SIZE<<3) -static char *program_name = "mkfs"; -static char *device_name = NULL; +static char *device_name; static int DEV = -1; -static long BLOCKS = 0; -static int check = 0; -static int badblocks = 0; +static uint32_t BLOCKS; +static int check; +static int badblocks; static int namelen = 30; /* default (changed to 30, per Linus's suggestion, Sun Nov 21 08:05:07 1993) */ static int dirsize = 32; static int magic = MINIX_SUPER_MAGIC2; -static int version2 = 0; +static int version2; -static char root_block[BLOCK_SIZE] = "\0"; +static char root_block[BLOCK_SIZE]; -static char *inode_buffer = NULL; +static char *inode_buffer; #define Inode (((struct minix_inode *) inode_buffer)-1) -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 #define Inode2 (((struct minix2_inode *) inode_buffer)-1) #endif static char super_block_buffer[BLOCK_SIZE]; static char boot_block_buffer[512]; #define Super (*(struct minix_super_block *)super_block_buffer) -#define INODES ((unsigned long)Super.s_ninodes) -#ifdef HAVE_MINIX2 -#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones)) +#define INODES (Super.s_ninodes) +#ifdef CONFIG_FEATURE_MINIX2 +#define ZONES (version2 ? Super.s_zones : Super.s_nzones) #else -#define ZONES ((unsigned long)(Super.s_nzones)) +#define ZONES (Super.s_nzones) #endif -#define IMAPS ((unsigned long)Super.s_imap_blocks) -#define ZMAPS ((unsigned long)Super.s_zmap_blocks) -#define FIRSTZONE ((unsigned long)Super.s_firstdatazone) -#define ZONESIZE ((unsigned long)Super.s_log_zone_size) -#define MAXSIZE ((unsigned long)Super.s_max_size) +#define IMAPS (Super.s_imap_blocks) +#define ZMAPS (Super.s_zmap_blocks) +#define FIRSTZONE (Super.s_firstdatazone) +#define ZONESIZE (Super.s_log_zone_size) +#define MAXSIZE (Super.s_max_size) #define MAGIC (Super.s_magic) #define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS) @@ -150,11 +219,15 @@ static char *inode_map; static char *zone_map; static unsigned short good_blocks_table[MAX_GOOD_BLOCKS]; -static int used_good_blocks = 0; -static unsigned long req_nr_inodes = 0; +static int used_good_blocks; +static unsigned long req_nr_inodes; -#define inode_in_use(x) (isset(inode_map,(x))) -#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1)) +static 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)) #define mark_inode(x) (setbit(inode_map,(x))) #define unmark_inode(x) (clrbit(inode_map,(x))) @@ -162,40 +235,6 @@ static unsigned long req_nr_inodes = 0; #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1)) #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1)) -/* - * Volatile to let gcc know that this doesn't return. When trying - * to compile this under minix, volatile gives a warning, as - * exit() isn't defined as volatile under minix. - */ -static volatile void die(char *str) -{ - fprintf(stderr, "%s: %s\n", program_name, str); - exit(8); -} - -static volatile void show_usage() __attribute__ ((noreturn)); -static volatile void show_usage() -{ - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", - BB_VER, BB_BT); - fprintf(stderr, - "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", - program_name); -#ifndef BB_FEATURE_TRIVIAL_HELP - fprintf(stderr, "\nMake a MINIX filesystem.\n\n"); - fprintf(stderr, "Options:\n"); - fprintf(stderr, "\t-c\t\tCheck the device for bad blocks\n"); - fprintf(stderr, - "\t-n [14|30]\tSpecify the maximum length of filenames\n"); - fprintf(stderr, - "\t-i INODES\tSpecify the number of inodes for the filesystem\n"); - fprintf(stderr, - "\t-l FILENAME\tRead the bad blocks list from FILENAME\n"); - fprintf(stderr, "\t-v\t\tMake a Minix version 2 filesystem\n\n"); -#endif - exit(16); -} - /* * Check to make certain that our new filesystem won't be created on * an already mounted partition. Code adapted from mke2fs, Copyright @@ -215,7 +254,7 @@ static void check_mount(void) if (!mnt) return; - die("%s is mounted; will not make a filesystem here!"); + bb_error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name); } static long valid_offset(int fd, int offset) @@ -253,11 +292,7 @@ static int get_size(const char *file) int fd; long size; - fd = open(file, O_RDWR); - if (fd < 0) { - perror(file); - exit(1); - } + fd = xopen3(file, O_RDWR, 0); if (ioctl(fd, BLKGETSIZE, &size) >= 0) { close(fd); return (size * 512); @@ -275,28 +310,28 @@ static void write_tables(void) Super.s_state &= ~MINIX_ERROR_FS; if (lseek(DEV, 0, SEEK_SET)) - die("seek to boot block failed in write_tables"); + bb_error_msg_and_die("seek to boot block failed in write_tables"); if (512 != write(DEV, boot_block_buffer, 512)) - die("unable to clear boot sector"); + bb_error_msg_and_die("unable to clear boot sector"); if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) - die("seek failed in write_tables"); + bb_error_msg_and_die("seek failed in write_tables"); if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) - die("unable to write super-block"); + bb_error_msg_and_die("unable to write super-block"); if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) - die("unable to write inode map"); + bb_error_msg_and_die("unable to write inode map"); if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) - die("unable to write zone map"); + bb_error_msg_and_die("unable to write zone map"); if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) - die("unable to write inodes"); + bb_error_msg_and_die("unable to write inodes"); } static void write_block(int blk, char *buffer) { if (blk * BLOCK_SIZE != lseek(DEV, blk * BLOCK_SIZE, SEEK_SET)) - die("seek failed in write_block"); + bb_error_msg_and_die("seek failed in write_block"); if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE)) - die("write failed in write_block"); + bb_error_msg_and_die("write failed in write_block"); } static int get_free_block(void) @@ -304,7 +339,7 @@ static int get_free_block(void) int blk; if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS) - die("too many bad blocks"); + bb_error_msg_and_die("too many bad blocks"); if (used_good_blocks) blk = good_blocks_table[used_good_blocks - 1] + 1; else @@ -312,7 +347,7 @@ static int get_free_block(void) while (blk < ZONES && zone_in_use(blk)) blk++; if (blk >= ZONES) - die("not enough good blocks"); + bb_error_msg_and_die("not enough good blocks"); good_blocks_table[used_good_blocks] = blk; used_good_blocks++; return blk; @@ -326,7 +361,7 @@ static void mark_good_blocks(void) mark_zone(good_blocks_table[blk]); } -inline int next(int zone) +static int next(int zone) { if (!zone) zone = FIRSTZONE - 1; @@ -378,7 +413,7 @@ static void make_bad_inode(void) goto end_bad; } } - die("too many bad blocks"); + bb_error_msg_and_die("too many bad blocks"); end_bad: if (ind) write_block(ind, (char *) ind_block); @@ -386,7 +421,7 @@ static void make_bad_inode(void) write_block(dind, (char *) dind_block); } -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 static void make_bad_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; @@ -428,7 +463,7 @@ static void make_bad_inode2(void) } } /* Could make triple indirect block here */ - die("too many bad blocks"); + bb_error_msg_and_die("too many bad blocks"); end_bad: if (ind) write_block(ind, (char *) ind_block); @@ -459,7 +494,7 @@ static void make_root_inode(void) write_block(inode->i_zone[0], root_block); } -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 static void make_root_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; @@ -493,14 +528,20 @@ static void setup_tables(void) MAGIC = magic; ZONESIZE = 0; MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024; - ZONES = BLOCKS; +#ifdef CONFIG_FEATURE_MINIX2 + if (version2) { + Super.s_zones = BLOCKS; + } else +#endif + Super.s_nzones = BLOCKS; + /* some magic nrs: 1 inode / 3 blocks */ if (req_nr_inodes == 0) inodes = BLOCKS / 3; else inodes = req_nr_inodes; /* Round up inode count to fill block size */ -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 if (version2) inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) & ~(MINIX2_INODES_PER_BLOCK - 1)); @@ -529,7 +570,7 @@ static void setup_tables(void) * /sbin/mkfs.minix -i 200 test.fs * */ if (i >= 999) { - die("unable to allocate buffers for maps"); + bb_error_msg_and_die("unable to allocate buffers for maps"); } FIRSTZONE = NORM_FIRSTZONE; inode_map = xmalloc(IMAPS * BLOCK_SIZE); @@ -542,25 +583,25 @@ static void setup_tables(void) unmark_inode(i); inode_buffer = xmalloc(INODE_BUFFER_SIZE); memset(inode_buffer, 0, INODE_BUFFER_SIZE); - printf("%ld inodes\n", INODES); - printf("%ld blocks\n", ZONES); - printf("Firstdatazone=%ld (%ld)\n", FIRSTZONE, NORM_FIRSTZONE); + printf("%ld inodes\n", (long)INODES); + printf("%ld blocks\n", (long)ZONES); + printf("Firstdatazone=%ld (%ld)\n", (long)FIRSTZONE, (long)NORM_FIRSTZONE); printf("Zonesize=%d\n", BLOCK_SIZE << ZONESIZE); - printf("Maxsize=%ld\n\n", MAXSIZE); + printf("Maxsize=%ld\n\n", (long)MAXSIZE); } /* * Perform a test of a block; return the number of - * blocks readable/writeable. + * blocks readable/writable. */ -long do_check(char *buffer, int try, unsigned int current_block) +static long do_check(char *buffer, int try, unsigned int current_block) { long got; /* Seek to the correct loc. */ if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) != current_block * BLOCK_SIZE) { - die("seek failed during testing of blocks"); + bb_error_msg_and_die("seek failed during testing of blocks"); } @@ -575,7 +616,7 @@ long do_check(char *buffer, int try, unsigned int current_block) return got; } -static unsigned int currently_testing = 0; +static unsigned int currently_testing; static void alarm_intr(int alnum) { @@ -600,7 +641,7 @@ static void check_blocks(void) while (currently_testing < ZONES) { if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) != currently_testing * BLOCK_SIZE) - die("seek failed in check_blocks"); + bb_error_msg_and_die("seek failed in check_blocks"); try = TEST_BUFFER_BLOCKS; if (currently_testing + try > ZONES) try = ZONES - currently_testing; @@ -609,7 +650,7 @@ static void check_blocks(void) if (got == try) continue; if (currently_testing < FIRSTZONE) - die("bad blocks before data-area: cannot make fs"); + bb_error_msg_and_die("bad blocks before data-area: cannot make fs"); mark_zone(currently_testing); badblocks++; currently_testing++; @@ -620,17 +661,12 @@ static void check_blocks(void) printf("one bad block\n"); } -static void get_list_blocks(filename) -char *filename; - +static void get_list_blocks(char *filename) { FILE *listfile; unsigned long blockno; - listfile = fopen(filename, "r"); - if (listfile == (FILE *) NULL) { - die("can't open file of bad blocks"); - } + listfile = xfopen(filename, "r"); while (!feof(listfile)) { fscanf(listfile, "%ld\n", &blockno); mark_zone(blockno); @@ -642,7 +678,7 @@ char *filename; printf("one bad block\n"); } -extern int mkfs_minix_main(int argc, char **argv) +int mkfs_minix_main(int argc, char **argv) { int i=1; char *tmp; @@ -650,15 +686,13 @@ extern int mkfs_minix_main(int argc, char **argv) char *listfile = NULL; int stopIt=FALSE; - if (argc && *argv) - program_name = *argv; if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); -#ifdef HAVE_MINIX2 + bb_error_msg_and_die("bad inode size"); +#ifdef CONFIG_FEATURE_MINIX2 if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) - die("bad inode size"); + bb_error_msg_and_die("bad inode size"); #endif - + /* Parse options */ argv++; while (--argc >= 0 && *argv && **argv) { @@ -682,7 +716,7 @@ extern int mkfs_minix_main(int argc, char **argv) } req_nr_inodes = strtoul(cp, &tmp, 0); if (*tmp) - show_usage(); + bb_show_usage(); stopIt=TRUE; break; } @@ -706,24 +740,24 @@ extern int mkfs_minix_main(int argc, char **argv) } i = strtoul(cp, &tmp, 0); if (*tmp) - show_usage(); + bb_show_usage(); if (i == 14) magic = MINIX_SUPER_MAGIC; else if (i == 30) magic = MINIX_SUPER_MAGIC2; - else - show_usage(); + else + bb_show_usage(); namelen = i; dirsize = i + 2; stopIt=TRUE; break; } case 'v': -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 version2 = 1; #else - fprintf(stderr, "%s: not compiled with minix v2 support\n", - program_name, device_name); + bb_error_msg("%s: not compiled with minix v2 support", + device_name); exit(-1); #endif break; @@ -731,7 +765,7 @@ extern int mkfs_minix_main(int argc, char **argv) case 'h': default: goodbye: - show_usage(); + bb_show_usage(); } } } else { @@ -749,9 +783,9 @@ goodbye: if (device_name && !BLOCKS) BLOCKS = get_size(device_name) / 1024; if (!device_name || BLOCKS < 10) { - show_usage(); + bb_show_usage(); } -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 if (version2) { if (namelen == 14) magic = MINIX2_SUPER_MAGIC; @@ -771,21 +805,19 @@ goodbye: tmp += dirsize; *(short *) tmp = 2; strcpy(tmp + 2, ".badblocks"); - DEV = open(device_name, O_RDWR); - if (DEV < 0) - die("unable to open %s"); + DEV = xopen3(device_name, O_RDWR, 0); if (fstat(DEV, &statbuf) < 0) - die("unable to stat %s"); + bb_error_msg_and_die("unable to stat %s", device_name); if (!S_ISBLK(statbuf.st_mode)) check = 0; else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) - die("will not try to make filesystem on '%s'"); + bb_error_msg_and_die("will not try to make filesystem on '%s'", device_name); setup_tables(); if (check) check_blocks(); else if (listfile) get_list_blocks(listfile); -#ifdef HAVE_MINIX2 +#ifdef CONFIG_FEATURE_MINIX2 if (version2) { make_root_inode2(); make_bad_inode2(); @@ -797,6 +829,6 @@ goodbye: } mark_good_blocks(); write_tables(); - return( 0); + return 0; }