RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Merge pull request #2525 from miDeb/sort/nul-tab

Browse source 
sort: allow null bytes for -t
This commit is contained in:
Sylvestre Ledru 2021-07-31 09:28:01 +02:00 • committed by GitHub
commit 56cc2cdd67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1065,7 +1065,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
if let Some(arg) = matches.args.get(options::SEPARATOR) { if let Some(arg) = matches.args.get(options::SEPARATOR) {
let separator = arg.vals[0].to_string_lossy(); let separator = arg.vals[0].to_string_lossy();
let separator = separator; let mut separator = separator.as_ref();
if separator == "\\0" {
separator = "\0";
}
if separator.len() != 1 { if separator.len() != 1 {
crash!(1, "separator must be exactly one character long"); crash!(1, "separator must be exactly one character long");
} }

9
tests/by-util/test_sort.rs
View file

@ -959,3 +959,12 @@ fn test_key_takes_one_arg() {
.succeeds() .succeeds()
.stdout_is_fixture("keys_open_ended.expected"); .stdout_is_fixture("keys_open_ended.expected");
} }
#[test]
fn test_separator_null() {
new_ucmd!()
.args(&["-k1,1", "-k3,3", "-t", "\\0"])
.pipe_in("z\0a\0b\nz\0b\0a\na\0z\0z\n")
.succeeds()
.stdout_only("a\0z\0z\nz\0b\0a\nz\0a\0b\n");
}