rename

Author: Matr1xjt

arceos/axfs_ramfs/src/dir.rs

@@ -46,6 +46,7 @@ impl DirNode {
             log::error!("AlreadyExists {}", name);
             return Err(VfsError::AlreadyExists);
         }
+        log::debug!("Creating node {:?} {}", ty, name);
         let node: VfsNodeRef = match ty {
             VfsNodeType::File => Arc::new(FileNode::new()),
             VfsNodeType::Dir => Self::new(Some(self.this.clone())),
@@ -67,6 +68,22 @@ impl DirNode {
         children.remove(name);
         Ok(())
     }
+    pub fn rename_node(&self, old_name: &str, new_name: &str) -> VfsResult {
+        let mut children = self.children.write();
+
+        // 从/tmp/f1取出f1
+        let old_name = old_name.split('/').last().unwrap();
+        let new_name = new_name.split('/').last().unwrap();
+        if !children.contains_key(old_name) {
+            return Err(VfsError::NotFound);
+        }
+        if children.contains_key(new_name) {
+            return Err(VfsError::AlreadyExists);
+        }
+        let node = children.remove(old_name).unwrap();
+        children.insert(new_name.into(), node);
+        Ok(())
+    }
 }
 
 impl VfsNodeOps for DirNode {
@@ -164,8 +181,11 @@ impl VfsNodeOps for DirNode {
             self.remove_node(name)
         }
     }
-
-    axfs_vfs::impl_vfs_dir_default! {}
+    // axfs_vfs::impl_vfs_dir_default! {}
+    fn rename(&self, src_path: &str, dst_path: &str) -> VfsResult {
+        self.rename_node(src_path, dst_path)
+    }
+    
 }
 
 fn split_path(path: &str) -> (&str, Option<&str>) {

arceos/axfs_ramfs/src/file.rs

@@ -51,6 +51,5 @@ impl VfsNodeOps for FileNode {
         dst.copy_from_slice(&buf[..dst.len()]);
         Ok(buf.len())
     }
-
     impl_vfs_non_dir_default! {}
 }

arceos/modules/axfs/Cargo.toml

@@ -9,6 +9,9 @@ homepage.workspace = true
 repository = "https://github.com/arceos-org/arceos/tree/main/modules/axfs"
 documentation = "https://arceos-org.github.io/arceos/axfs/index.html"
 
+[patch.crates-io]
+axfs_ramfs = {path = "../../axfs_ramfs"}
+
 [features]
 devfs = ["dep:axfs_devfs"]
 ramfs = ["dep:axfs_ramfs"]
@@ -29,12 +32,14 @@ axio = { version = "0.1", features = ["alloc"] }
 axerrno = "0.1"
 axfs_vfs = "0.1"
 axfs_devfs = { version = "0.1", optional = true }
-axfs_ramfs = { version = "0.1", optional = true }
+axfs_ramfs = { path = "../../axfs_ramfs", optional = true }
 crate_interface = { version = "0.1", optional = true }
 axsync = { workspace = true }
 axdriver = { workspace = true, features = ["block"] }
 axdriver_block = { git = "https://github.com/arceos-org/axdriver_crates.git", tag = "v0.1.0" }
 
+
+
 [dependencies.fatfs]
 git = "https://github.com/rafalh/rust-fatfs"
 rev = "85f06e0"

arceos/modules/axfs/src/api/mod.rs

@@ -85,5 +85,6 @@ pub fn remove_file(path: &str) -> io::Result<()> {
 ///
 /// This only works then the new path is in the same mounted fs.
 pub fn rename(old: &str, new: &str) -> io::Result<()> {
+    log::debug!("******************************fs::rename from {} to {}", old, new);
     crate::root::rename(old, new)
 }

arceos/modules/axfs/src/root.rs

@@ -306,5 +306,6 @@ pub(crate) fn rename(old: &str, new: &str) -> AxResult {
         warn!("dst file already exist, now remove it");
         remove_file(None, new)?;
     }
+    log::debug!("rename from {} to {}", old, new);
     parent_node_of(None, old).rename(old, new)
 }

course/.~lock.stage3-2.pptx#

@@ -0,0 +1 @@
+,zjt,zjt-Legion-R9000P-ARX8,06.11.2025 18:46,file:///home/zjt/.config/libreoffice/4;

course/.~lock.stage3-3.pptx#

@@ -1,3 +1,2 @@
-test-ramfs_rename failed
 test-sys_map failed
 test-simple_hv failed