Merge pull request #1529 from n0toose/uhyve-use-absolute-paths

feat(uhyve): use absolute paths

src/fs/uhyve.rs

@@ -1,5 +1,6 @@
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
+use alloc::ffi::CString;
 use alloc::string::{String, ToString};
 use alloc::sync::Arc;
 use alloc::vec::Vec;
@@ -113,11 +114,28 @@ impl Clone for UhyveFileHandle {
 }
 
 #[derive(Debug)]
-pub(crate) struct UhyveDirectory;
+pub(crate) struct UhyveDirectory {
+	prefix: Option<String>,
+}
 
 impl UhyveDirectory {
-	pub const fn new() -> Self {
-		UhyveDirectory {}
+	pub const fn new(prefix: Option<String>) -> Self {
+		UhyveDirectory { prefix }
+	}
+
+	fn traversal_path(&self, components: &[&str]) -> CString {
+		let prefix_deref = self.prefix.as_deref();
+		let components_with_prefix = prefix_deref.iter().chain(components.iter().rev());
+		// Unlike src/fs/fuse.rs, we skip the first element here so as to not prepend / before /root
+		let path: String = components_with_prefix
+			.flat_map(|component| ["/", component])
+			.skip(1)
+			.collect();
+		if path.is_empty() {
+			CString::new("/").unwrap()
+		} else {
+			CString::new(path).unwrap()
+		}
 	}
 }
 
@@ -141,18 +159,7 @@ impl VfsNode for UhyveDirectory {
 		opt: OpenOption,
 		mode: AccessPermission,
 	) -> io::Result<Arc<dyn ObjectInterface>> {
-		let path: String = if components.is_empty() {
-			"/\0".to_string()
-		} else {
-			let mut path: String = components
-				.iter()
-				.rev()
-				.map(|v| "/".to_owned() + v)
-				.collect();
-			path.push('\0');
-			path.remove(0);
-			path
-		};
+		let path = self.traversal_path(components);
 
 		let mut open_params = OpenParams {
 			name: GuestPhysAddr::new(
@@ -174,18 +181,7 @@ impl VfsNode for UhyveDirectory {
 	}
 
 	fn traverse_unlink(&self, components: &mut Vec<&str>) -> io::Result<()> {
-		let path: String = if components.is_empty() {
-			"/\0".to_string()
-		} else {
-			let mut path: String = components
-				.iter()
-				.rev()
-				.map(|v| "/".to_owned() + v)
-				.collect();
-			path.push('\0');
-			path.remove(0);
-			path
-		};
+		let path = self.traversal_path(components);
 
 		let mut unlink_params = UnlinkParams {
 			name: GuestPhysAddr::new(
@@ -225,7 +221,10 @@ pub(crate) fn init() {
 		fs::FILESYSTEM
 			.get()
 			.unwrap()
-			.mount(&mount_point, Box::new(UhyveDirectory::new()))
+			.mount(
+				&mount_point,
+				Box::new(UhyveDirectory::new(Some(mount_point.to_owned()))),
+			)
 			.expect("Mount failed. Duplicate mount_point?");
 	}
 }