WIP

Author: phip1611

uefi-test-runner/src/fs/mod.rs

@@ -39,10 +39,16 @@ pub fn test(sfs: ScopedProtocol<SimpleFileSystem>) {
         .collect::<Vec<_>>();
     assert_eq!(&[".", "..", "foo", "barfoo"], entries.as_slice());
 
-    fs.create_dir_all("/test_file_system_abs/1/2/3/4/5/6/7").unwrap();
-    fs.try_exists("/test_file_system_abs/1/2/3/4/5/6/7").unwrap();
-    fs.remove_dir_all("/test_file_system_abs/1/2/3/4/5/6/7").unwrap();
-    let x = fs.try_exists("/test_file_system_abs/1/2/3/4/5/6/7");
+    /*fs.create_dir("/deeply_nested_test").unwrap();
+    fs.create_dir("/deeply_nested_test/1").unwrap();
+    fs.create_dir("/deeply_nested_test/1/2").unwrap();
+    fs.create_dir("/deeply_nested_test/1/2/3").unwrap();
+    fs.create_dir("/deeply_nested_test/1/2/3/4").unwrap();*/
+    fs.create_dir_all("/deeply_nested_test/1/2/3/4/5/6/7").unwrap();
+    fs.try_exists("/deeply_nested_test/1/2/3/4/5/6/7").unwrap();
+    //fs.remove_dir_all("/deeply_nested_test/1/2/3/4/5/6/7").unwrap();
+    fs.remove_dir("/deeply_nested_test/1/2/3/4/5/6/7").unwrap();
+    let x = fs.try_exists("/deeply_nested_test/1/2/3/4/5/6/7");
     assert!(x.is_err());
 }
 

uefi/src/fs/file_system.rs

@@ -14,6 +14,9 @@ use derive_more::Display;
 use uefi::proto::media::file::{FileAttribute, FileInfo, FileType};
 use uefi::table::boot::ScopedProtocol;
 use alloc::format;
+use log::info;
+use uefi::fs::path::Component;
+use crate::fs::path::Components;
 
 /// All errors that can happen when working with the [`FileSystem`].
 #[derive(Debug, Clone, Display, PartialEq, Eq)]
@@ -108,11 +111,17 @@ impl<'boot_services> FileSystem<'boot_services> {
         let iter = || normalized_path_pathref.components(NormalizedPath::SEPARATOR);
         iter()
             .scan(String::new(), |path_acc, component| {
-                *path_acc += "/";
-                *path_acc += format!("{component}").as_str();
+                if component != Component::RootDir {
+                    *path_acc += "/";
+                    *path_acc += format!("{component}").as_str();
+                }
+                info!("path_acc: {path_acc}, component: {component}");
                 Some((component, path_acc.clone()))
             })
-            .try_for_each(|(_component, full_path)| self.create_dir(full_path.as_str()))
+            .try_for_each(|(_component, full_path)| {
+                log::info!("fuck this shit! '{full_path}'");
+                self.create_dir(full_path.as_str())
+            })
     }
 
     /// Given a path, query the file system to get information about a file,
@@ -193,25 +202,8 @@ impl<'boot_services> FileSystem<'boot_services> {
 
     /// Removes a directory at this path, after removing all its contents. Use
     /// carefully!
-    pub fn remove_dir_all(&mut self, path: impl AsRef<Path>) -> FileSystemResult<()> {
-        let path = path.as_ref();
-        let normalized_path = NormalizedPath::new("\\", path)?;
-        let normalized_path_string = normalized_path.to_string();
-        let normalized_path_pathref = Path::new(&normalized_path_string);
-        let iter = || normalized_path_pathref.components(NormalizedPath::SEPARATOR);
-
-        let paths = iter()
-            .scan(String::new(), |path_acc, component| {
-                *path_acc += "/";
-                *path_acc += format!("{component}").as_str();
-                Some((component, path_acc.clone()))
-            })
-            .collect::<Vec<_>>();
-
-        paths
-            .iter()
-            .rev()
-            .try_for_each(|(_component, full_path)| self.remove_dir(full_path.as_str()))
+    pub fn remove_dir_all(&mut self, _path: impl AsRef<Path>) -> FileSystemResult<()> {
+        todo!()
     }
 
     /// Removes a file from the filesystem.

uefi/src/lib.rs

@@ -115,6 +115,8 @@ pub mod allocator;
 pub mod logger;
 
 /// See [`fs`].
+// Heavy usage of allocations in fs module
+#[cfg(feature = "alloc")]
 pub mod fs;
 
 // As long as this is behind "alloc", we can simplify cfg-feature attributes in this module.

xtask/src/qemu.rs

@@ -8,7 +8,7 @@ use crate::{net, platform};
 use anyhow::{anyhow, bail, Context, Result};
 use regex::bytes::Regex;
 use serde_json::{json, Value};
-use std::env;
+use std::{env, fs};
 use std::ffi::OsString;
 use std::io::{BufRead, BufReader, Read, Write};
 use std::path::{Path, PathBuf};
@@ -630,6 +630,12 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
         echo_service.stop();
     }
 
+    eprintln!("HELLO");
+    eprintln!("HELLO");
+    eprintln!("HELLO");
+    eprintln!("HELLO");
+    fs::copy(&test_disk, "/home/pschuster/Desktop/qemu.img").unwrap();
+
     // Propagate earlier error if necessary.
     res?;