From 5aa4d532735b715f10560513e79e96f237957570 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Tue, 5 Oct 2010 00:39:46 +0200 Subject: tune2fs: implement -c and -i options function old new delta tune2fs_main 165 256 +91 Signed-off-by: Richard Braun Signed-off-by: Denys Vlasenko --- e2fsprogs/tune2fs.c | 40 +++++++++++++++++++++++++++++++++++----- include/usage.src.h | 12 ------------ 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c index 311349fec..75e4f6bcf 100644 --- a/e2fsprogs/tune2fs.c +++ b/e2fsprogs/tune2fs.c @@ -27,24 +27,40 @@ do { \ #define FETCH_LE32(field) \ (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) +//usage:#define tune2fs_trivial_usage +//usage: "[-c MOUNT_CNT] " +////usage: "[-e errors-behavior] [-g group] " +//usage: "[-i DAYS] " +////usage: "[-j] [-J journal-options] [-l] [-s sparse-flag] " +////usage: "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " +////usage: "[-r reserved-blocks-count] [-u user] [-C mount-count] " +//usage: "[-L LABEL] " +////usage: "[-M last-mounted-dir] [-O [^]feature[,...]] " +////usage: "[-T last-check-time] [-U UUID] " +//usage: "BLOCKDEV" +//usage: +//usage:#define tune2fs_full_usage "\n\n" +//usage: "Adjust filesystem options on ext[23] filesystems" + enum { OPT_L = 1 << 0, // label + OPT_c = 1 << 1, // max mount count + OPT_i = 1 << 2, // check interval }; int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tune2fs_main(int argc UNUSED_PARAM, char **argv) { unsigned opts; - const char *label; + const char *label, *str_c, *str_i; struct ext2_super_block *sb; int fd; opt_complementary = "=1"; - opts = getopt32(argv, "L:", &label); - argv += optind; // argv[0] -- device - + opts = getopt32(argv, "L:c:i:", &label, &str_c, &str_i); if (!opts) bb_show_usage(); + argv += optind; // argv[0] -- device // read superblock fd = xopen(argv[0], O_RDWR); @@ -54,9 +70,23 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv) // mangle superblock //STORE_LE(sb->s_wtime, time(NULL)); - why bother? + // set the label - if (1 /*opts & OPT_L*/) + if (opts & OPT_L) safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name)); + + if (opts & OPT_c) { + int n = xatoi_range(str_c, -1, 0xfffe); + if (n == 0) + n = -1; + STORE_LE(sb->s_max_mnt_count, (unsigned)n); + } + + if (opts & OPT_i) { + unsigned n = xatou_range(str_i, 0, (unsigned)0xffffffff / (24*60*60)) * 24*60*60; + STORE_LE(sb->s_checkinterval, n); + } + // write superblock xlseek(fd, 1024, SEEK_SET); xwrite(fd, sb, 1024); diff --git a/include/usage.src.h b/include/usage.src.h index e7e9269e9..92a106e3b 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -4459,18 +4459,6 @@ INSERT "# tunctl\n" \ "# tunctl -d tun0\n" -#define tune2fs_trivial_usage \ -/* "[-c max-mounts-count] [-e errors-behavior] [-g group] " */ \ -/* "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " */ \ -/* "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " */ \ -/* "[-r reserved-blocks-count] [-u user] [-C mount-count] " */ \ - "[-L LABEL] " \ -/* "[-M last-mounted-dir] [-O [^]feature[,...]] " */ \ -/* "[-T last-check-time] [-U UUID] " */ \ - "BLOCKDEV" -#define tune2fs_full_usage "\n\n" \ - "Adjust filesystem options on ext[23] filesystems" - #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 # define IF_UDHCP_VERBOSE(...) __VA_ARGS__ #else -- cgit v1.2.3