difftreelog
refactor polkit message formatting
in: trunk
2 files changed
crates/polkit-shared/Cargo.tomldiffbeforeafterboth4edition = "2021"4edition = "2021"556[dependencies]6[dependencies]7nix = "0.29.0"7nix.workspace = true8serde = { version = "1.0.204", features = ["derive"] }8serde = { workspace = true, features = ["derive"] }9zbus = "4.4.0"9zbus.workspace = true1010crates/polkit-shared/src/lib.rsdiffbeforeafterboth26 } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/cmdline", self.0)) {26 } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/cmdline", self.0)) {27 write!(27 write!(28 f,28 f,29 "<sub>command</sub>{}",29 "command: {}",30 command(30 command(31 proc.replace("\0", " ")31 proc.replace("\0", " ")32 .strip_suffix(" ")32 .strip_suffix(" ")33 .expect("cmdline should end with NUL")33 .expect("cmdline should end with NUL")34 )34 )35 )35 )36 } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/comm", self.0)) {36 } else if let Ok(proc) = fs::read_to_string(format!("/proc/{}/comm", self.0)) {37 write!(f, "<sub>process</sub>{}", command(proc.replace("\0", " ")))37 write!(f, "process: {}", command(proc.replace("\0", " ")))38 } else {38 } else {39 emphasize("unknown process").fmt(f)39 emphasize("unknown process").fmt(f)40 }40 }67 Some(Value::U32(uid)) => match User::from_uid(Uid::from_raw(*uid)) {67 Some(Value::U32(uid)) => match User::from_uid(Uid::from_raw(*uid)) {68 Ok(Some(u)) => write!(68 Ok(Some(u)) => write!(69 f,69 f,70 "<sub>user</sub>{}<sup>{}</sup>{}",70 "user: {} {} {}",71 u.name,71 u.name,72 u.uid,72 u.uid,73 if u.gecos.is_empty() {73 if u.gecos.is_empty() {