nl: output number separator as bytes

not as lossy string

Author: cakebaker

src/uu/nl/src/nl.rs

@@ -409,16 +409,20 @@ fn nl<T: Read>(reader: &mut BufReader<T>, stats: &mut Stats, settings: &Settings
                         translate!("nl-error-line-number-overflow"),
                     ));
                 };
-                writeln!(
-                    writer,
-                    "{}{}{}",
-                    settings
-                        .number_format
-                        .format(line_number, settings.number_width),
-                    settings.number_separator.to_string_lossy(),
-                    String::from_utf8_lossy(&line),
-                )
-                .map_err_context(|| translate!("nl-error-could-not-write"))?;
+                let mut buf = settings
+                    .number_format
+                    .format(line_number, settings.number_width)
+                    .as_bytes()
+                    .to_vec();
+
+                buf.extend(settings.number_separator.as_encoded_bytes());
+                buf.extend(String::from_utf8_lossy(&line).as_bytes());
+                buf.push(b'\n');
+
+                writer
+                    .write_all(&buf)
+                    .map_err_context(|| translate!("nl-error-could-not-write"))?;
+
                 // update line number for the potential next line
                 match line_number.checked_add(settings.line_increment) {
                     Some(new_line_number) => stats.line_number = Some(new_line_number),

tests/by-util/test_nl.rs

@@ -209,23 +209,21 @@ fn test_number_separator() {
 #[test]
 #[cfg(target_os = "linux")]
 fn test_number_separator_non_utf8() {
-    use std::{
-        ffi::{OsStr, OsString},
-        os::unix::ffi::{OsStrExt, OsStringExt},
-    };
+    use std::{ffi::OsString, os::unix::ffi::OsStringExt};
 
     let separator_bytes = [0xFF, 0xFE];
     let mut v = b"--number-separator=".to_vec();
     v.extend_from_slice(&separator_bytes);
 
     let arg = OsString::from_vec(v);
-    let separator = OsStr::from_bytes(&separator_bytes);
 
     new_ucmd!()
         .arg(arg)
         .pipe_in("test")
         .succeeds()
-        .stdout_is(format!("     1{}test\n", separator.to_string_lossy()));
+        .stdout_is_bytes([
+            b' ', b' ', b' ', b' ', b' ', b'1', 0xFF, 0xFE, b't', b'e', b's', b't', b'\n',
+        ]);
 }
 
 #[test]