Merge pull request #9085 from andreacorbellini/comm-no-lock

cakebaker · web-flow · commit 0a76a399f4af · 2025-10-30T11:03:02.000+01:00
comm: hold the stdin lock for the whole duration of the program
diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs
@@ -8,7 +8,7 @@
 use std::cmp::Ordering;
 use std::ffi::OsString;
 use std::fs::{File, metadata};
-use std::io::{self, BufRead, BufReader, Read, Stdin, stdin};
+use std::io::{self, BufRead, BufReader, Read, StdinLock, stdin};
 use std::path::Path;
 use uucore::error::{FromIo, UResult, USimpleError};
 use uucore::format_usage;
@@ -55,10 +55,20 @@ struct OrderChecker {
 }
 
 enum Input {
-    Stdin(Stdin),
+    Stdin(StdinLock<'static>),
     FileIn(BufReader<File>),
 }
 
+impl Input {
+    fn stdin() -> Self {
+        Self::Stdin(stdin().lock())
+    }
+
+    fn from_file(f: File) -> Self {
+        Self::FileIn(BufReader::new(f))
+    }
+}
+
 struct LineReader {
     line_ending: LineEnding,
     input: Input,
@@ -73,7 +83,7 @@ impl LineReader {
         let line_ending = self.line_ending.into();
 
         let result = match &mut self.input {
-            Input::Stdin(r) => r.lock().read_until(line_ending, buf),
+            Input::Stdin(r) => r.read_until(line_ending, buf),
             Input::FileIn(r) => r.read_until(line_ending, buf),
         };
 
@@ -283,16 +293,13 @@ fn comm(a: &mut LineReader, b: &mut LineReader, delim: &str, opts: &ArgMatches)
 
 fn open_file(name: &OsString, line_ending: LineEnding) -> io::Result<LineReader> {
     if name == "-" {
-        Ok(LineReader::new(Input::Stdin(stdin()), line_ending))
+        Ok(LineReader::new(Input::stdin(), line_ending))
     } else {
         if metadata(name)?.is_dir() {
             return Err(io::Error::other(translate!("comm-error-is-directory")));
         }
         let f = File::open(name)?;
-        Ok(LineReader::new(
-            Input::FileIn(BufReader::new(f)),
-            line_ending,
-        ))
+        Ok(LineReader::new(Input::from_file(f), line_ending))
     }
 }
 
