df: support -m with --output (#14742)

Author: wtcpython

src/uu/df/locales/en-US.ftl

@@ -18,6 +18,7 @@ df-help-human-readable = print sizes in human readable format (e.g., 1K 234M 2G)
 df-help-si = likewise, but use powers of 1000 not 1024
 df-help-inodes = list inode information instead of block usage
 df-help-kilo = like --block-size=1K
+df-help-mega = like --block-size=1M
 df-help-local = limit listing to local file systems
 df-help-no-sync = do not invoke sync before getting usage info (default)
 df-help-output = use output format defined by FIELD_LIST, or print all fields if FIELD_LIST is omitted.

src/uu/df/locales/fr-FR.ftl

@@ -18,6 +18,7 @@ df-help-human-readable = afficher les tailles dans un format lisible par l'homme
 df-help-si = pareillement, mais utiliser les puissances de 1000 pas 1024
 df-help-inodes = lister les informations d'inode au lieu de l'utilisation des blocs
 df-help-kilo = comme --block-size=1K
+df-help-mega = comme --block-size=1M
 df-help-local = limiter l'affichage aux systèmes de fichiers locaux
 df-help-no-sync = ne pas invoquer sync avant d'obtenir les informations d'utilisation (par défaut)
 df-help-output = utiliser le format de sortie défini par LISTE_CHAMPS, ou afficher tous les champs si LISTE_CHAMPS est omise.

src/uu/df/src/blocks.rs

@@ -4,7 +4,7 @@
 // file that was distributed with this source code.
 
 //! Types for representing and displaying block sizes.
-use crate::{OPT_BLOCKSIZE, OPT_PORTABILITY};
+use crate::{OPT_BLOCKSIZE, OPT_KILO, OPT_MEGA, OPT_PORTABILITY};
 use clap::ArgMatches;
 use std::fmt;
 
@@ -171,6 +171,10 @@ pub(crate) fn read_block_size(matches: &ArgMatches) -> Result<BlockSize, ParseSi
         } else {
             Err(ParseSizeError::ParseFailure(format!("{}", s.quote())))
         }
+    } else if matches.get_flag(OPT_KILO) {
+        Ok(BlockSize::Bytes(1024))
+    } else if matches.get_flag(OPT_MEGA) {
+        Ok(BlockSize::Bytes(1024 * 1024))
     } else if matches.get_flag(OPT_PORTABILITY) {
         Ok(BlockSize::default())
     } else if let Some(bytes) =

src/uu/df/src/df.rs

@@ -48,6 +48,7 @@ static OPT_HUMAN_READABLE_BINARY: &str = "human-readable-binary";
 static OPT_HUMAN_READABLE_DECIMAL: &str = "human-readable-decimal";
 static OPT_INODES: &str = "inodes";
 static OPT_KILO: &str = "kilo";
+static OPT_MEGA: &str = "mega";
 static OPT_LOCAL: &str = "local";
 static OPT_NO_SYNC: &str = "no-sync";
 static OPT_OUTPUT: &str = "output";
@@ -562,7 +563,7 @@ pub fn uu_app() -> Command {
                 .short('B')
                 .long(OPT_BLOCKSIZE_LONG)
                 .value_name("SIZE")
-                .overrides_with_all([OPT_KILO, OPT_BLOCKSIZE])
+                .overrides_with_all([OPT_KILO, OPT_MEGA, OPT_BLOCKSIZE])
                 .help(translate!("df-help-block-size")),
         )
         .arg(
@@ -600,7 +601,14 @@ pub fn uu_app() -> Command {
             Arg::new(OPT_KILO)
                 .short('k')
                 .help(translate!("df-help-kilo"))
-                .overrides_with_all([OPT_BLOCKSIZE, OPT_KILO])
+                .overrides_with_all([OPT_BLOCKSIZE, OPT_KILO, OPT_MEGA])
+                .action(ArgAction::SetTrue),
+        )
+        .arg(
+            Arg::new(OPT_MEGA)
+                .short('m')
+                .help(translate!("df-help-mega"))
+                .overrides_with_all([OPT_BLOCKSIZE, OPT_KILO, OPT_MEGA])
                 .action(ArgAction::SetTrue),
         )
         .arg(

tests/by-util/test_df.rs

@@ -640,6 +640,16 @@ fn test_block_size_1024() {
     assert_eq!(get_header(1_000_000_000_000), "1TB-blocks");
 }
 
+#[test]
+fn test_block_size_1m_option_with_output() {
+    for args in [["-m", "--output=size"], ["--output=size", "-m"]] {
+        let output = new_ucmd!().args(&args).succeeds().stdout_str_lossy();
+        let header = output.lines().next().unwrap().trim();
+
+        assert_eq!(header, "1M-blocks");
+    }
+}
+
 #[test]
 fn test_block_size_with_suffix() {
     fn get_header(block_size: &str) -> String {