From d41777c52c34d5c772d5e200710a73ba5b96ca3b Mon Sep 17 00:00:00 2001 From: tpeters Date: Mon, 22 May 2023 20:07:14 +0200 Subject: [PATCH] more: change file unwrap to match --- src/uu/more/src/more.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs index 64683a1be..b9d9c8272 100644 --- a/src/uu/more/src/more.rs +++ b/src/uu/more/src/more.rs @@ -104,7 +104,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { if length > 1 { 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(); more(&buff, &mut stdout, next_file.copied(), &options)?; buff.clear();