Skip to content

cut: fix overriding of -d= #6984

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 1 commit into from
Dec 20, 2024
Merged

cut: fix overriding of -d= #6984

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
29 changes: 16 additions & 13 deletions src/uu/cut/src/cut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,7 @@ fn cut_files(mut filenames: Vec<String>, mode: &Mode) {

// Get delimiter and output delimiter from `-d`/`--delimiter` and `--output-delimiter` options respectively
// Allow either delimiter to have a value that is neither UTF-8 nor ASCII to align with GNU behavior
fn get_delimiters(
matches: &ArgMatches,
delimiter_is_equal: bool,
) -> UResult<(Delimiter, Option<&[u8]>)> {
fn get_delimiters(matches: &ArgMatches) -> UResult<(Delimiter, Option<&[u8]>)> {
let whitespace_delimited = matches.get_flag(options::WHITESPACE_DELIMITED);
let delim_opt = matches.get_one::<OsString>(options::DELIMITER);
let delim = match delim_opt {
Expand All @@ -364,12 +361,7 @@ fn get_delimiters(
));
}
Some(os_string) => {
// GNU's `cut` supports `-d=` to set the delimiter to `=`.
// Clap parsing is limited in this situation, see:
// https://github.com/uutils/coreutils/issues/2424#issuecomment-863825242
if delimiter_is_equal {
Delimiter::Slice(b"=")
} else if os_string == "''" || os_string.is_empty() {
if os_string == "''" || os_string.is_empty() {
// treat `''` as empty delimiter
Delimiter::Slice(b"\0")
} else {
Expand Down Expand Up @@ -423,15 +415,26 @@ mod options {

#[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let args = args.collect::<Vec<OsString>>();
// GNU's `cut` supports `-d=` to set the delimiter to `=`.
// Clap parsing is limited in this situation, see:
// https://github.com/uutils/coreutils/issues/2424#issuecomment-863825242
let args: Vec<OsString> = args
.into_iter()
.map(|x| {
if x == "-d=" {
"--delimiter==".into()
} else {
x
}
})
.collect();

let delimiter_is_equal = args.contains(&OsString::from("-d=")); // special case
let matches = uu_app().try_get_matches_from(args)?;

let complement = matches.get_flag(options::COMPLEMENT);
let only_delimited = matches.get_flag(options::ONLY_DELIMITED);

let (delimiter, out_delimiter) = get_delimiters(&matches, delimiter_is_equal)?;
let (delimiter, out_delimiter) = get_delimiters(&matches)?;
let line_ending = LineEnding::from_zero_flag(matches.get_flag(options::ZERO_TERMINATED));

// Only one, and only one of cutting mode arguments, i.e. `-b`, `-c`, `-f`,
Expand Down
8 changes: 7 additions & 1 deletion tests/by-util/test_cut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,15 @@ fn test_newline_as_delimiter() {
fn test_multiple_delimiters() {
new_ucmd!()
.args(&["-f2", "-d:", "-d="])
.pipe_in("a=b\n")
.pipe_in("a:=b\n")
.succeeds()
.stdout_only("b\n");

new_ucmd!()
.args(&["-f2", "-d=", "-d:"])
.pipe_in("a:=b\n")
.succeeds()
.stdout_only("=b\n");
}

#[test]
Expand Down
Loading