safe-traversal is always used on linux, adjust the cfg

Author: sylvestre

src/uucore/src/lib/features.rs

@@ -67,7 +67,7 @@ pub mod pipes;
 pub mod proc_info;
 #[cfg(all(unix, feature = "process"))]
 pub mod process;
-#[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+#[cfg(target_os = "linux")]
 pub mod safe_traversal;
 #[cfg(all(target_os = "linux", feature = "tty"))]
 pub mod tty;

src/uucore/src/lib/features/perms.rs

@@ -18,10 +18,10 @@ use libc::{gid_t, uid_t};
 use options::traverse;
 use std::ffi::OsString;
 
-#[cfg(not(all(target_os = "linux", feature = "safe-traversal")))]
+#[cfg(not(target_os = "linux"))]
 use walkdir::WalkDir;
 
-#[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+#[cfg(target_os = "linux")]
 use crate::features::safe_traversal::DirFd;
 
 use std::ffi::CString;
@@ -308,7 +308,7 @@ impl ChownExecutor {
 
         let ret = if self.matched(meta.uid(), meta.gid()) {
             // Use safe syscalls for root directory to prevent TOCTOU attacks
-            #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+            #[cfg(target_os = "linux")]
             let chown_result = if path.is_dir() {
                 // For directories, use safe traversal from the start
                 match DirFd::open(path) {
@@ -331,7 +331,7 @@ impl ChownExecutor {
                 )
             };
 
-            #[cfg(not(all(target_os = "linux", feature = "safe-traversal")))]
+            #[cfg(not(target_os = "linux"))]
             let chown_result = wrap_chown(
                 path,
                 &meta,
@@ -365,11 +365,11 @@ impl ChownExecutor {
         };
 
         if self.recursive {
-            #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+            #[cfg(target_os = "linux")]
             {
                 ret | self.safe_dive_into(&root)
             }
-            #[cfg(not(all(target_os = "linux", feature = "safe-traversal")))]
+            #[cfg(not(target_os = "linux"))]
             {
                 ret | self.dive_into(&root)
             }
@@ -378,7 +378,7 @@ impl ChownExecutor {
         }
     }
 
-    #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+    #[cfg(target_os = "linux")]
     fn safe_chown_dir(
         &self,
         dir_fd: &DirFd,
@@ -399,7 +399,7 @@ impl ChownExecutor {
         Ok(String::new())
     }
 
-    #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+    #[cfg(target_os = "linux")]
     fn safe_dive_into<P: AsRef<Path>>(&self, root: P) -> i32 {
         let root = root.as_ref();
 
@@ -425,7 +425,7 @@ impl ChownExecutor {
         ret
     }
 
-    #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+    #[cfg(target_os = "linux")]
     fn safe_traverse_dir(&self, dir_fd: &DirFd, dir_path: &Path, ret: &mut i32) {
         // Read directory entries
         let entries = match dir_fd.read_dir() {
@@ -530,7 +530,7 @@ impl ChownExecutor {
         }
     }
 
-    #[cfg(not(all(target_os = "linux", feature = "safe-traversal")))]
+    #[cfg(not(target_os = "linux"))]
     #[allow(clippy::cognitive_complexity)]
     fn dive_into<P: AsRef<Path>>(&self, root: P) -> i32 {
         let root = root.as_ref();
@@ -667,7 +667,7 @@ impl ChownExecutor {
     }
 
     /// Try to open directory with error reporting
-    #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+    #[cfg(target_os = "linux")]
     fn try_open_dir(&self, path: &Path) -> Option<DirFd> {
         DirFd::open(path)
             .map_err(|e| {
@@ -680,7 +680,7 @@ impl ChownExecutor {
 
     /// Report ownership change with proper verbose output
     /// Returns 0 on success
-    #[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+    #[cfg(target_os = "linux")]
     fn report_ownership_change_success(
         &self,
         path: &Path,

src/uucore/src/lib/features/safe_traversal.rs

@@ -11,8 +11,6 @@
 // spell-checker:ignore CLOEXEC RDONLY TOCTOU closedir dirp fdopendir fstatat openat REMOVEDIR unlinkat smallfile
 // spell-checker:ignore RAII dirfd fchownat fchown FchmodatFlags fchmodat fchmod
 
-#![cfg(target_os = "linux")]
-
 #[cfg(test)]
 use std::os::unix::ffi::OsStringExt;
 

src/uucore/src/lib/lib.rs

@@ -92,7 +92,7 @@ pub use crate::features::perms;
 pub use crate::features::pipes;
 #[cfg(all(unix, feature = "process"))]
 pub use crate::features::process;
-#[cfg(all(target_os = "linux", feature = "safe-traversal"))]
+#[cfg(target_os = "linux")]
 pub use crate::features::safe_traversal;
 #[cfg(all(unix, not(target_os = "fuchsia"), feature = "signals"))]
 pub use crate::features::signals;