Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/uu/du/src/du.rs
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {

let summarize = matches.get_flag(options::SUMMARIZE);

let count_links = matches.get_flag(options::COUNT_LINKS);

let max_depth = parse_depth(
matches
.get_one::<String>(options::MAX_DEPTH)
Expand All @@ -669,15 +671,19 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
}

read_files_from(file_from)?
} else {
match matches.get_one::<String>(options::FILE) {
Some(_) => matches
.get_many::<String>(options::FILE)
.unwrap()
.map(PathBuf::from)
.collect(),
None => vec![PathBuf::from(".")],
} else if let Some(files) = matches.get_many::<String>(options::FILE) {
let files = files.map(PathBuf::from);
if count_links {
files.collect()
} else {
// Deduplicate while preserving order
let mut seen = std::collections::HashSet::new();
files
.filter(|path| seen.insert(path.clone()))
.collect::<Vec<_>>()
}
} else {
vec![PathBuf::from(".")]
};

let time = matches.contains_id(options::TIME).then(|| {
Expand Down Expand Up @@ -719,7 +725,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
} else {
Deref::None
},
count_links: matches.get_flag(options::COUNT_LINKS),
count_links,
verbose: matches.get_flag(options::VERBOSE),
excludes: build_exclude_patterns(&matches)?,
};
Expand Down
58 changes: 58 additions & 0 deletions tests/by-util/test_du.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1194,3 +1194,61 @@ fn test_human_size() {
.succeeds()
.stdout_contains(format!("1.0K {dir}"));
}

#[cfg(not(target_os = "android"))]
#[test]
fn test_du_deduplicated_input_args() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;

at.mkdir("d");
at.mkdir("d/d");
at.touch("d/f");
at.hard_link("d/f", "d/h");

let result = ts
.ucmd()
.arg("--inodes")
.arg("d")
.arg("d")
.arg("d")
.succeeds();
result.no_stderr();

let result_seq: Vec<String> = result
.stdout_str()
.lines()
.map(|x| x.parse().unwrap())
.collect();
#[cfg(windows)]
assert_eq!(result_seq, ["1\td\\d", "3\td"]);
#[cfg(not(windows))]
assert_eq!(result_seq, ["1\td/d", "3\td"]);
}

#[cfg(not(target_os = "android"))]
#[test]
fn test_du_no_deduplicated_input_args() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;

at.mkdir("d");
at.touch("d/d");

let result = ts
.ucmd()
.arg("--inodes")
.arg("-l")
.arg("d")
.arg("d")
.arg("d")
.succeeds();
result.no_stderr();

let result_seq: Vec<String> = result
.stdout_str()
.lines()
.map(|x| x.parse().unwrap())
.collect();
assert_eq!(result_seq, ["2\td", "2\td", "2\td"]);
}
Loading