emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major coreutils update.

Browse Source
This commit is contained in:
Manuel Novoa III
2003-03-19 09:13:01 +00:00
parent e01f9662a5
commit cad5364599
295 changed files with 6944 additions and 5570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
util-linux/mkfs_minix.c
View File

@@ -268,7 +268,7 @@ extern inline void check_mount(void)
if (!mnt)
return;
error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name);
bb_error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name);
}
static long valid_offset(int fd, int offset)
@@ -307,7 +307,7 @@ extern inline int get_size(const char *file)
long size;
if ((fd = open(file, O_RDWR)) < 0)
perror_msg_and_die("%s", file);
bb_perror_msg_and_die("%s", file);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
close(fd);
return (size * 512);
@@ -325,28 +325,28 @@ extern inline void write_tables(void)
Super.s_state &= ~MINIX_ERROR_FS;
if (lseek(DEV, 0, SEEK_SET))
error_msg_and_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))
error_msg_and_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))
error_msg_and_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))
error_msg_and_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))
error_msg_and_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))
error_msg_and_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))
error_msg_and_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))
error_msg_and_die("seek failed in write_block");
bb_error_msg_and_die("seek failed in write_block");
if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
error_msg_and_die("write failed in write_block");
bb_error_msg_and_die("write failed in write_block");
}
static int get_free_block(void)
@@ -354,7 +354,7 @@ static int get_free_block(void)
int blk;
if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
error_msg_and_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
@@ -362,7 +362,7 @@ static int get_free_block(void)
while (blk < ZONES && zone_in_use(blk))
blk++;
if (blk >= ZONES)
error_msg_and_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;
@@ -428,7 +428,7 @@ extern inline void make_bad_inode(void)
goto end_bad;
}
}
error_msg_and_die("too many bad blocks");
bb_error_msg_and_die("too many bad blocks");
end_bad:
if (ind)
write_block(ind, (char *) ind_block);
@@ -478,7 +478,7 @@ extern inline void make_bad_inode2(void)
}
}
/* Could make triple indirect block here */
error_msg_and_die("too many bad blocks");
bb_error_msg_and_die("too many bad blocks");
end_bad:
if (ind)
write_block(ind, (char *) ind_block);
@@ -579,7 +579,7 @@ extern inline void setup_tables(void)
* /sbin/mkfs.minix -i 200 test.fs
* */
if (i >= 999) {
error_msg_and_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);
@@ -610,7 +610,7 @@ extern inline long do_check(char *buffer, int try, unsigned int current_block)
/* Seek to the correct loc. */
if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) !=
current_block * BLOCK_SIZE) {
error_msg_and_die("seek failed during testing of blocks");
bb_error_msg_and_die("seek failed during testing of blocks");
}
@@ -650,7 +650,7 @@ static void check_blocks(void)
while (currently_testing < ZONES) {
if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) !=
currently_testing * BLOCK_SIZE)
error_msg_and_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;
@@ -659,7 +659,7 @@ static void check_blocks(void)
if (got == try)
continue;
if (currently_testing < FIRSTZONE)
error_msg_and_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++;
@@ -675,7 +675,7 @@ static void get_list_blocks(char *filename)
FILE *listfile;
unsigned long blockno;
listfile = xfopen(filename, "r");
listfile = bb_xfopen(filename, "r");
while (!feof(listfile)) {
fscanf(listfile, "%ld\n", &blockno);
mark_zone(blockno);
@@ -696,10 +696,10 @@ extern int mkfs_minix_main(int argc, char **argv)
int stopIt=FALSE;
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
error_msg_and_die("bad inode size");
bb_error_msg_and_die("bad inode size");
#ifdef CONFIG_FEATURE_MINIX2
if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
error_msg_and_die("bad inode size");
bb_error_msg_and_die("bad inode size");
#endif
/* Parse options */
@@ -725,7 +725,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;
}
@@ -749,13 +749,13 @@ 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();
bb_show_usage();
namelen = i;
dirsize = i + 2;
stopIt=TRUE;
@@ -765,7 +765,7 @@ extern int mkfs_minix_main(int argc, char **argv)
#ifdef CONFIG_FEATURE_MINIX2
version2 = 1;
#else
error_msg("%s: not compiled with minix v2 support",
bb_error_msg("%s: not compiled with minix v2 support",
device_name);
exit(-1);
#endif
@@ -774,7 +774,7 @@ extern int mkfs_minix_main(int argc, char **argv)
case 'h':
default:
goodbye:
show_usage();
bb_show_usage();
}
}
} else {
@@ -792,7 +792,7 @@ goodbye:
if (device_name && !BLOCKS)
BLOCKS = get_size(device_name) / 1024;
if (!device_name || BLOCKS < 10) {
show_usage();
bb_show_usage();
}
#ifdef CONFIG_FEATURE_MINIX2
if (version2) {
@@ -816,13 +816,13 @@ goodbye:
strcpy(tmp + 2, ".badblocks");
DEV = open(device_name, O_RDWR);
if (DEV < 0)
error_msg_and_die("unable to open %s", device_name);
bb_error_msg_and_die("unable to open %s", device_name);
if (fstat(DEV, &statbuf) < 0)
error_msg_and_die("unable to stat %s", device_name);
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)
error_msg_and_die("will not try to make filesystem on '%s'", device_name);
bb_error_msg_and_die("will not try to make filesystem on '%s'", device_name);
setup_tables();
if (check)
check_blocks();