Merge branch 'main' into rm-one-file-system

Author: shskwmt

Cargo.lock

@@ -54,7 +54,9 @@ highlight = "all"
 # introduces it.
 # spell-checker: disable
 skip = [
-  # various crates
+  # windows
+  { name = "windows-core", version = "0.52.0" },
+  # dns-lookup
   { name = "windows-sys", version = "0.48.0" },
   # mio, nu-ansi-term, socket2
   { name = "windows-sys", version = "0.52.0" },
@@ -76,7 +78,7 @@ skip = [
   { name = "windows_x86_64_msvc", version = "0.48.0" },
   # kqueue-sys, onig
   { name = "bitflags", version = "1.3.2" },
-  # ansi-width, console, os_display
+  # ansi-width
   { name = "unicode-width", version = "0.1.13" },
   # filedescriptor, utmp-classic
   { name = "thiserror", version = "1.0.69" },

deny.toml

@@ -644,7 +644,7 @@ fn write_tab_to_end<W: Write>(mut in_buf: &[u8], writer: &mut W) -> usize {
             }
             None => {
                 writer.write_all(in_buf).unwrap();
-                return in_buf.len();
+                return in_buf.len() + count;
             }
         };
     }
@@ -688,6 +688,20 @@ fn write_end_of_line<W: Write>(
 mod tests {
     use std::io::{BufWriter, stdout};
 
+    #[test]
+    fn test_write_tab_to_end_with_newline() {
+        let mut writer = BufWriter::with_capacity(1024 * 64, stdout());
+        let in_buf = b"a\tb\tc\n";
+        assert_eq!(super::write_tab_to_end(in_buf, &mut writer), 5);
+    }
+
+    #[test]
+    fn test_write_tab_to_end_no_newline() {
+        let mut writer = BufWriter::with_capacity(1024 * 64, stdout());
+        let in_buf = b"a\tb\tc";
+        assert_eq!(super::write_tab_to_end(in_buf, &mut writer), 5);
+    }
+
     #[test]
     fn test_write_nonprint_to_end_new_line() {
         let mut writer = BufWriter::with_capacity(1024 * 64, stdout());

src/uu/cat/src/cat.rs

@@ -21,6 +21,7 @@ clap = { workspace = true }
 gcd = { workspace = true }
 libc = { workspace = true }
 uucore = { workspace = true, features = ["format", "quoting-style"] }
+thiserror = { workspace = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 signal-hook = { workspace = true }