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

Fix issues raised in review

Browse source 
spelling
use POSIXLY_CORRECT and BLOCKSIZE env variables to determine block size.
move statics to const
use show_error! not show_info!
This commit is contained in:
bootandy 2018-03-22 12:05:33 -04:00
parent 8530db90c4
commit 838ce7b3e3
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/du/du.rs
View file

@ -28,7 +28,7 @@ const LONG_HELP: &'static str = "
Display values are in units of the first available SIZE from
--block-size, and the DU_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environ‐
ment variables. Otherwise, units default to 1024 bytes (or 512 if
POSIXLY_CORRECT is set or if OS is Apple).
POSIXLY_CORRECT is set).
SIZE is an integer and optional unit (example: 10M is 10*1024*1024).
Units are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (pow‐
@ -72,12 +72,6 @@ impl Stat {
}
}
#[cfg(target_os = "macos")]
fn get_default_blocks() -> u64 {
512
}
#[cfg(not(target_os = "macos"))]
fn get_default_blocks() -> u64 {
1024
}
@ -423,7 +417,7 @@ Try '{} --help' for more information.",
}
}
Err(_) => {
show_info!("{}: {}", path_str, "No such file or directory");
show_error!("{}: {}", path_str, "No such file or directory");
}
}
}

23
tests/test_du.rs
View file

@ -1,9 +1,9 @@
use common::util::*;
static SUB_DIR: &str = "subdir/deeper";
static SUB_DIR_LINKS: &str = "subdir/links";
static SUB_FILE: &str = "subdir/links/subwords.txt";
static SUB_LINK: &str = "subdir/links/sublink.txt";
const SUB_DIR: &str = "subdir/deeper";
const SUB_DIR_LINKS: &str = "subdir/links";
const SUB_FILE: &str = "subdir/links/subwords.txt";
const SUB_LINK: &str = "subdir/links/sublink.txt";
#[test]
fn test_du_basics() {
@ -43,7 +43,7 @@ fn test_du_basics_subdir() {
#[cfg(target_os = "macos")]
fn _du_basics_subdir(s: String) {
assert_eq!(s, "8\tsubdir/deeper\n");
assert_eq!(s, "4\tsubdir/deeper\n");
}
#[cfg(not(target_os = "macos"))]
fn _du_basics_subdir(s: String) {
@ -56,7 +56,10 @@ fn test_du_basics_bad_name() {
let result = ucmd.arg("bad_name").run();
assert_eq!(result.stdout, "");
assert_eq!(result.stderr, "du: bad_name: No such file or directory\n");
assert_eq!(
result.stderr,
"du: error: bad_name: No such file or directory\n"
);
}
#[test]
@ -74,7 +77,7 @@ fn test_du_soft_link() {
#[cfg(target_os = "macos")]
fn _du_soft_link(s: String) {
assert_eq!(s, "32\tsubdir/links\n");
assert_eq!(s, "16\tsubdir/links\n");
}
#[cfg(not(target_os = "macos"))]
fn _du_soft_link(s: String) {
@ -91,13 +94,13 @@ fn test_du_hard_link() {
let result = ts.ucmd().arg(SUB_DIR_LINKS).run();
assert!(result.success);
assert_eq!(result.stderr, "");
// We do not double count hard links as the inodes are identicle
// We do not double count hard links as the inodes are identical
_du_hard_link(result.stdout);
}
#[cfg(target_os = "macos")]
fn _du_hard_link(s: String) {
assert_eq!(s, "24\tsubdir/links\n")
assert_eq!(s, "12\tsubdir/links\n")
}
#[cfg(not(target_os = "macos"))]
fn _du_hard_link(s: String) {
@ -116,7 +119,7 @@ fn test_du_d_flag() {
#[cfg(target_os = "macos")]
fn _du_d_flag(s: String) {
assert_eq!(s, "32\t./subdir\n40\t./\n");
assert_eq!(s, "16\t./subdir\n20\t./\n");
}
#[cfg(not(target_os = "macos"))]
fn _du_d_flag(s: String) {