mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
mkXXXX: unify [KBYTES] parameter handling (added it to mkswap)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
4875e7148b
commit
40e7d25aca
@ -412,6 +412,11 @@ int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC;
|
|||||||
off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
|
off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
|
||||||
off_t fdlength(int fd) FAST_FUNC;
|
off_t fdlength(int fd) FAST_FUNC;
|
||||||
|
|
||||||
|
uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
|
||||||
|
const char *override,
|
||||||
|
unsigned override_units,
|
||||||
|
int extend);
|
||||||
|
|
||||||
void xpipe(int filedes[2]) FAST_FUNC;
|
void xpipe(int filedes[2]) FAST_FUNC;
|
||||||
/* In this form code with pipes is much more readable */
|
/* In this form code with pipes is much more readable */
|
||||||
struct fd_pair { int rd; int wr; };
|
struct fd_pair { int rd; int wr; };
|
||||||
|
@ -2844,7 +2844,7 @@
|
|||||||
"$ mknod -m 644 /tmp/pipe p\n"
|
"$ mknod -m 644 /tmp/pipe p\n"
|
||||||
|
|
||||||
#define mkswap_trivial_usage \
|
#define mkswap_trivial_usage \
|
||||||
"[OPTIONS] BLOCKDEV" /* [SIZE_IN_KB] */
|
"[OPTIONS] BLOCKDEV [KBYTES]"
|
||||||
#define mkswap_full_usage "\n\n" \
|
#define mkswap_full_usage "\n\n" \
|
||||||
"Prepare BLOCKDEV to be used as swap partition\n" \
|
"Prepare BLOCKDEV to be used as swap partition\n" \
|
||||||
"\nOptions:" \
|
"\nOptions:" \
|
||||||
|
@ -42,6 +42,7 @@ lib-y += get_last_path_component.o
|
|||||||
lib-y += get_line_from_file.o
|
lib-y += get_line_from_file.o
|
||||||
lib-y += getopt32.o
|
lib-y += getopt32.o
|
||||||
lib-y += getpty.o
|
lib-y += getpty.o
|
||||||
|
lib-y += get_volsize.o
|
||||||
lib-y += herror_msg.o
|
lib-y += herror_msg.o
|
||||||
lib-y += herror_msg_and_die.o
|
lib-y += herror_msg_and_die.o
|
||||||
lib-y += human_readable.o
|
lib-y += human_readable.o
|
||||||
|
48
libbb/get_volsize.c
Normal file
48
libbb/get_volsize.c
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
/* vi: set sw=4 ts=4: */
|
||||||
|
/*
|
||||||
|
* Utility routines.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Denys Vlasenko
|
||||||
|
*
|
||||||
|
* Licensed under GPLv2, see file LICENSE in this tarball for details.
|
||||||
|
*/
|
||||||
|
#include "libbb.h"
|
||||||
|
|
||||||
|
uoff_t FAST_FUNC get_volume_size_in_bytes(int fd,
|
||||||
|
const char *override,
|
||||||
|
unsigned override_units,
|
||||||
|
int extend)
|
||||||
|
{
|
||||||
|
uoff_t result;
|
||||||
|
|
||||||
|
if (override) {
|
||||||
|
result = XATOOFF(override);
|
||||||
|
if (result >= (uoff_t)(MAXINT(off_t)) / override_units)
|
||||||
|
bb_error_msg_and_die("image size is too big");
|
||||||
|
result *= override_units;
|
||||||
|
/* seek past end fails on block devices but works on files */
|
||||||
|
if (lseek(fd, result - 1, SEEK_SET) != (off_t)-1) {
|
||||||
|
if (extend)
|
||||||
|
xwrite(fd, "", 1); /* file grows if needed */
|
||||||
|
}
|
||||||
|
//else {
|
||||||
|
// bb_error_msg("warning, block device is smaller");
|
||||||
|
//}
|
||||||
|
} else {
|
||||||
|
/* more portable than BLKGETSIZE[64] */
|
||||||
|
result = xlseek(fd, 0, SEEK_END);
|
||||||
|
}
|
||||||
|
|
||||||
|
xlseek(fd, 0, SEEK_SET);
|
||||||
|
|
||||||
|
/* Prevent things like this:
|
||||||
|
* $ dd if=/dev/zero of=foo count=1 bs=1024
|
||||||
|
* $ mkswap foo
|
||||||
|
* Setting up swapspace version 1, size = 18446744073709548544 bytes
|
||||||
|
*
|
||||||
|
* Picked 16k arbitrarily: */
|
||||||
|
if (result < 16*1024)
|
||||||
|
bb_error_msg_and_die("image is too small");
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
@ -230,19 +230,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
bb_error_msg_and_die("can't format mounted filesystem");
|
bb_error_msg_and_die("can't format mounted filesystem");
|
||||||
|
|
||||||
// open the device, get size in kbytes
|
// open the device, get size in kbytes
|
||||||
if (argv[1]) {
|
kilobytes = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ !(option_mask32 & OPT_n)) / 1024;
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes_per_inode = 16384;
|
bytes_per_inode = 16384;
|
||||||
if (kilobytes < 512*1024)
|
if (kilobytes < 512*1024)
|
||||||
|
@ -175,23 +175,12 @@ int mkfs_reiser_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
|
|
||||||
// check if it is mounted
|
// check if it is mounted
|
||||||
// N.B. what if we format a file? find_mount_point will return false negative since
|
// 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))
|
if (find_mount_point(argv[0], 0))
|
||||||
bb_error_msg_and_die("can't format mounted filesystem");
|
bb_error_msg_and_die("can't format mounted filesystem");
|
||||||
|
|
||||||
// open the device, get size in blocks
|
// open the device, get size in blocks
|
||||||
if (argv[1]) {
|
blocks = get_volume_size_in_bytes(fd, argv[1], blocksize, /*extend:*/ 1) / blocksize;
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
// block number sanity check
|
// block number sanity check
|
||||||
// we have a limit: skipped area, super block, journal and root block
|
// we have a limit: skipped area, super block, journal and root block
|
||||||
|
@ -244,7 +244,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
// default volume ID = creation time
|
// default volume ID = creation time
|
||||||
volume_id = time(NULL);
|
volume_id = time(NULL);
|
||||||
|
|
||||||
dev = xopen(device_name, O_EXCL | O_RDWR);
|
dev = xopen(device_name, O_RDWR);
|
||||||
if (fstat(dev, &st) < 0)
|
if (fstat(dev, &st) < 0)
|
||||||
bb_simple_perror_msg_and_die(device_name);
|
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
|
// Get image size and sector size
|
||||||
//
|
//
|
||||||
bytes_per_sect = SECTOR_SIZE;
|
bytes_per_sect = SECTOR_SIZE;
|
||||||
volume_size_bytes = st.st_size;
|
|
||||||
if (!S_ISBLK(st.st_mode)) {
|
if (!S_ISBLK(st.st_mode)) {
|
||||||
if (!S_ISREG(st.st_mode)) {
|
if (!S_ISREG(st.st_mode)) {
|
||||||
if (!argv[1])
|
if (!argv[1])
|
||||||
@ -262,10 +261,6 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
opts &= ~OPT_c;
|
opts &= ~OPT_c;
|
||||||
} else {
|
} else {
|
||||||
int min_bytes_per_sect;
|
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
|
#if 0
|
||||||
unsigned device_num;
|
unsigned device_num;
|
||||||
// for true block devices we do check sanity
|
// 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);
|
bb_error_msg("for this device sector size is %u", min_bytes_per_sect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (argv[1]) {
|
volume_size_bytes = get_volume_size_in_bytes(dev, argv[1], 1024, /*extend:*/ 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_sect = volume_size_bytes / bytes_per_sect;
|
volume_size_sect = volume_size_bytes / bytes_per_sect;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -86,23 +86,19 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
off_t len;
|
off_t len;
|
||||||
const char *label = "";
|
const char *label = "";
|
||||||
|
|
||||||
opt_complementary = "=1";
|
opt_complementary = "-1"; /* at least one param */
|
||||||
/* TODO: -p PAGESZ, -U UUID,
|
/* TODO: -p PAGESZ, -U UUID */
|
||||||
* optional SIZE_IN_KB 2nd param
|
|
||||||
*/
|
|
||||||
getopt32(argv, "L:", &label);
|
getopt32(argv, "L:", &label);
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
fd = xopen(argv[0], O_WRONLY);
|
fd = xopen(argv[0], O_WRONLY);
|
||||||
|
|
||||||
/* Figure out how big the device is and announce our intentions */
|
/* Figure out how big the device is */
|
||||||
/* fdlength was reported to be unreliable - use seek */
|
len = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ 1);
|
||||||
len = xlseek(fd, 0, SEEK_END);
|
|
||||||
if (ENABLE_SELINUX)
|
|
||||||
xlseek(fd, 0, SEEK_SET);
|
|
||||||
|
|
||||||
pagesize = getpagesize();
|
pagesize = getpagesize();
|
||||||
len -= pagesize;
|
len -= pagesize;
|
||||||
|
|
||||||
|
/* Announce our intentions */
|
||||||
printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", len);
|
printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", len);
|
||||||
mkswap_selinux_setcontext(fd, argv[0]);
|
mkswap_selinux_setcontext(fd, argv[0]);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user