emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tune2fs: implement -c and -i options

Browse Source 
function                                             old     new   delta
tune2fs_main                                         165     256     +91

Signed-off-by: Richard Braun <rbraun@sceen.net>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Richard Braun 2010-10-05 00:39:46 +02:00 committed by Denys Vlasenko
parent cacb2cd281
commit 5aa4d53273
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
e2fsprogs/tune2fs.c
View File

@ -27,24 +27,40 @@ do { \
#define FETCH_LE32(field) \ #define FETCH_LE32(field) \
(sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) (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 { enum {
OPT_L = 1 << 0, // label 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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int tune2fs_main(int argc UNUSED_PARAM, char **argv) int tune2fs_main(int argc UNUSED_PARAM, char **argv)
{ {
unsigned opts; unsigned opts;
const char *label; const char *label, *str_c, *str_i;
struct ext2_super_block *sb; struct ext2_super_block *sb;
int fd; int fd;
opt_complementary = "=1"; opt_complementary = "=1";
opts = getopt32(argv, "L:", &label); opts = getopt32(argv, "L:c:i:", &label, &str_c, &str_i);
argv += optind; // argv[0] -- device
if (!opts) if (!opts)
bb_show_usage(); bb_show_usage();
argv += optind; // argv[0] -- device
// read superblock // read superblock
fd = xopen(argv[0], O_RDWR); fd = xopen(argv[0], O_RDWR);
@ -54,9 +70,23 @@ int tune2fs_main(int argc UNUSED_PARAM, char **argv)
// mangle superblock // mangle superblock
//STORE_LE(sb->s_wtime, time(NULL)); - why bother? //STORE_LE(sb->s_wtime, time(NULL)); - why bother?
// set the label // 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)); 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 // write superblock
xlseek(fd, 1024, SEEK_SET); xlseek(fd, 1024, SEEK_SET);
xwrite(fd, sb, 1024); xwrite(fd, sb, 1024);

12
include/usage.src.h
View File

@ -4459,18 +4459,6 @@ INSERT
"# tunctl\n" \ "# tunctl\n" \
"# tunctl -d tun0\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 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
# define IF_UDHCP_VERBOSE(...) __VA_ARGS__ # define IF_UDHCP_VERBOSE(...) __VA_ARGS__
#else #else