1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00

Merge pull request #2428 from jhscheer/cut_2424

cut: fix `-d=` (#2424)
This commit is contained in:
Sylvestre Ledru 2021-06-19 08:46:42 +02:00 committed by GitHub
commit e2a00b67ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions

View file

@ -531,7 +531,16 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let zero_terminated = matches.is_present(options::ZERO_TERMINATED); let zero_terminated = matches.is_present(options::ZERO_TERMINATED);
match matches.value_of(options::DELIMITER) { match matches.value_of(options::DELIMITER) {
Some(delim) => { Some(mut delim) => {
// 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
// Since clap parsing handles `-d=` as delimiter explicitly set to "" and
// an empty delimiter is not accepted by GNU's `cut` (and makes no sense),
// we can use this as basis for a simple workaround:
if delim.is_empty() {
delim = "=";
}
if delim.chars().count() > 1 { if delim.chars().count() > 1 {
Err(msg_opt_invalid_should_be!( Err(msg_opt_invalid_should_be!(
"empty or 1 character long", "empty or 1 character long",

View file

@ -157,3 +157,12 @@ fn test_directory_and_no_such_file() {
.run() .run()
.stderr_is("cut: some: No such file or directory\n"); .stderr_is("cut: some: No such file or directory\n");
} }
#[test]
fn test_equal_as_delimiter() {
new_ucmd!()
.args(&["-f", "2", "-d="])
.pipe_in("--libdir=./out/lib")
.succeeds()
.stdout_only("./out/lib\n");
}