RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

Merge pull request #2708 from adamreichold/fix-pr-stdout-lock

Browse source 
pr: fix locking of stdout
This commit is contained in:
Sylvestre Ledru 2021-10-10 12:15:23 +02:00 • committed by GitHub
commit 788618e9de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uu/pr/src/pr.rs
View file

@ -20,7 +20,7 @@ use quick_error::ResultExt;
use regex::Regex; use regex::Regex;
use std::convert::From; use std::convert::From;
use std::fs::{metadata, File}; use std::fs::{metadata, File};
use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Stdout, Write}; use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Write};
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::fs::FileTypeExt; use std::os::unix::fs::FileTypeExt;
@ -1036,15 +1036,16 @@ fn print_page(lines: &[FileLine], options: &OutputOptions, page: usize) -> Resul
let header = header_content(options, page); let header = header_content(options, page);
let trailer_content = trailer_content(options); let trailer_content = trailer_content(options);
let out = &mut stdout();
out.lock(); let out = stdout();
let mut out = out.lock();
for x in header { for x in header {
out.write_all(x.as_bytes())?; out.write_all(x.as_bytes())?;
out.write_all(line_separator)?; out.write_all(line_separator)?;
} }
let lines_written = write_columns(lines, options, out)?; let lines_written = write_columns(lines, options, &mut out)?;
for (index, x) in trailer_content.iter().enumerate() { for (index, x) in trailer_content.iter().enumerate() {
out.write_all(x.as_bytes())?; out.write_all(x.as_bytes())?;
@ -1060,7 +1061,7 @@ fn print_page(lines: &[FileLine], options: &OutputOptions, page: usize) -> Resul
fn write_columns( fn write_columns(
lines: &[FileLine], lines: &[FileLine],
options: &OutputOptions, options: &OutputOptions,
out: &mut Stdout, out: &mut impl Write,
) -> Result<usize, IOError> { ) -> Result<usize, IOError> {
let line_separator = options.content_line_separator.as_bytes(); let line_separator = options.content_line_separator.as_bytes();