Skip to content

echo: fix duplication of -- arguments #7559

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

Closed
Expertcoderz wants to merge 4 commits into from
Closed

echo: fix duplication of -- arguments #7559

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcf00a0
echo: fix duplication of `--` arguments
Expertcoderz Mar 24, 2025
fb2a276
test_echo: check for `--` arguments between
Expertcoderz Mar 24, 2025
34ea55c
test_echo: Fix spellcheck failure
Expertcoderz Mar 25, 2025
98252b4
echo: fix omission of double-hyphen arguments
Expertcoderz Mar 26, 2025
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
4 changes: 2 additions & 2 deletions src/uu/echo/src/echo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fn handle_double_hyphens(args: impl uucore::Args) -> impl uucore::Args {
let mut result = Vec::new();
let mut is_first_double_hyphen = true;

for arg in args {
if arg == "--" && is_first_double_hyphen {
for (i, arg) in args.enumerate() {
if i < 2 && arg == "--" && is_first_double_hyphen {
result.push(OsString::from("--"));
is_first_double_hyphen = false;
}
Expand Down
20 changes: 19 additions & 1 deletion tests/by-util/test_echo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ fn test_hyphen_values_between() {
}

#[test]
fn test_double_hyphens() {
fn test_double_hyphens_at_start() {
new_ucmd!().arg("--").succeeds().stdout_only("--\n");
new_ucmd!()
.arg("--")
Expand All @@ -252,6 +252,24 @@ fn test_double_hyphens() {
.stdout_only("-- --\n");
}

#[test]
fn test_double_hyphens_between() {
new_ucmd!()
.arg("a")
.arg("--")
.arg("b")
.succeeds()
.stdout_only("a -- b\n");

new_ucmd!()
.arg("foo ")
.arg("-- --")
.arg("bar")
.arg("hehehe")
Comment thread
Expertcoderz marked this conversation as resolved.
.succeeds()
.stdout_only("foo -- -- bar hehehe\n");
}

#[test]
fn wrapping_octal() {
// Some odd behavior of GNU. Values of \0400 and greater do not fit in the
Expand Down