From 34b18351e2e0bcaf27b8567499ce4728393ab507 Mon Sep 17 00:00:00 2001 From: Michael Lohmann Date: Tue, 1 Feb 2022 21:57:52 +0100 Subject: [PATCH] cat: cleanup write_tab_to_end duplication of logic The logic for '\n' and '\r' about the number of written characters was duplicated --- src/uu/cat/src/cat.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index e7fd31497..3c89d8434 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -560,13 +560,12 @@ fn write_tab_to_end(mut in_buf: &[u8], writer: &mut W) -> usize { { Some(p) => { writer.write_all(&in_buf[..p]).unwrap(); - if in_buf[p] == b'\n' { - return count + p; - } else if in_buf[p] == b'\t' { + if in_buf[p] == b'\t' { writer.write_all(b"^I").unwrap(); in_buf = &in_buf[p + 1..]; count += p + 1; } else { + // b'\n' or b'\r' return count + p; } }