top: fix panic caused by picker

Author: Bluemangoo

src/uu/top/src/picker.rs

@@ -250,23 +250,20 @@ fn command(pid: u32) -> String {
         let result: String = trimmed.into();
 
         if cfg!(target_os = "linux") && result.is_empty() {
-            {
-                match PathBuf::from_str(&format!("/proc/{pid}/status")) {
-                    Ok(path) => {
-                        let file = File::open(path).unwrap();
-                        let content = read_to_string(file).unwrap();
-                        let line = content
-                            .lines()
-                            .collect::<Vec<_>>()
-                            .first()
-                            .unwrap()
-                            .split(':')
-                            .collect::<Vec<_>>();
-
-                        line[1].trim().to_owned()
-                    }
-                    Err(_) => String::new(),
-                }
+            let path = PathBuf::from_str(&format!("/proc/{pid}/status")).unwrap();
+            if let Ok(file) = File::open(path) {
+                let content = read_to_string(file).unwrap();
+                let line = content
+                    .lines()
+                    .collect::<Vec<_>>()
+                    .first()
+                    .unwrap()
+                    .split(':')
+                    .collect::<Vec<_>>();
+
+                line[1].trim().to_owned()
+            } else {
+                String::new()
             }
         } else {
             result

src/uu/top/src/top.rs

@@ -105,26 +105,26 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         Settings { filter, ..settings }
     };
 
-    let settings = Arc::new(RwLock::new(settings));
+    let settings = Arc::new(settings);
     let tui_stat = Arc::new(RwLock::new(TuiStat::new()));
     let should_update = Arc::new(AtomicBool::new(true));
     let data = Arc::new(RwLock::new((
         Header::new(&tui_stat.read().unwrap()),
-        ProcList::new(&settings.read().unwrap()),
+        ProcList::new(&settings),
     )));
 
     // update
     {
         let should_update = should_update.clone();
         let tui_stat = tui_stat.clone();
-        let settings = settings.clone();
         let data = data.clone();
+        let settings = settings.clone();
         thread::spawn(move || loop {
             let delay = { tui_stat.read().unwrap().delay };
             sleep(delay);
             {
                 let header = Header::new(&tui_stat.read().unwrap());
-                let proc_list = ProcList::new(&settings.read().unwrap());
+                let proc_list = ProcList::new(&settings);
                 *data.write().unwrap() = (header, proc_list);
                 should_update.store(true, Ordering::Relaxed);
             }
@@ -134,7 +134,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let mut terminal = ratatui::init();
     terminal.draw(|frame| {
         Tui::new(
-            &settings.read().unwrap(),
+            &settings,
             &data.read().unwrap(),
             &mut tui_stat.write().unwrap(),
         )
@@ -209,7 +209,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         if should_update.load(Ordering::Relaxed) {
             terminal.draw(|frame| {
                 Tui::new(
-                    &settings.read().unwrap(),
+                    &settings,
                     &data.read().unwrap(),
                     &mut tui_stat.write().unwrap(),
                 )

tests/by-util/test_top.rs

@@ -17,6 +17,8 @@ fn test_conflict_arg() {
     new_ucmd!().arg("-p=0").arg("-U=0").fails().code_is(1);
 }
 
+// // The tests below are disabled because they are not for the TUI mode, which is the default
+// // TODO: make them work in TUI mode
 // #[test]
 // fn test_flag_user() {
 //     let check = |output: &str| {