Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

df: add output option's valid field names

Browse source
This commit is contained in:
xxyzz 2022-02-17 13:43:59 +08:00
parent c849b8722f
commit c16c06ea0d
No known key found for this signature in database
GPG key ID: F796163E6DCFEE9D
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/uu/df/src/df.rs
View file

@ -5,6 +5,7 @@
// //
// For the full copyright and license information, please view the LICENSE file // For the full copyright and license information, please view the LICENSE file
// that was distributed with this source code. // that was distributed with this source code.
// spell-checker:ignore itotal iused iavail ipcent pcent
mod table; mod table;
use uucore::error::UResult; use uucore::error::UResult;
@ -46,6 +47,10 @@ static OPT_SYNC: &str = "sync";
static OPT_TYPE: &str = "type"; static OPT_TYPE: &str = "type";
static OPT_PRINT_TYPE: &str = "print-type"; static OPT_PRINT_TYPE: &str = "print-type";
static OPT_EXCLUDE_TYPE: &str = "exclude-type"; static OPT_EXCLUDE_TYPE: &str = "exclude-type";
static OUTPUT_FIELD_LIST: [&str; 12] = [
"source", "fstype", "itotal", "iused", "iavail", "ipcent", "size", "used", "avail", "pcent",
"file", "target",
];
/// Store names of file systems as a selector. /// Store names of file systems as a selector.
/// Note: `exclude` takes priority over `include`. /// Note: `exclude` takes priority over `include`.
@ -338,7 +343,6 @@ pub fn uu_app<'a>() -> App<'a> {
Arg::new(OPT_INODES) Arg::new(OPT_INODES)
.short('i') .short('i')
.long("inodes") .long("inodes")
.conflicts_with(OPT_OUTPUT)
.help("list inode information instead of block usage"), .help("list inode information instead of block usage"),
) )
.arg(Arg::new(OPT_KILO).short('k').help("like --block-size=1K")) .arg(Arg::new(OPT_KILO).short('k').help("like --block-size=1K"))
@ -359,6 +363,10 @@ pub fn uu_app<'a>() -> App<'a> {
.long("output") .long("output")
.takes_value(true) .takes_value(true)
.use_delimiter(true) .use_delimiter(true)
.possible_values(OUTPUT_FIELD_LIST)
.default_missing_values(&OUTPUT_FIELD_LIST)
.default_values(&["source", "size", "used", "avail", "pcent", "target"])
.conflicts_with_all(&[OPT_INODES, OPT_PORTABILITY, OPT_PRINT_TYPE])
.help( .help(
"use the output format defined by FIELD_LIST,\ "use the output format defined by FIELD_LIST,\
or print all fields if FIELD_LIST is omitted.", or print all fields if FIELD_LIST is omitted.",
@ -368,7 +376,6 @@ pub fn uu_app<'a>() -> App<'a> {
Arg::new(OPT_PORTABILITY) Arg::new(OPT_PORTABILITY)
.short('P') .short('P')
.long("portability") .long("portability")
.conflicts_with(OPT_OUTPUT)
.help("use the POSIX output format"), .help("use the POSIX output format"),
) )
.arg( .arg(
@ -390,7 +397,6 @@ pub fn uu_app<'a>() -> App<'a> {
Arg::new(OPT_PRINT_TYPE) Arg::new(OPT_PRINT_TYPE)
.short('T') .short('T')
.long("print-type") .long("print-type")
.conflicts_with(OPT_OUTPUT)
.help("print file system type"), .help("print file system type"),
) )
.arg( .arg(

19
tests/by-util/test_df.rs
View file

@ -58,4 +58,23 @@ fn test_order_same() {
assert_eq!(output1, output2); assert_eq!(output1, output2);
} }
#[test]
fn test_output_conflict_options() {
for option in ["-i", "-T", "-P"] {
new_ucmd!().arg("--output=source").arg(option).fails();
}
}
#[test]
fn test_output_option() {
new_ucmd!().arg("--output").succeeds();
new_ucmd!().arg("--output=source,target").succeeds();
new_ucmd!().arg("--output=invalid_option").fails();
}
#[test]
fn test_type_option() {
new_ucmd!().args(&["-t", "ext4", "-t", "ext3"]).succeeds();
}
// ToDO: more tests... // ToDO: more tests...