Skip to content

fix tr with delete flag if more than 1 operand given #5945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 6, 2024
Merged

fix tr with delete flag if more than 1 operand given #5945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e918997
fix tr
BaherSalama Feb 5, 2024
2feab7a
fix
BaherSalama Feb 5, 2024
721f8fe
adding a test
BaherSalama Feb 5, 2024
e4077ec
Merge branch 'uutils:main' into main
BaherSalama Feb 5, 2024
16b66ff
tr: rename test function
cakebaker Feb 6, 2024
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
7 changes: 7 additions & 0 deletions src/uu/tr/src/tr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
));
}

if delete_flag && !squeeze_flag && sets_len > 1 {
return Err(UUsageError::new(
1,
format!("extra operand {}\nOnly one string may be given when deleting without squeezing repeats.", sets[1].quote()),
));
}

if let Some(first) = sets.first() {
if first.ends_with('\\') {
show!(USimpleError::new(
Expand Down
12 changes: 12 additions & 0 deletions tests/by-util/test_tr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,3 +1147,15 @@ fn check_against_gnu_tr_tests_no_abort_1() {
.succeeds()
.stdout_is("abb");
}

#[test]
fn test_delete_flag_takes_only_one_operand() {
// gnu tr -d fails with more than 1 argument
new_ucmd!()
.args(&["-d", "a", "p"])
.pipe_in("abc")
.fails()
.stderr_contains(
"extra operand 'p'\nOnly one string may be given when deleting without squeezing repeats.",
);
}