mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
Merge pull request #3701 from cakebaker/comm_nul_delimiter
comm: use NUL if delimiter is empty
This commit is contained in:
@@ -33,7 +33,10 @@ mod options {
|
||||
|
||||
fn mkdelim(col: usize, opts: &ArgMatches) -> String {
|
||||
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) {
|
||||
s.push_str(delim.as_ref());
|
||||
|
||||
@@ -59,13 +59,12 @@ fn output_delimiter() {
|
||||
.stdout_only_fixture("ab_delimiter_word.expected");
|
||||
}
|
||||
|
||||
#[cfg_attr(not(feature = "test_unimplemented"), ignore)]
|
||||
#[test]
|
||||
fn output_delimiter_require_arg() {
|
||||
fn output_delimiter_nul() {
|
||||
new_ucmd!()
|
||||
.args(&["--output-delimiter=", "a", "b"])
|
||||
.fails()
|
||||
.stderr_only("error to be defined");
|
||||
.succeeds()
|
||||
.stdout_only_fixture("ab_delimiter_nul.expected");
|
||||
}
|
||||
|
||||
// even though (info) documentation suggests this is an option
|
||||
|
||||
BIN
Binary file not shown.
Reference in New Issue
Block a user