tune2fs: move to e2fsprogs

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Denys Vlasenko <vda.linux@googlemail.com> 2010-05-09 00:13:40 +0200
committer: Denys Vlasenko <vda.linux@googlemail.com> 2010-05-09 00:13:40 +0200
commit: 6774386d95cec54258f23f69bc287c99e205ebdf (patch)
tree: 51a81051eb233a15e6107579c8573ecec5b09726 /e2fsprogs
parent: 19afe848eca8d3baf149cd7ed715489403360287 (diff)
download: busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.gz
busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.bz2
busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.zip
3 files changed, 78 insertions, 7 deletions
diff --git a/e2fsprogs/Config.in b/e2fsprogs/Config.in
index 9a0088ab5..964d08e4c 100644
--- a/e2fsprogs/Config.in
+++ b/e2fsprogs/Config.in
@@ -41,12 +41,12 @@ config LSATTR
 ###       mke2fs is used to create an ext2/ext3 filesystem. The normal compat
 ###       symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
-### config TUNE2FS
+config TUNE2FS
-###     bool "tune2fs"
+        bool "tune2fs"
-###     default n
+        default n
-###     help
+        help
-###       tune2fs allows the system administrator to adjust various tunable
+          tune2fs allows the system administrator to adjust various tunable
-###       filesystem parameters on Linux ext2/ext3 filesystems.
+          filesystem parameters on Linux ext2/ext3 filesystems.
 ### config E2LABEL
 ###     bool "e2label"
diff --git a/e2fsprogs/Kbuild b/e2fsprogs/Kbuild
index 9f58ce092..0fdc9d215 100644
--- a/e2fsprogs/Kbuild
+++ b/e2fsprogs/Kbuild
@@ -9,4 +9,5 @@ lib-y:=
 lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
 lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
-lib-$(CONFIG_FSCK) += fsck.o
+lib-$(CONFIG_FSCK)    += fsck.o
+lib-$(CONFIG_TUNE2FS) += tune2fs.o
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
new file mode 100644
index 000000000..00ede4f1e
--- /dev/null
+++ b/e2fsprogs/tune2fs.c
@@ -0,0 +1,70 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * tune2fs: utility to modify EXT2 filesystem
+ *
+ * Busybox'ed (2009) by Vladimir Dronnikov <dronnikov@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ */
+#include "libbb.h"
+#include <linux/fs.h>
+#include <linux/ext2_fs.h>
+// storage helpers
+char BUG_wrong_field_size(void);
+#define STORE_LE(field, value) \
+do { \
+        if (sizeof(field) == 4) \
+                field = SWAP_LE32(value); \
+        else if (sizeof(field) == 2) \
+                field = SWAP_LE16(value); \
+        else if (sizeof(field) == 1) \
+                field = (value); \
+        else \
+                BUG_wrong_field_size(); \
+} while (0)
+#define FETCH_LE32(field) \
+        (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
+enum {
+        OPT_L = 1 << 0, // label
+};
+int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tune2fs_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned opts;
+        const char *label;
+        struct ext2_super_block *sb;
+        int fd;
+        opt_complementary = "=1";
+        opts = getopt32(argv, "L:", &label);
+        argv += optind; // argv[0] -- device
+        if (!opts)
+                bb_show_usage();
+        // read superblock
+        fd = xopen(argv[0], O_RDWR);
+        xlseek(fd, 1024, SEEK_SET);
+        sb = xzalloc(1024);
+        xread(fd, sb, 1024);
+        // mangle superblock
+        //STORE_LE(sb->s_wtime, time(NULL)); - why bother?
+        // set the label
+        if (1 /*opts & OPT_L*/)
+                safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name));
+        // write superblock
+        xlseek(fd, 1024, SEEK_SET);
+        xwrite(fd, sb, 1024);
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(sb);
+        }
+        xclose(fd);
+        return EXIT_SUCCESS;
+}
author	Denys Vlasenko <vda.linux@googlemail.com>	2010-05-09 00:13:40 +0200
committer	Denys Vlasenko <vda.linux@googlemail.com>	2010-05-09 00:13:40 +0200
commit	6774386d95cec54258f23f69bc287c99e205ebdf (patch)
tree	51a81051eb233a15e6107579c8573ecec5b09726 /e2fsprogs
parent	19afe848eca8d3baf149cd7ed715489403360287 (diff)
download	busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.gz busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.bz2 busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.zip

