Skip to content

fix uucore/fsext/MountInfo::new don't support spaces/backslashs/tabs in mount_dir #5679

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

Closed
Yykz wants to merge 5 commits into from
Closed

fix uucore/fsext/MountInfo::new don't support spaces/backslashs/tabs in mount_dir #5679

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70633cd
df: fix spaces/backslashs/tabs wrongly considered
Yykz Dec 19, 2023
6f00d8f
add test ensuring MountInfo::new support special chars in mount_dir
Yykz Dec 19, 2023
3e72b5f
ensure special chars from mtab also supported
Yykz Dec 19, 2023
c49ac80
completing test for mtab
Yykz Dec 19, 2023
7b0ac9c
spell check
Yykz Dec 19, 2023
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
36 changes: 34 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 @@ -216,7 +216,11 @@ 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: raw[4]
.to_string()
.replace(r#"\040"#, " ")
.replace(r#"\011"#, " ")
.replace(r#"\134"#, r#"\"#),
mount_option: raw[5].to_string(),
remote: false,
dummy: false,
Expand All @@ -230,7 +234,11 @@ impl MountInfo {
dev_name: raw[0].to_string(),
fs_type: raw[2].to_string(),
mount_root: String::new(),
mount_dir: raw[1].to_string(),
mount_dir: raw[1]
.to_string()
.replace(r#"\040"#, " ")
.replace(r#"\011"#, " ")
.replace(r#"\134"#, r#"\"#),
mount_option: raw[3].to_string(),
remote: false,
dummy: false,
Expand Down Expand Up @@ -1111,4 +1119,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"#);
}
}