From d796cb52242518a93902c092868abbd35bd22685 Mon Sep 17 00:00:00 2001
From: Fuad Ismail <fuad1502@gmail.com>
Date: Mon, 18 Nov 2024 11:52:47 +0700
Subject: [PATCH] dmesg: return UResult in Record constructor instead of panic.

---
 src/uu/dmesg/src/dmesg.rs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/uu/dmesg/src/dmesg.rs b/src/uu/dmesg/src/dmesg.rs
index 6ecb512..8fb64f7 100644
--- a/src/uu/dmesg/src/dmesg.rs
+++ b/src/uu/dmesg/src/dmesg.rs
@@ -6,7 +6,10 @@
 use clap::{crate_version, Arg, ArgAction, Command};
 use regex::Regex;
 use std::fs;
-use uucore::{error::FromIo, error::UResult, format_usage, help_about, help_usage};
+use uucore::{
+    error::{FromIo, UResult, USimpleError},
+    format_usage, help_about, help_usage,
+};
 
 mod json;
 
@@ -74,7 +77,12 @@ impl Dmesg<'_> {
         let lines = self.read_lines_from_kmsg_file()?;
         for line in lines {
             for (_, [pri_fac, seq, time, msg]) in re.captures_iter(&line).map(|c| c.extract()) {
-                records.push(Record::from_str_fields(pri_fac, seq, time, msg.to_string()));
+                records.push(Record::from_str_fields(
+                    pri_fac,
+                    seq,
+                    time,
+                    msg.to_string(),
+                )?);
             }
         }
         self.records = Some(records);
@@ -128,18 +136,18 @@ struct Record {
 }
 
 impl Record {
-    fn from_str_fields(pri_fac: &str, seq: &str, time: &str, msg: String) -> Record {
+    fn from_str_fields(pri_fac: &str, seq: &str, time: &str, msg: String) -> UResult<Record> {
         let pri_fac = str::parse(pri_fac);
         let seq = str::parse(seq);
         let time = str::parse(time);
         match (pri_fac, seq, time) {
-            (Ok(pri_fac), Ok(seq), Ok(time)) => Record {
+            (Ok(pri_fac), Ok(seq), Ok(time)) => Ok(Record {
                 priority_facility: pri_fac,
                 _sequence: seq,
                 timestamp_us: time,
                 message: msg,
-            },
-            _ => panic!("parse error."),
+            }),
+            _ => Err(USimpleError::new(1, "Failed to parse record field(s)")),
         }
     }
 }