diff --git a/e2fsprogs/Config.in b/e2fsprogs/Config.in index 9a0088ab5..964d08e4c 100644 --- a/e2fsprogs/Config.in +++ b/e2fsprogs/Config.in
@@ -41,12 +41,12 @@ config LSATTR
41	### mke2fs is used to create an ext2/ext3 filesystem. The normal compat	41	### mke2fs is used to create an ext2/ext3 filesystem. The normal compat
42	### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.	42	### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
43		43
44	### config TUNE2FS	44	config TUNE2FS
45	### bool "tune2fs"	45	bool "tune2fs"
46	### default n	46	default n
47	### help	47	help
48	### tune2fs allows the system administrator to adjust various tunable	48	tune2fs allows the system administrator to adjust various tunable
49	### filesystem parameters on Linux ext2/ext3 filesystems.	49	filesystem parameters on Linux ext2/ext3 filesystems.
50		50
51	### config E2LABEL	51	### config E2LABEL
52	### bool "e2label"	52	### bool "e2label"


diff --git a/e2fsprogs/Kbuild b/e2fsprogs/Kbuild index 9f58ce092..0fdc9d215 100644 --- a/e2fsprogs/Kbuild +++ b/e2fsprogs/Kbuild
@@ -9,4 +9,5 @@ lib-y:=
9	lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o	9	lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
10	lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o	10	lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
11		11
12	lib-$(CONFIG_FSCK) += fsck.o	12	lib-$(CONFIG_FSCK) += fsck.o
		13	lib-$(CONFIG_TUNE2FS) += tune2fs.o


diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c new file mode 100644 index 000000000..00ede4f1e --- /dev/null +++ b/e2fsprogs/tune2fs.c
@@ -0,0 +1,70 @@
		1	/* vi: set sw=4 ts=4: */
		2	/*
		3	* tune2fs: utility to modify EXT2 filesystem
		4	*
		5	* Busybox'ed (2009) by Vladimir Dronnikov <dronnikov@gmail.com>
		6	*
		7	* Licensed under GPLv2, see file LICENSE in this tarball for details.
		8	*/
		9	#include "libbb.h"
		10	#include <linux/fs.h>
		11	#include <linux/ext2_fs.h>
		12
		13	// storage helpers
		14	char BUG_wrong_field_size(void);
		15	#define STORE_LE(field, value) \
		16	do { \
		17	if (sizeof(field) == 4) \
		18	field = SWAP_LE32(value); \
		19	else if (sizeof(field) == 2) \
		20	field = SWAP_LE16(value); \
		21	else if (sizeof(field) == 1) \
		22	field = (value); \
		23	else \
		24	BUG_wrong_field_size(); \
		25	} while (0)
		26
		27	#define FETCH_LE32(field) \
		28	(sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
		29
		30	enum {
		31	OPT_L = 1 << 0, // label
		32	};
		33
		34	int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
		35	int tune2fs_main(int argc UNUSED_PARAM, char **argv)
		36	{
		37	unsigned opts;
		38	const char *label;
		39	struct ext2_super_block *sb;
		40	int fd;
		41
		42	opt_complementary = "=1";
		43	opts = getopt32(argv, "L:", &label);
		44	argv += optind; // argv[0] -- device
		45
		46	if (!opts)
		47	bb_show_usage();
		48
		49	// read superblock
		50	fd = xopen(argv[0], O_RDWR);
		51	xlseek(fd, 1024, SEEK_SET);
		52	sb = xzalloc(1024);
		53	xread(fd, sb, 1024);
		54
		55	// mangle superblock
		56	//STORE_LE(sb->s_wtime, time(NULL)); - why bother?
		57	// set the label
		58	if (1 /opts & OPT_L/)
		59	safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name));
		60	// write superblock
		61	xlseek(fd, 1024, SEEK_SET);
		62	xwrite(fd, sb, 1024);
		63
		64	if (ENABLE_FEATURE_CLEAN_UP) {
		65	free(sb);
		66	}
		67
		68	xclose(fd);
		69	return EXIT_SUCCESS;
		70	}