proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-09 03:12:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sys: make escape_unit() more flexible, add unescape_unit_path

Browse Source 
This adds the ability to use these functions with non-utf8
strings as well.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-07-07 11:45:26 +02:00
parent c7224c5f67
commit 67fbf2b2ee
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
proxmox-sys/src/systemd.rs
View File

@ -1,3 +1,7 @@
use std::ffi::OsString;
use std::os::unix::ffi::OsStringExt;
use std::path::PathBuf;
use anyhow::{bail, Error}; use anyhow::{bail, Error};
#[allow(clippy::manual_range_contains)] #[allow(clippy::manual_range_contains)]
@ -16,16 +20,21 @@ fn parse_hex_digit(d: u8) -> Result<u8, Error> {
} }
/// Escape strings for usage in systemd unit names /// Escape strings for usage in systemd unit names
pub fn escape_unit(mut unit: &str, is_path: bool) -> String { pub fn escape_unit<P: AsRef<[u8]>>(unit: P, is_path: bool) -> String {
escape_unit_bytes(unit.as_ref(), is_path)
}
fn escape_unit_bytes(mut unit: &[u8], is_path: bool) -> String {
if is_path { if is_path {
unit = unit.trim_matches('/'); while !unit.is_empty() && unit[0] == b'/' {
unit = &unit[1..];
}
if unit.is_empty() { if unit.is_empty() {
return String::from("-"); return String::from("-");
} }
} }
let unit = unit.as_bytes();
let mut escaped = String::new(); let mut escaped = String::new();
for (i, c) in unit.iter().enumerate() { for (i, c) in unit.iter().enumerate() {
@ -50,6 +59,16 @@ pub fn escape_unit(mut unit: &str, is_path: bool) -> String {
/// Unescape strings used in systemd unit names /// Unescape strings used in systemd unit names
pub fn unescape_unit(text: &str) -> Result<String, Error> { pub fn unescape_unit(text: &str) -> Result<String, Error> {
Ok(String::from_utf8(unescape_unit_do(text)?)?)
}
/// Unescape strings used in systemd unit names
pub fn unescape_unit_path(text: &str) -> Result<PathBuf, Error> {
Ok(OsString::from_vec(unescape_unit_do(text)?).into())
}
/// Unescape strings used in systemd unit names
fn unescape_unit_do(text: &str) -> Result<Vec<u8>, Error> {
let mut i = text.as_bytes(); let mut i = text.as_bytes();
let mut data: Vec<u8> = Vec::new(); let mut data: Vec<u8> = Vec::new();
@ -79,7 +98,5 @@ pub fn unescape_unit(text: &str) -> Result<String, Error> {
} }
} }
let text = String::from_utf8(data)?; Ok(data)
Ok(text)
} }