vexos: resolve errors from reorganizing fs methods

Author: Tropix126

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

@@ -198,7 +198,7 @@ impl File {
             // the requirements that `create_new` can't have an existing file and `!create`
             // doesn't create a file ourselves.
             if !opts.read && (opts.write || opts.append) && (opts.create_new || !opts.create) {
-                let status = vex_sdk::vexFileStatus(path.as_ptr());
+                let status = unsafe { vex_sdk::vexFileStatus(path.as_ptr()) };
 
                 if opts.create_new && status != 0 {
                     return Err(io::const_error!(io::ErrorKind::AlreadyExists, "File exists",));
@@ -273,8 +273,11 @@ impl File {
 
     pub fn file_attr(&self) -> io::Result<FileAttr> {
         // `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 })
+        if let Ok(size) = u64::try_from(unsafe {
+            // SAFETY: `self.fd` contains a valid pointer to `FIL` for this struct's lifetime.
+            vex_sdk::vexFileSize(self.fd.0)
+        }) {
+            Ok(FileAttr::File { size })
         } else {
             Err(io::const_error!(io::ErrorKind::InvalidData, "Failed to get file size"))
         }
@@ -497,15 +500,17 @@ pub fn stat(p: &Path) -> io::Result<FileAttr> {
     // `vexFileStatus` returns 3 if the given path is a directory.
     const FILE_STATUS_DIR: u32 = 3;
 
-    run_path_with_cstr(path, &|c_path| {
+    run_path_with_cstr(p, &|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)
+            Ok(FileAttr::Dir)
         } else {
-            let file = File::open(path, &OpenOptions::new().read(true))?;
-            file.file_Attr()
+            let mut opts = OpenOptions::new();
+            opts.read(true);
+            let file = File::open(p, &opts)?;
+            file.file_attr()
         }
     })
 }