vexos: simplify stat and file_attr fs implementations

Author: tropicaaal

library/std/src/sys/fs/vexos.rs

@@ -72,36 +72,6 @@ pub struct FileType {
 }
 
 impl FileAttr {
-    /// Creates a FileAttr by getting data from an opened file.
-    fn from_fd(fd: *mut vex_sdk::FIL) -> io::Result<Self> {
-        // `vexFileSize` returns -1 upon error, so u64::try_from will fail on error.
-        if let Ok(size) = u64::try_from(unsafe { vex_sdk::vexFileSize(fd) }) {
-            Ok(Self::File { size })
-        } else {
-            Err(io::const_error!(io::ErrorKind::InvalidData, "Failed to get file size"))
-        }
-    }
-
-    fn from_path(path: &Path) -> io::Result<Self> {
-        // vexFileStatus returns 3 if the given path is a directory.
-        const FILE_STATUS_DIR: u32 = 3;
-
-        run_path_with_cstr(path, &|c_path| {
-            let file_type = unsafe { vex_sdk::vexFileStatus(c_path.as_ptr()) };
-
-            // We can't get the size if its a directory because we cant open it as a file
-            if file_type == FILE_STATUS_DIR {
-                Ok(Self::Dir)
-            } else {
-                let mut opts = OpenOptions::new();
-                opts.read(true);
-                let file = File::open(path, &opts)?;
-
-                Self::from_fd(file.fd.0)
-            }
-        })
-    }
-
     pub fn size(&self) -> u64 {
         match self {
             Self::File { size } => *size,
@@ -302,7 +272,12 @@ impl File {
     }
 
     pub fn file_attr(&self) -> io::Result<FileAttr> {
-        FileAttr::from_fd(self.fd.0)
+        // `vexFileSize` returns -1 upon error, so u64::try_from will fail on error.
+        if let Ok(size) = u64::try_from(unsafe { vex_sdk::vexFileSize(fd) }) {
+            Ok(Self::File { size })
+        } else {
+            Err(io::const_error!(io::ErrorKind::InvalidData, "Failed to get file size"))
+        }
     }
 
     pub fn fsync(&self) -> io::Result<()> {
@@ -519,7 +494,20 @@ pub fn exists(path: &Path) -> io::Result<bool> {
 }
 
 pub fn stat(p: &Path) -> io::Result<FileAttr> {
-    FileAttr::from_path(p)
+    // `vexFileStatus` returns 3 if the given path is a directory.
+    const FILE_STATUS_DIR: u32 = 3;
+
+    run_path_with_cstr(path, &|c_path| {
+        let file_type = unsafe { vex_sdk::vexFileStatus(c_path.as_ptr()) };
+
+        // We can't get the size if its a directory because we cant open it as a file
+        if file_type == FILE_STATUS_DIR {
+            Ok(Self::Dir)
+        } else {
+            let file = File::open(path, &OpenOptions::new().read(true))?;
+            file.file_Attr()
+        }
+    })
 }
 
 pub fn lstat(p: &Path) -> io::Result<FileAttr> {