Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

df: fix display of special characters #7151

Merged
merged 1 commit into from
Jan 17, 2025
Merged

df: fix display of special characters #7151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions src/uucore/src/lib/features/fsext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,19 @@ pub struct MountInfo {
pub dummy: bool,
}

#[cfg(any(target_os = "linux", target_os = "android"))]
fn replace_special_chars(s: String) -> String {
// Replace
//
// * ASCII space with a regular space character,
// * \011 ASCII horizontal tab with a tab character,
// * ASCII backslash with an actual backslash character.
//
s.replace(r#"\040"#, " ")
.replace(r#"\011"#, " ")
.replace(r#"\134"#, r#"\"#)
}

impl MountInfo {
#[cfg(any(target_os = "linux", target_os = "android"))]
fn new(file_name: &str, raw: &[&str]) -> Option<Self> {
Expand All @@ -158,14 +171,14 @@ impl MountInfo {
dev_name = raw[after_fields + 1].to_string();
fs_type = raw[after_fields].to_string();
mount_root = raw[3].to_string();
mount_dir = raw[4].to_string();
mount_dir = replace_special_chars(raw[4].to_string());
mount_option = raw[5].to_string();
}
LINUX_MTAB => {
dev_name = raw[0].to_string();
fs_type = raw[2].to_string();
mount_root = String::new();
mount_dir = raw[1].to_string();
mount_dir = replace_special_chars(raw[1].to_string());
mount_option = raw[3].to_string();
}
_ => return None,
Expand Down Expand Up @@ -1081,4 +1094,28 @@ mod tests {
assert_eq!(info.fs_type, "xfs");
assert_eq!(info.dev_name, "/dev/fs0");
}

#[test]
#[cfg(any(target_os = "linux", target_os = "android"))]
fn test_mountinfo_dir_special_chars() {
let info = MountInfo::new(
LINUX_MOUNTINFO,
&r#"317 61 7:0 / /mnt/f\134\040\011oo rw,relatime shared:641 - ext4 /dev/loop0 rw"#
.split_ascii_whitespace()
.collect::<Vec<_>>(),
)
.unwrap();

assert_eq!(info.mount_dir, r#"/mnt/f\ oo"#);

let info = MountInfo::new(
LINUX_MTAB,
&r#"/dev/loop0 /mnt/f\134\040\011oo ext4 rw,relatime 0 0"#
.split_ascii_whitespace()
.collect::<Vec<_>>(),
)
.unwrap();

assert_eq!(info.mount_dir, r#"/mnt/f\ oo"#);
}
}
Loading