Merge pull request #3327 from cakebaker/ticket_3324

df: --output w/o "=" doesn't expect further args
uutils · Mar 28, 2022 · d6fd701 · d6fd701
2 parents b07b71e + a68d77b
commit d6fd701
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs
@@ -388,6 +388,8 @@ pub fn uu_app<'a>() -> Command<'a> {
             Arg::new(OPT_OUTPUT)
                 .long("output")
                 .takes_value(true)
+                .min_values(0)
+                .require_equals(true)
                 .use_value_delimiter(true)
                 .multiple_occurrences(true)
                 .possible_values(OUTPUT_FIELD_LIST)

diff --git a/tests/by-util/test_df.rs b/tests/by-util/test_df.rs
@@ -80,6 +80,11 @@ fn test_output_option() {
     new_ucmd!().arg("--output=invalid_option").fails();
 }
 
+#[test]
+fn test_output_option_without_equals_sign() {
+    new_ucmd!().arg("--output").arg(".").succeeds();
+}
+
 #[test]
 fn test_type_option() {
     new_ucmd!().args(&["-t", "ext4", "-t", "ext3"]).succeeds();