RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 04:27:45 +00:00
Code Issues Activity

more: change file unwrap to match

Browse source
This commit is contained in:
tpeters 2023-05-22 20:07:14 +02:00
parent 4b33223854
commit d41777c52c
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
if length > 1 { if length > 1 {
buff.push_str(&MULTI_FILE_TOP_PROMPT.replace("{}", file.to_str().unwrap())); buff.push_str(&MULTI_FILE_TOP_PROMPT.replace("{}", file.to_str().unwrap()));
} }
let mut reader = BufReader::new(File::open(file).unwrap()); let opened_file = match File::open(file) {
Err(why) => {
return Err(UUsageError::new(
1,
format!("cannot open {}: {}", file.quote(), why.kind()),
))
}
Ok(opened_file) => opened_file,
};
let mut reader = BufReader::new(opened_file);
reader.read_to_string(&mut buff).unwrap(); reader.read_to_string(&mut buff).unwrap();
more(&buff, &mut stdout, next_file.copied(), &options)?; more(&buff, &mut stdout, next_file.copied(), &options)?;
buff.clear(); buff.clear();