oysteikt/uutil-linux
oysteikt/uutil-linux
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lscpu: Ensure regex behaves correctly with multi-line input

Browse Source
This commit is contained in:
alxndrv 2025-02-12 13:35:19 +02:00
parent 5cce641721
commit b6a4bfd888
1 changed files with 5 additions and 2 deletions

7
src/uu/lscpu/src/lscpu.rs

@ -4,7 +4,7 @@
// file that was distributed with this source code. // file that was distributed with this source code.
use clap::{crate_version, Arg, ArgAction, Command}; use clap::{crate_version, Arg, ArgAction, Command};
use regex::Regex; use regex::RegexBuilder;
use serde::Serialize; use serde::Serialize;
use std::{fs, str::FromStr}; use std::{fs, str::FromStr};
use sysinfo::System; use sysinfo::System;
@ -64,7 +64,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// Add more CPU information here... // Add more CPU information here...
if let Ok(contents) = fs::read_to_string("/proc/cpuinfo") { if let Ok(contents) = fs::read_to_string("/proc/cpuinfo") {
let re = Regex::new(r"^model name\s+:\s+(.*)$").unwrap(); let re = RegexBuilder::new(r"^model name\s+:\s+(.*)$")
.multi_line(true)
.build()
.unwrap();
// Assuming all CPUs have the same model name // Assuming all CPUs have the same model name
if let Some(cap) = re.captures_iter(&contents).next() { if let Some(cap) = re.captures_iter(&contents).next() {
cpu_infos.push("Model name", &cap[1]); cpu_infos.push("Model name", &cap[1]);