Skip to content
Open
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
6 changes: 3 additions & 3 deletions src/uu/join/src/join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ impl Ord for CaseInsensitiveSlice<'_> {
if let Some((s, o)) =
std::iter::zip(self.v.iter(), other.v.iter()).find(|(s, o)| !s.eq_ignore_ascii_case(o))
{
// first characters that differ, return the case-insensitive comparison
let s = s.to_ascii_lowercase();
let o = o.to_ascii_lowercase();
// first characters that differ, compared folded to upper case like `sort -f`
let s = s.to_ascii_uppercase();
let o = o.to_ascii_uppercase();
s.cmp(&o)
} else {
// one of the strings is a substring or equal of the other
Expand Down
20 changes: 20 additions & 0 deletions tests/by-util/test_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,26 @@ fn case_insensitive_prints_each_lines_own_key() {
.stdout_only("B\nb\n");
}

#[test]
fn case_insensitive_matches_sort_f_order() {
// `sort -f` folds to upper case, so `_` sorts after letters.
let scene = TestScenario::new(util_name!());
scene
.fixtures
.write("requested", "svcabc mallory\nsvc_backup mallory\n");
scene.fixtures.write("reserved", "SVC_BACKUP\n");
scene
.ucmd()
.args(&["-i", "-v", "1", "requested", "reserved"])
.succeeds()
.stdout_only("svcabc mallory\n");
scene
.ucmd()
.args(&["-i", "requested", "reserved"])
.succeeds()
.stdout_only("svc_backup mallory\n");
}

#[test]
fn semicolon_separated() {
new_ucmd!()
Expand Down
Loading