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

mkXXXX: unify [KBYTES] parameter handling (added it to mkswap)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-02-01 23:48:27 +01:00
parent 4875e7148b
commit 40e7d25aca
8 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
util-linux/mkfs_ext2.c
View File

@ -230,19 +230,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
bb_error_msg_and_die("can't format mounted filesystem");
// open the device, get size in kbytes
if (argv[1]) {
kilobytes = xatoull(argv[1]);
// seek past end fails on block devices but works on files
if (lseek(fd, kilobytes * 1024 - 1, SEEK_SET) != (off_t)-1) {
if (!(option_mask32 & OPT_n))
xwrite(fd, "", 1); // file grows if needed
}
//else {
// bb_error_msg("warning, block device is smaller");
//}
} else {
kilobytes = (uoff_t)xlseek(fd, 0, SEEK_END) / 1024;
}
kilobytes = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ !(option_mask32 & OPT_n)) / 1024;
bytes_per_inode = 16384;
if (kilobytes < 512*1024)

15
util-linux/mkfs_reiser.c
View File

@ -175,23 +175,12 @@ int mkfs_reiser_main(int argc UNUSED_PARAM, char **argv)
// check if it is mounted
// N.B. what if we format a file? find_mount_point will return false negative since
// it is loop block device which mounted!
// it is loop block device which is mounted!
if (find_mount_point(argv[0], 0))
bb_error_msg_and_die("can't format mounted filesystem");
// open the device, get size in blocks
if (argv[1]) {
blocks = xatoull(argv[1]);
// seek past end fails on block devices but works on files
if (lseek(fd, blocks * blocksize - 1, SEEK_SET) != (off_t)-1) {
xwrite(fd, "", 1); // file grows if needed
}
//else {
// bb_error_msg("warning, block device is smaller");
//}
} else {
blocks = (uoff_t)xlseek(fd, 0, SEEK_END) / blocksize;
}
blocks = get_volume_size_in_bytes(fd, argv[1], blocksize, /*extend:*/ 1) / blocksize;
// block number sanity check
// we have a limit: skipped area, super block, journal and root block

14
util-linux/mkfs_vfat.c
View File

@ -244,7 +244,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
// default volume ID = creation time
volume_id = time(NULL);
dev = xopen(device_name, O_EXCL | O_RDWR);
dev = xopen(device_name, O_RDWR);
if (fstat(dev, &st) < 0)
bb_simple_perror_msg_and_die(device_name);
@ -252,7 +252,6 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
// Get image size and sector size
//
bytes_per_sect = SECTOR_SIZE;
volume_size_bytes = st.st_size;
if (!S_ISBLK(st.st_mode)) {
if (!S_ISREG(st.st_mode)) {
if (!argv[1])
@ -262,10 +261,6 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
opts &= ~OPT_c;
} else {
int min_bytes_per_sect;
// more portable than BLKGETSIZE[64]
volume_size_bytes = xlseek(dev, 0, SEEK_END);
xlseek(dev, 0, SEEK_SET);
#if 0
unsigned device_num;
// for true block devices we do check sanity
@ -290,12 +285,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
bb_error_msg("for this device sector size is %u", min_bytes_per_sect);
}
}
if (argv[1]) {
volume_size_bytes = XATOOFF(argv[1]);
if (volume_size_bytes >= MAXINT(off_t) / 1024)
bb_error_msg_and_die("image size is too big");
volume_size_bytes *= 1024;
}
volume_size_bytes = get_volume_size_in_bytes(dev, argv[1], 1024, /*extend:*/ 1);
volume_size_sect = volume_size_bytes / bytes_per_sect;
//

16
util-linux/mkswap.c
View File

@ -86,23 +86,19 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
off_t len;
const char *label = "";
opt_complementary = "=1";
/* TODO: -p PAGESZ, -U UUID,
* optional SIZE_IN_KB 2nd param
*/
opt_complementary = "-1"; /* at least one param */
/* TODO: -p PAGESZ, -U UUID */
getopt32(argv, "L:", &label);
argv += optind;
fd = xopen(argv[0], O_WRONLY);
/* Figure out how big the device is and announce our intentions */
/* fdlength was reported to be unreliable - use seek */
len = xlseek(fd, 0, SEEK_END);
if (ENABLE_SELINUX)
xlseek(fd, 0, SEEK_SET);
/* Figure out how big the device is */
len = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ 1);
pagesize = getpagesize();
len -= pagesize;
/* Announce our intentions */
printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", len);
mkswap_selinux_setcontext(fd, argv[0]);