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

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]);