Skip to content

join: accept a hyphen-leading -t separator, quote it in the error #14318

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

Open
arbelonson-source wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −3
Open

join: accept a hyphen-leading -t separator, quote it in the error #14318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/uu/join/locales/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ join-help-z = line delimiter is NUL, not newline
join-error-io = io error: { $error }
join-error-non-utf8-tab = non-UTF-8 multi-byte tab
join-error-unprintable-separators = unprintable field separators are only supported on unix-like platforms
join-error-multi-character-tab = multi-character tab { $value }
join-error-multi-character-tab = multi-character tab '{ $value }'
join-error-both-files-stdin = both files cannot be standard input
join-error-invalid-field-specifier = invalid field specifier: { $spec }
join-error-invalid-file-number = invalid file number in field spec: { $spec }
Expand Down
2 changes: 1 addition & 1 deletion src/uu/join/locales/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ join-help-z = le délimiteur de ligne est NUL, pas de nouvelle ligne
join-error-io = erreur d'E/S : { $error }
join-error-non-utf8-tab = tabulation multi-octets non-UTF-8
join-error-unprintable-separators = les séparateurs de champs non imprimables ne sont pris en charge que sur les plateformes de type unix
join-error-multi-character-tab = tabulation multi-caractères { $value }
join-error-multi-character-tab = tabulation multi-caractères '{ $value }'
join-error-both-files-stdin = les deux fichiers ne peuvent pas être l'entrée standard
join-error-invalid-field-specifier = spécificateur de champ invalide : { $spec }
join-error-invalid-file-number = numéro de fichier invalide dans la spécification de champ : { $spec }
Expand Down
1 change: 1 addition & 0 deletions src/uu/join/src/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,7 @@ pub fn uu_app() -> Command {
.short('t')
.value_name("CHAR")
.value_parser(ValueParser::os_string())
.allow_hyphen_values(true)
.help(translate!("join-help-t")),
)
.arg(
Expand Down
16 changes: 15 additions & 1 deletion tests/by-util/test_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,21 @@ fn tab_multi_character() {
.arg("-t")
.arg("ab")
.fails()
.stderr_is("join: multi-character tab ab\n");
.stderr_is("join: multi-character tab 'ab'\n");
}

#[test]
fn tab_hyphen_leading_as_separate_arg() {
// A hyphen-leading separator value passed as its own argument (not
// attached with `-t-x`/`=`) must not be mistaken for a new,
// unrecognized flag.
new_ucmd!()
.arg("semicolon_fields_1.txt")
.arg("semicolon_fields_2.txt")
.arg("-t")
.arg("-x")
.fails()
.stderr_is("join: multi-character tab '-x'\n");
}

#[test]
Expand Down
Loading