* removed getopt based parser and added a hand rolled one.
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <time.h>
#include <unistd.h>
#include <ctype.h>
#include <stdlib.h>
#include <termios.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/param.h>
#include <mntent.h>
#endif
-#ifdef MINIX2_SUPER_MAGIC2
-#define HAVE_MINIX2 1
-#endif
-
#ifndef __linux__
#define volatile
#endif
#define UPPER(size,n) (((size)+((n)-1))/(n))
#define INODE_SIZE (sizeof(struct minix_inode))
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
#define INODE_SIZE2 (sizeof(struct minix2_inode))
#define INODE_BLOCKS UPPER(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
: MINIX_INODES_PER_BLOCK))
static char *inode_buffer = NULL;
#define Inode (((struct minix_inode *) inode_buffer)-1)
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
#define Inode2 (((struct minix2_inode *) inode_buffer)-1)
#endif
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 BB_FEATURE_MINIX2
#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
#else
#define ZONES ((unsigned long)(Super.s_nzones))
static int used_good_blocks = 0;
static unsigned long req_nr_inodes = 0;
-#define inode_in_use(x) (isset(inode_map,(x)))
-#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
+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))
#define mark_inode(x) (setbit(inode_map,(x)))
#define unmark_inode(x) (clrbit(inode_map,(x)))
#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)
+static __attribute__ ((noreturn)) void show_usage()
{
- fprintf(stderr, "%s: %s\n", applet_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",
- applet_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);
+ usage(mkfs_minix_usage);
}
/*
if (!mnt)
return;
- die("%s is mounted; will not make a filesystem here!");
+ error_msg_and_die("%s is mounted; will not make a filesystem here!", device_name);
}
static long valid_offset(int fd, int offset)
int fd;
long size;
- fd = open(file, O_RDWR);
- if (fd < 0) {
- perror(file);
- exit(1);
- }
+ if ((fd = open(file, O_RDWR)) < 0)
+ perror_msg_and_die("%s", file);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
close(fd);
return (size * 512);
Super.s_state &= ~MINIX_ERROR_FS;
if (lseek(DEV, 0, SEEK_SET))
- die("seek to boot block failed in write_tables");
+ 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");
+ error_msg_and_die("unable to clear boot sector");
if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET))
- die("seek failed in write_tables");
+ 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");
+ 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");
+ 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");
+ 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");
+ 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");
+ error_msg_and_die("seek failed in write_block");
if (BLOCK_SIZE != write(DEV, buffer, BLOCK_SIZE))
- die("write failed in write_block");
+ error_msg_and_die("write failed in write_block");
}
static int get_free_block(void)
int blk;
if (used_good_blocks + 1 >= MAX_GOOD_BLOCKS)
- die("too many bad blocks");
+ error_msg_and_die("too many bad blocks");
if (used_good_blocks)
blk = good_blocks_table[used_good_blocks - 1] + 1;
else
while (blk < ZONES && zone_in_use(blk))
blk++;
if (blk >= ZONES)
- die("not enough good blocks");
+ error_msg_and_die("not enough good blocks");
good_blocks_table[used_good_blocks] = blk;
used_good_blocks++;
return blk;
goto end_bad;
}
}
- die("too many bad blocks");
+ error_msg_and_die("too many bad blocks");
end_bad:
if (ind)
write_block(ind, (char *) ind_block);
write_block(dind, (char *) dind_block);
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
static void make_bad_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
}
}
/* Could make triple indirect block here */
- die("too many bad blocks");
+ error_msg_and_die("too many bad blocks");
end_bad:
if (ind)
write_block(ind, (char *) ind_block);
write_block(inode->i_zone[0], root_block);
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
static void make_root_inode2(void)
{
struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
else
inodes = req_nr_inodes;
/* Round up inode count to fill block size */
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
if (version2)
inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
~(MINIX2_INODES_PER_BLOCK - 1));
* /sbin/mkfs.minix -i 200 test.fs
* */
if (i >= 999) {
- die("unable to allocate buffers for maps");
+ error_msg_and_die("unable to allocate buffers for maps");
}
FIRSTZONE = NORM_FIRSTZONE;
inode_map = xmalloc(IMAPS * BLOCK_SIZE);
/* 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");
+ error_msg_and_die("seek failed during testing of blocks");
}
while (currently_testing < ZONES) {
if (lseek(DEV, currently_testing * BLOCK_SIZE, SEEK_SET) !=
currently_testing * BLOCK_SIZE)
- die("seek failed in check_blocks");
+ error_msg_and_die("seek failed in check_blocks");
try = TEST_BUFFER_BLOCKS;
if (currently_testing + try > ZONES)
try = ZONES - currently_testing;
if (got == try)
continue;
if (currently_testing < FIRSTZONE)
- die("bad blocks before data-area: cannot make fs");
+ error_msg_and_die("bad blocks before data-area: cannot make fs");
mark_zone(currently_testing);
badblocks++;
currently_testing++;
listfile = fopen(filename, "r");
if (listfile == (FILE *) NULL) {
- die("can't open file of bad blocks");
+ error_msg_and_die("can't open file of bad blocks");
}
while (!feof(listfile)) {
fscanf(listfile, "%ld\n", &blockno);
int stopIt=FALSE;
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE)
- die("bad inode size");
-#ifdef HAVE_MINIX2
+ error_msg_and_die("bad inode size");
+#ifdef BB_FEATURE_MINIX2
if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE)
- die("bad inode size");
+ error_msg_and_die("bad inode size");
#endif
/* Parse options */
break;
}
case 'v':
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
version2 = 1;
#else
- fprintf(stderr, "%s: not compiled with minix v2 support\n",
- applet_name, device_name);
+ error_msg("%s: not compiled with minix v2 support",
+ device_name);
exit(-1);
#endif
break;
if (!device_name || BLOCKS < 10) {
show_usage();
}
-#ifdef HAVE_MINIX2
+#ifdef BB_FEATURE_MINIX2
if (version2) {
if (namelen == 14)
magic = MINIX2_SUPER_MAGIC;
strcpy(tmp + 2, ".badblocks");
DEV = open(device_name, O_RDWR);
if (DEV < 0)
- die("unable to open %s");
+ error_msg_and_die("unable to open %s", device_name);
if (fstat(DEV, &statbuf) < 0)
- die("unable to stat %s");
+ 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'");
+ 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 BB_FEATURE_MINIX2
if (version2) {
make_root_inode2();
make_bad_inode2();
projects / oweals / busybox.git / blobdiff