mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #2169 from devnexen/df_more_like_mac
df little update proposal for mac.
This commit is contained in:
commit
bd31df8fa6
2 changed files with 20 additions and 0 deletions
|
@ -916,6 +916,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
|
||||||
"Use%",
|
"Use%",
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
if cfg!(target_os = "macos") && !opt.show_inode_instead {
|
||||||
|
header.insert(header.len() - 1, "Capacity");
|
||||||
|
}
|
||||||
header.push("Mounted on");
|
header.push("Mounted on");
|
||||||
|
|
||||||
for (idx, title) in header.iter().enumerate() {
|
for (idx, title) in header.iter().enumerate() {
|
||||||
|
@ -970,6 +973,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
|
||||||
"{0: >12} ",
|
"{0: >12} ",
|
||||||
human_readable(free_size, opt.human_readable_base)
|
human_readable(free_size, opt.human_readable_base)
|
||||||
);
|
);
|
||||||
|
if cfg!(target_os = "macos") {
|
||||||
|
let used = fs.usage.blocks - fs.usage.bfree;
|
||||||
|
let blocks = used + fs.usage.bavail;
|
||||||
|
print!("{0: >12} ", use_size(used, blocks));
|
||||||
|
}
|
||||||
print!("{0: >5} ", use_size(free_size, total_size));
|
print!("{0: >5} ", use_size(free_size, total_size));
|
||||||
}
|
}
|
||||||
print!("{0: <16}", fs.mountinfo.mount_dir);
|
print!("{0: <16}", fs.mountinfo.mount_dir);
|
||||||
|
|
|
@ -20,4 +20,16 @@ fn test_df_compatible_si() {
|
||||||
new_ucmd!().arg("-aH").succeeds();
|
new_ucmd!().arg("-aH").succeeds();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_df_output() {
|
||||||
|
if cfg!(target_os = "macos") {
|
||||||
|
new_ucmd!().arg("-H").arg("-total").succeeds().
|
||||||
|
stdout_only("Filesystem Size Used Available Capacity Use% Mounted on \n");
|
||||||
|
} else {
|
||||||
|
new_ucmd!().arg("-H").arg("-total").succeeds().stdout_only(
|
||||||
|
"Filesystem Size Used Available Use% Mounted on \n"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ToDO: more tests...
|
// ToDO: more tests...
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue