ext2: link

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/fs/ext2/mod.rs

@@ -271,7 +271,7 @@ impl INode {
 
         entry.entry_size = block_size as _;
         entry.inode = ext2_inode.id as _;
-        entry.file_type = 2;
+        entry.file_type = 2; // FIXME: This is fucked.
         entry.set_name(name);
 
         fs.block.write(block * block_size, entry.as_bytes());
@@ -374,13 +374,28 @@ impl INodeInterface for INode {
     }
 
     fn write_at(&self, offset: usize, usr_buffer: &[u8]) -> super::Result<usize> {
-        if !self.metadata()?.is_file() {
+        if !self.metadata()?.is_file() && !self.metadata()?.is_symlink() {
             return Err(FileSystemError::NotSupported);
         }
 
         self.write(offset, usr_buffer)
     }
 
+    fn link(&self, name: &str, src: DirCacheItem) -> super::Result<()> {
+        if !self.metadata()?.is_directory() {
+            return Err(FileSystemError::NotSupported);
+        }
+
+        if src.inode().metadata()?.is_directory() {
+            return Err(FileSystemError::NotSupported);
+        }
+
+        let inode = self.make_inode(name, FileType::Symlink)?;
+        inode.write_at(0, src.name().as_bytes())?;
+
+        Ok(())
+    }
+
     fn truncate(&self, _size: usize) -> super::Result<()> {
         Ok(())
     }

src/aero_kernel/src/fs/inode.rs

@@ -256,7 +256,7 @@ pub trait INodeInterface: Send + Sync {
         Err(FileSystemError::NotSupported)
     }
 
-    fn link(&self, _name: &str, _src: INodeCacheItem) -> Result<()> {
+    fn link(&self, _name: &str, _src: DirCacheItem) -> Result<()> {
         Err(FileSystemError::NotSupported)
     }
 }

src/aero_kernel/src/fs/ramfs.rs

@@ -412,7 +412,9 @@ impl INodeInterface for LockedRamINode {
         Some(self.0.read().filesystem.clone())
     }
 
-    fn link(&self, name: &str, src: INodeCacheItem) -> Result<()> {
+    fn link(&self, name: &str, src: DirCacheItem) -> Result<()> {
+        let src = src.inode();
+
         // ensure: The dest inode (self) is a directory.
         if self.metadata()?.file_type() != FileType::Directory {
             return Err(FileSystemError::NotDirectory);

src/aero_kernel/src/syscall/fs.rs

@@ -520,7 +520,7 @@ pub fn event_fd(_initval: usize, flags: usize) -> Result<usize, SyscallError> {
 /// file.
 #[syscall]
 pub fn link(src_path: &Path, dest_path: &Path) -> Result<usize, SyscallError> {
-    let src = fs::lookup_path(src_path)?.inode();
+    let src = fs::lookup_path(src_path)?;
     let (dest_dir, dest_name) = dest_path.parent_and_basename();
 
     let dest_dir = fs::lookup_path(dest_dir)?.inode();
@@ -531,7 +531,9 @@ pub fn link(src_path: &Path, dest_path: &Path) -> Result<usize, SyscallError> {
     // strong references to it.
     //
     // TODO: Should this be moved to the inode impl?
-    if dest_dir.weak_filesystem().unwrap().as_ptr() != src.weak_filesystem().unwrap().as_ptr() {
+    if dest_dir.weak_filesystem().unwrap().as_ptr()
+        != src.inode().weak_filesystem().unwrap().as_ptr()
+    {
         return Err(SyscallError::EINVAL);
     }
 

src/aero_kernel/src/syscall/mod.rs

@@ -198,7 +198,7 @@ impl SysLog {
     pub fn flush(self) {
         let mut result = String::new();
 
-        if self.result.map(|e| e.is_ok()).unwrap_or_default() {
+        if self.result.unwrap().is_ok() {
             result.push_str("\x1b[1;32m");
         } else {
             result.push_str("\x1b[1;31m");