Replace unstable wasi_ext with stable libc calls

Author: DePasqualeOrg

src/uu/cp/src/cp.rs

@@ -2,7 +2,6 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-#![cfg_attr(target_os = "wasi", feature(wasi_ext))]
 // spell-checker:ignore (ToDO) copydir ficlone fiemap ftruncate linkgs lstat nlink nlinks pathbuf pwrite reflink strs xattrs symlinked deduplicated advcpmv nushell IRWXG IRWXO IRWXU IRWXUGO IRWXU IRWXG IRWXO IRWXUGO sflag
 
 use std::cmp::Ordering;
@@ -1342,9 +1341,9 @@ fn parse_path_args(
 /// Check if an error is ENOTSUP/EOPNOTSUPP (operation not supported).
 /// This is used to suppress xattr errors on filesystems that don't support them.
 fn is_enotsup_error(error: &CpError) -> bool {
-    #[cfg(unix)]
+    #[cfg(any(unix, target_os = "wasi"))]
     const EOPNOTSUPP: i32 = libc::EOPNOTSUPP;
-    #[cfg(not(unix))]
+    #[cfg(not(any(unix, target_os = "wasi")))]
     const EOPNOTSUPP: i32 = 95;
 
     match error {
@@ -1848,7 +1847,7 @@ pub(crate) fn copy_attributes(
         // so return ENOTSUP. handle_preserve silently suppresses ENOTSUP for
         // optional preservation (-a) and reports it for required (--preserve=timestamps).
         #[cfg(target_os = "wasi")]
-        return Err(io::Error::from_raw_os_error(95).into()); // 95 = EOPNOTSUPP
+        return Err(io::Error::from_raw_os_error(libc::EOPNOTSUPP).into());
 
         #[cfg(not(target_os = "wasi"))]
         {
@@ -1938,14 +1937,20 @@ fn symlink_file(
     }
     #[cfg(target_os = "wasi")]
     {
-        std::os::wasi::fs::symlink_path(source, dest).map_err(|e| {
-            CpError::IoErrContext(
-                e,
+        use std::ffi::CString;
+        use std::os::wasi::ffi::OsStrExt;
+        let src_c = CString::new(source.as_os_str().as_bytes())
+            .map_err(|e| CpError::Error(e.to_string()))?;
+        let dst_c =
+            CString::new(dest.as_os_str().as_bytes()).map_err(|e| CpError::Error(e.to_string()))?;
+        if unsafe { libc::symlink(src_c.as_ptr(), dst_c.as_ptr()) } != 0 {
+            return Err(CpError::IoErrContext(
+                io::Error::last_os_error(),
                 translate!("cp-error-cannot-create-symlink",
                            "dest" => get_filename(dest).unwrap_or("?").quote(),
                            "source" => get_filename(source).unwrap_or("?").quote()),
-            )
-        })?;
+            ));
+        }
     }
     if let Ok(file_info) = FileInformation::from_path(dest, false) {
         symlinked_files.insert(file_info);

src/uu/wc/src/count_fast.rs

@@ -12,7 +12,7 @@ use super::WordCountable;
 use std::io::{self, ErrorKind, Read};
 
 #[cfg(unix)]
-use libc::{_SC_PAGESIZE, S_IFREG, sysconf};
+use libc::S_IFREG;
 #[cfg(unix)]
 use std::io::{Seek, SeekFrom};
 #[cfg(unix)]
@@ -122,7 +122,7 @@ pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> (usize, Opti
                 && (stat.st_mode as libc::mode_t & S_IFREG) != 0
                 && stat.st_size > 0
             {
-                let sys_page_size = unsafe { sysconf(_SC_PAGESIZE) as usize };
+                let sys_page_size = rustix::param::page_size();
                 if !(stat.st_size as usize).is_multiple_of(sys_page_size) {
                     // regular file or file from /proc, /sys and similar pseudo-filesystems
                     // with size that is NOT a multiple of system page size

src/uucore/src/lib/features/fs.rs

@@ -45,8 +45,7 @@ macro_rules! has {
 pub struct FileInformation(
     #[cfg(unix)] nix::sys::stat::FileStat,
     #[cfg(windows)] winapi_util::file::Information,
-    // WASI does not have nix::sys::stat, so we store std::fs::Metadata instead.
-    #[cfg(target_os = "wasi")] fs::Metadata,
+    #[cfg(target_os = "wasi")] libc::stat,
 );
 
 impl FileInformation {
@@ -67,8 +66,12 @@ impl FileInformation {
     /// Get information from a currently open file
     #[cfg(target_os = "wasi")]
     pub fn from_file(file: &fs::File) -> IOResult<Self> {
-        let meta = file.metadata()?;
-        Ok(Self(meta))
+        use std::os::fd::AsRawFd;
+        let mut stat: libc::stat = unsafe { std::mem::zeroed() };
+        if unsafe { libc::fstat(file.as_raw_fd(), &mut stat) } != 0 {
+            return Err(Error::last_os_error());
+        }
+        Ok(Self(stat))
     }
 
     /// Get information for a given path.
@@ -100,15 +103,22 @@ impl FileInformation {
             let file = open_options.read(true).open(path.as_ref())?;
             Self::from_file(&file)
         }
-        // WASI: use std::fs::metadata / symlink_metadata since nix is not available
         #[cfg(target_os = "wasi")]
         {
-            let metadata = if dereference {
-                fs::metadata(path.as_ref())
+            use std::ffi::CString;
+            use std::os::wasi::ffi::OsStrExt;
+            let path_c = CString::new(path.as_ref().as_os_str().as_bytes())
+                .map_err(|e| Error::new(ErrorKind::InvalidInput, e))?;
+            let mut stat: libc::stat = unsafe { std::mem::zeroed() };
+            let res = if dereference {
+                unsafe { libc::stat(path_c.as_ptr(), &mut stat) }
             } else {
-                fs::symlink_metadata(path.as_ref())
+                unsafe { libc::lstat(path_c.as_ptr(), &mut stat) }
             };
-            Ok(Self(metadata?))
+            if res != 0 {
+                return Err(Error::last_os_error());
+            }
+            Ok(Self(stat))
         }
     }
 
@@ -124,7 +134,8 @@ impl FileInformation {
         }
         #[cfg(target_os = "wasi")]
         {
-            self.0.len()
+            assert!(self.0.st_size >= 0, "File size is negative");
+            self.0.st_size.try_into().unwrap()
         }
     }
 
@@ -177,10 +188,7 @@ impl FileInformation {
         #[cfg(windows)]
         return self.0.number_of_links();
         #[cfg(target_os = "wasi")]
-        {
-            use std::os::wasi::fs::MetadataExt;
-            return self.0.nlink();
-        }
+        return self.0.st_nlink as u64;
     }
 
     #[cfg(unix)]
@@ -211,8 +219,7 @@ impl PartialEq for FileInformation {
 #[cfg(target_os = "wasi")]
 impl PartialEq for FileInformation {
     fn eq(&self, other: &Self) -> bool {
-        use std::os::wasi::fs::MetadataExt;
-        self.0.dev() == other.0.dev() && self.0.ino() == other.0.ino()
+        self.0.st_dev == other.0.st_dev && self.0.st_ino == other.0.st_ino
     }
 }
 
@@ -232,9 +239,8 @@ impl Hash for FileInformation {
         }
         #[cfg(target_os = "wasi")]
         {
-            use std::os::wasi::fs::MetadataExt;
-            self.0.dev().hash(state);
-            self.0.ino().hash(state);
+            self.0.st_dev.hash(state);
+            self.0.st_ino.hash(state);
         }
     }
 }

src/uucore/src/lib/lib.rs

@@ -2,7 +2,6 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-#![cfg_attr(all(target_os = "wasi", feature = "fs"), feature(wasi_ext))]
 //! library ~ (core/bundler file)
 // #![deny(missing_docs)] //TODO: enable this
 //