From 8905d52279c4ac1a737767a815d09c179e0798cd Mon Sep 17 00:00:00 2001
From: Zachary Dremann <dremann@gmail.com>
Date: Sun, 30 Jan 2022 22:26:13 -0500
Subject: [PATCH] paste: Write to a locked stdout

---
 src/uu/paste/src/paste.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs
index c43a86b75..dbc0bde76 100644
--- a/src/uu/paste/src/paste.rs
+++ b/src/uu/paste/src/paste.rs
@@ -9,7 +9,7 @@
 
 use clap::{crate_version, App, AppSettings, Arg};
 use std::fs::File;
-use std::io::{stdin, BufRead, BufReader, Read};
+use std::io::{stdin, BufRead, BufReader, Read, stdout, Write};
 use std::path::Path;
 use uucore::error::{FromIo, UResult};
 
@@ -90,12 +90,15 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
 
     let delimiters: Vec<char> = unescape(delimiters).chars().collect();
     let mut delim_count = 0;
+    let stdout = stdout();
+    let mut stdout = stdout.lock();
 
+    let mut line = String::new();
     if serial {
         for file in &mut files {
             let mut output = String::new();
             loop {
-                let mut line = String::new();
+                line.clear();
                 match read_line(file.as_mut(), &mut line) {
                     Ok(0) => break,
                     Ok(_) => {
@@ -107,7 +110,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
                 delim_count += 1;
             }
             output.pop();
-            println!("{}", output);
+            writeln!(stdout, "{}", output)?;
         }
     } else {
         let mut eof = vec![false; files.len()];
@@ -118,7 +121,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
                 if eof[i] {
                     eof_count += 1;
                 } else {
-                    let mut line = String::new();
+                    line.clear();
                     match read_line(file.as_mut(), &mut line) {
                         Ok(0) => {
                             eof[i] = true;
@@ -136,7 +139,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
             }
             // Remove final delimiter
             output.pop();
-            println!("{}", output);
+            writeln!(stdout, "{}", output)?;
             delim_count = 0;
         }
     }