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
8 changes: 5 additions & 3 deletions src/uu/tr/src/operation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,14 @@ impl Sequence {
set2_uniques.sort();
set2_uniques.dedup();

//If the complement flag is used in translate mode, only one unique character may appear in
//set2. Validate this with the set of uniques in set2 that we just generated.
// If the complement flag is used in translate mode, only one unique
// character may appear in set2. Validate this with the set of uniques
// in set2 that we just generated.
// Also, set2 must not overgrow set1, otherwise the mapping can't be 1:1.
if set1.iter().any(|x| matches!(x, Self::Class(_)))
&& translating
&& complement_flag
&& set2_uniques.len() > 1
&& (set2_uniques.len() > 1 || set2_solved.len() > set1_len)
{
return Err(BadSequence::ComplementMoreThanOneUniqueInSet2);
}
Expand Down
14 changes: 14 additions & 0 deletions tests/by-util/test_tr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1413,3 +1413,17 @@ fn check_complement_1_unique_in_set2() {
.args(&["-c", "[:upper:]", arg.as_str()])
.succeeds();
}

#[test]
fn check_complement_set2_too_big() {
let x231 = "x".repeat(231);
Comment thread
RenjiSann marked this conversation as resolved.
Outdated
let x230 = &x231[..230];

// The complement of [:upper:] expands to 230 characters,
// putting more characters in set2 should fail.
new_ucmd!().args(&["-c", "[:upper:]", x230]).succeeds();
new_ucmd!()
.args(&["-c", "[:upper:]", x231.as_str()])
.fails()
.stderr_contains("when translating with complemented character classes,\nstring2 must map all characters in the domain to one");
}