Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-13 23:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3701 from cakebaker/comm_nul_delimiter

Browse source 
comm: use NUL if delimiter is empty
This commit is contained in:
Sylvestre Ledru 2022-07-06 22:57:25 +02:00 committed by GitHub
commit 2f46e4020d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/uu/comm/src/comm.rs
View file

@ -33,7 +33,10 @@ mod options {
fn mkdelim(col: usize, opts: &ArgMatches) -> String { fn mkdelim(col: usize, opts: &ArgMatches) -> String {
let mut s = String::new(); let mut s = String::new();
let delim = opts.value_of(options::DELIMITER).unwrap(); let delim = match opts.value_of(options::DELIMITER).unwrap() {
"" => "\0",
delim => delim,
};
if col > 1 && !opts.is_present(options::COLUMN_1) { if col > 1 && !opts.is_present(options::COLUMN_1) {
s.push_str(delim.as_ref()); s.push_str(delim.as_ref());

7
tests/by-util/test_comm.rs
View file

@ -59,13 +59,12 @@ fn output_delimiter() {
.stdout_only_fixture("ab_delimiter_word.expected"); .stdout_only_fixture("ab_delimiter_word.expected");
} }
#[cfg_attr(not(feature = "test_unimplemented"), ignore)]
#[test] #[test]
fn output_delimiter_require_arg() { fn output_delimiter_nul() {
new_ucmd!() new_ucmd!()
.args(&["--output-delimiter=", "a", "b"]) .args(&["--output-delimiter=", "a", "b"])
.fails() .succeeds()
.stderr_only("error to be defined"); .stdout_only_fixture("ab_delimiter_nul.expected");
} }
// even though (info) documentation suggests this is an option // even though (info) documentation suggests this is an option

BIN
tests/fixtures/comm/ab_delimiter_nul.expected vendored Normal file
View file

Binary file not shown.