Skip to content

Commit 490fae3

Browse files
authored
comm /etc/pacman.conf /dev/null 2>/dev/full does not abort (#10746)
1 parent ffe2b0b commit 490fae3

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/uu/comm/src/comm.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use std::cmp::Ordering;
99
use std::ffi::OsString;
1010
use std::fs::{File, metadata};
11-
use std::io::{self, BufRead, BufReader, BufWriter, Read, StdinLock, Write, stdin};
11+
use std::io::{self, BufRead, BufReader, BufWriter, Read, StdinLock, Write, stderr, stdin};
1212
use std::path::Path;
1313
use uucore::display::Quotable;
1414
use uucore::error::{FromIo, UResult, USimpleError};
@@ -114,7 +114,8 @@ impl OrderChecker {
114114

115115
let is_ordered = *current_line >= *self.last_line;
116116
if !is_ordered && !self.has_error {
117-
eprintln!(
117+
let _ = writeln!(
118+
stderr(),
118119
"{}",
119120
translate!("comm-error-file-not-sorted", "file_num" => self.file_num.as_str())
120121
);
@@ -314,7 +315,7 @@ fn comm(
314315
if should_check_order && (checker1.has_error || checker2.has_error) {
315316
// Print the input error message once at the end
316317
if input_error {
317-
eprintln!("{}", translate!("comm-error-input-not-sorted"));
318+
let _ = writeln!(stderr(), "{}", translate!("comm-error-input-not-sorted"));
318319
}
319320
Err(USimpleError::new(1, ""))
320321
} else {

0 commit comments

Comments
 (0)