X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmkfs_ext2.c;h=cf40c20eb7a23df09a53a61ac49fbdf6c9db2d5a;hb=345e093c2910e9e837de5b7cc5fb46752351f84d;hp=ea35e52877725606750adbae2849761a6b42deb3;hpb=09bbb2892da80efac4451e46683f9361d59cefd5;p=oweals%2Fbusybox.git

diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index ea35e5287..cf40c20eb 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -145,12 +145,12 @@ static void PUT(uint64_t off, void *buf, uint32_t size)
 
 // Standard mke2fs 1.41.9:
 // Usage: mke2fs [-c|-l filename] [-b block-size] [-f fragment-size]
-// 	[-i bytes-per-inode] [-I inode-size] [-J journal-options]
-// 	[-G meta group size] [-N number-of-inodes]
-// 	[-m reserved-blocks-percentage] [-o creator-os]
-// 	[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]
-// 	[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]
-// 	[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]
+//	[-i bytes-per-inode] [-I inode-size] [-J journal-options]
+//	[-G meta group size] [-N number-of-inodes]
+//	[-m reserved-blocks-percentage] [-o creator-os]
+//	[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]
+//	[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]
+//	[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]
 //
 // Options not commented below are taken but silently ignored:
 enum {
@@ -201,7 +201,6 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 	uint32_t inode_table_blocks;
 	uint32_t lost_and_found_blocks;
 	time_t timestamp;
-	unsigned opts;
 	const char *label = "";
 	struct stat st;
 	struct ext2_super_block *sb; // superblock
@@ -210,45 +209,35 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 	struct ext2_dir *dir;
 	uint8_t *buf;
 
+	// using global "option_mask32" instead of local "opts":
+	// we are register starved here
 	opt_complementary = "-1:b+:m+:i+";
-	opts = getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS",
+	/*opts =*/ getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS",
 		NULL, &bs, NULL, &bpi, &user_inodesize, NULL, NULL, NULL,
 		&reserved_percent, NULL, NULL, &label, NULL, NULL, NULL, NULL, NULL, NULL);
 	argv += optind; // argv[0] -- device
 
-	// check the device is a block device
+	// open the device, check the device is a block device
 	xmove_fd(xopen(argv[0], O_WRONLY), fd);
 	fstat(fd, &st);
-	if (!S_ISBLK(st.st_mode) && !(opts & OPT_F))
+	if (!S_ISBLK(st.st_mode) && !(option_mask32 & OPT_F))
 		bb_error_msg_and_die("not a block device");
 
 	// 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 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 (!(opts & 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;
-	}
+	// get size in kbytes
+	kilobytes = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ !(option_mask32 & OPT_n)) / 1024;
 
 	bytes_per_inode = 16384;
 	if (kilobytes < 512*1024)
 		bytes_per_inode = 4096;
 	if (kilobytes < 3*1024)
 		bytes_per_inode = 8192;
-	if (opts & OPT_i)
+	if (option_mask32 & OPT_i)
 		bytes_per_inode = bpi;
 
 	// Determine block size and inode size
@@ -267,7 +256,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 		while ((kilobytes >> 22) >= blocksize)
 			blocksize *= 2;
 	}
-	if (opts & OPT_b)
+	if (option_mask32 & OPT_b)
 		blocksize = bs;
 	if (blocksize < EXT2_MIN_BLOCK_SIZE
 	 || blocksize > EXT2_MAX_BLOCK_SIZE
@@ -276,7 +265,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 		bb_error_msg_and_die("blocksize %u is bad", blocksize);
 	}
 	// Do we have custom inode size?
-	if (opts & OPT_I) {
+	if (option_mask32 & OPT_I) {
 		if (user_inodesize < sizeof(*inode)
 		 || user_inodesize > blocksize
 		 || (user_inodesize & (user_inodesize - 1)) // not power of 2
@@ -310,7 +299,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 	nreserved = (uint64_t)nblocks * reserved_percent / 100;
 
 	// N.B. killing e2fsprogs feature! Unused blocks don't account in calculations
- 	nblocks_full = nblocks;
+	nblocks_full = nblocks;
 
 	// If last block group is too small, nblocks may be decreased in order
 	// to discard it, and control returns here to recalculate some
@@ -413,7 +402,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 		, inodes_per_group * ngroups, nblocks
 		, nreserved, reserved_percent
 		, first_block
-		, group_desc_blocks * (blocksize / sizeof(*gd)) * blocks_per_group
+		, group_desc_blocks * (blocksize / (unsigned)sizeof(*gd)) * blocks_per_group
 		, ngroups
 		, blocks_per_group, blocks_per_group
 		, inodes_per_group
@@ -432,7 +421,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
 	}
 	bb_putchar('\n');
 
-	if (opts & OPT_n) {
+	if (option_mask32 & OPT_n) {
 		if (ENABLE_FEATURE_CLEAN_UP)
 			close(fd);
 		return EXIT_SUCCESS;