Merge branch 'master' into sort/fixes

src/uu/sort/src/sort.rs

@@ -1074,7 +1074,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     if let Some(arg) = matches.args.get(options::SEPARATOR) {
         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 {
             crash!(2, "separator must be exactly one character long");
         }

tests/by-util/test_sort.rs

@@ -1002,3 +1002,12 @@ fn test_verifies_input_files() {
         .status_code(2)
         .stderr_is("sort: cannot read: nonexistent_file: No such file or directory");
 }
+
+#[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");
+}