RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add --human-readable option where applicable 

Add an alias to -h to 'filesystem usage', 'filesystem df' and
'device usage' commands, same as the traditional 'df'.

Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
David Sterba 2015-01-21 18:47:24 +01:00
parent a5b66a81bf
commit 58a3952461
7 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/btrfs-device.txt
View File

@ -105,7 +105,7 @@ Show detailed information about internal allocations in devices.
+
-b|--raw::::
raw numbers in bytes, without the 'B' suffix
-h::::
-h|--human-readable::::
print human friendly numbers, base 1024, this is the default
-H::::
print human friendly numbers, base 1000

4
Documentation/btrfs-filesystem.txt
View File

@ -24,7 +24,7 @@ Show space usage information for a mount point.
+
-b|--raw::::
raw numbers in bytes, without the 'B' suffix
-h::::
-h|--human-readable::::
print human friendly numbers, base 1024, this is the default
-H::::
print human friendly numbers, base 1000
@ -132,7 +132,7 @@ Show detailed information about internal filesystem usage.
+
-b|--raw::::
raw numbers in bytes, without the 'B' suffix
-h::::
-h|--human-readable::::
print human friendly numbers, base 1024, this is the default
-H::::
print human friendly numbers, base 1000

2
Documentation/btrfs-qgroup.txt
View File

@ -91,6 +91,8 @@ list all qgroups which impact the given path(include ancestral qgroups)
list all qgroups which impact the given path(exclude ancestral qgroups)
--raw::::
raw numbers in bytes, without the 'B' suffix.
--human-readable::::
print human friendly numbers, base 1024, this is the default
--iec::::
select the 1024 base for the following options, according to the IEC standard.
--si::::

6
cmds-device.c
View File

@ -454,7 +454,8 @@ const char * const cmd_device_usage_usage[] = {
"btrfs device usage [options] <path> [<path>..]",
"Show detailed information about internal allocations in devices.",
"-b|--raw raw numbers in bytes",
"-h human friendly numbers, base 1024 (default)",
"-h|--human-readable",
" human friendly numbers, base 1024 (default)",
"-H human friendly numbers, base 1000",
"--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
"--si use 1000 as a base (kB, MB, GB, TB)",
@ -511,6 +512,8 @@ int cmd_device_usage(int argc, char **argv)
{ "tbytes", no_argument, NULL, 't'},
{ "si", no_argument, NULL, GETOPT_VAL_SI},
{ "iec", no_argument, NULL, GETOPT_VAL_IEC},
{ "human-readable", no_argument, NULL,
GETOPT_VAL_HUMAN_READABLE},
};
int c = getopt_long(argc, argv, "bhHkmgt", long_options,
&long_index);
@ -533,6 +536,7 @@ int cmd_device_usage(int argc, char **argv)
case 't':
units_set_base(&unit_mode, UNITS_TBYTES);
break;
case GETOPT_VAL_HUMAN_READABLE:
case 'h':
unit_mode = UNITS_HUMAN_BINARY;
break;

6
cmds-fi-disk_usage.c
View File

@ -849,7 +849,8 @@ const char * const cmd_filesystem_usage_usage[] = {
"btrfs filesystem usage [options] <path> [<path>..]",
"Show detailed information about internal filesystem usage .",
"-b|--raw raw numbers in bytes",
"-h human friendly numbers, base 1024 (default)",
"-h|--human-readable",
" human friendly numbers, base 1024 (default)",
"-H human friendly numbers, base 1000",
"--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
"--si use 1000 as a base (kB, MB, GB, TB)",
@ -879,6 +880,8 @@ int cmd_filesystem_usage(int argc, char **argv)
{ "tbytes", no_argument, NULL, 't'},
{ "si", no_argument, NULL, GETOPT_VAL_SI},
{ "iec", no_argument, NULL, GETOPT_VAL_IEC},
{ "human-readable", no_argument, NULL,
GETOPT_VAL_HUMAN_READABLE},
};
int c = getopt_long(argc, argv, "bhHkmgtT", long_options,
&long_index);
@ -901,6 +904,7 @@ int cmd_filesystem_usage(int argc, char **argv)
case 't':
units_set_base(&unit_mode, UNITS_TBYTES);
break;
case GETOPT_VAL_HUMAN_READABLE:
case 'h':
unit_mode = UNITS_HUMAN_BINARY;
break;

6
cmds-filesystem.c
View File

@ -126,7 +126,8 @@ static const char * const cmd_filesystem_df_usage[] = {
"btrfs filesystem df [options] <path>",
"Show space usage information for a mount point",
"-b|--raw raw numbers in bytes",
"-h human friendly numbers, base 1024 (default)",
"-h|--human-readable",
" human friendly numbers, base 1024 (default)",
"-H human friendly numbers, base 1000",
"--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
"--si use 1000 as a base (kB, MB, GB, TB)",
@ -218,6 +219,8 @@ static int cmd_filesystem_df(int argc, char **argv)
{ "tbytes", no_argument, NULL, 't'},
{ "si", no_argument, NULL, GETOPT_VAL_SI},
{ "iec", no_argument, NULL, GETOPT_VAL_IEC},
{ "human-readable", no_argument, NULL,
GETOPT_VAL_HUMAN_READABLE},
};
int c = getopt_long(argc, argv, "bhHkmgt", long_options,
&long_index);
@ -239,6 +242,7 @@ static int cmd_filesystem_df(int argc, char **argv)
case 't':
units_set_base(&unit_mode, UNITS_TBYTES);
break;
case GETOPT_VAL_HUMAN_READABLE:
case 'h':
unit_mode = UNITS_HUMAN_BINARY;
break;

7
cmds-qgroup.c
View File

@ -217,6 +217,8 @@ static const char * const cmd_qgroup_show_usage[] = {
"-f list all qgroups which impact the given path"
"(exclude ancestral qgroups)",
"--raw raw numbers in bytes",
"--human-readable",
" human firendly numbers in given base, 1024 by default",
"--iec use 1024 as a base (KiB, MiB, GiB, TiB)",
"--si use 1000 as a base (kB, MB, GB, TB)",
"--kbytes show sizes in KiB, or kB with --si",
@ -260,6 +262,8 @@ static int cmd_qgroup_show(int argc, char **argv)
{"tbytes", no_argument, NULL, GETOPT_VAL_TBYTES},
{"si", no_argument, NULL, GETOPT_VAL_SI},
{"iec", no_argument, NULL, GETOPT_VAL_IEC},
{ "human-readable", no_argument, NULL,
GETOPT_VAL_HUMAN_READABLE},
{0, 0, 0, 0}
};
c = getopt_long(argc, argv, "pcreFf",
@ -317,6 +321,9 @@ static int cmd_qgroup_show(int argc, char **argv)
case GETOPT_VAL_IEC:
units_set_mode(&unit_mode, UNITS_BINARY);
break;
case GETOPT_VAL_HUMAN_READABLE:
unit_mode = UNITS_HUMAN_BINARY;
break;
default:
usage(cmd_qgroup_show_usage);
}