Merge branch 'main' into fix-touch-dev-full

Author: sylvestre

CONTRIBUTING.md

@@ -87,6 +87,7 @@ are some tips for writing good issues:
   - What platform are you on?
 - Provide a way to reliably reproduce the issue.
 - Be as specific as possible!
+- Please provide the output with LANG=C, except for locale-related bugs.
 
 ### Writing Documentation
 

Cargo.lock

@@ -65,6 +65,10 @@ feat_selinux = [
   "selinux",
   "stat/selinux",
 ]
+# "feat_smack" == enable support for SMACK Security Context (by using `--features feat_smack`)
+# NOTE:
+# * Running a uutils compiled with `feat_smack` requires a SMACK enabled Kernel at run time.
+feat_smack = ["ls/smack"]
 ##
 ## feature sets
 ## (common/core and Tier1) feature sets

Cargo.toml

@@ -32,14 +32,6 @@ options might be missing or different behavior might be experienced.
 We provide prebuilt binaries at https://github.com/uutils/coreutils/releases/latest .
 It is recommended to install from main branch if you install from source.
 
-To install it:
-
-```shell
-cargo install --git https://github.com/uutils/coreutils coreutils
-# cargo install --git https://github.com/uutils/coreutils uu_true # for one util only
-~/.cargo/bin/coreutils
-```
-
 </div>
 
 <!-- markdownlint-disable-next-line MD026 -->

README.md

@@ -29,12 +29,23 @@ cfg_langinfo! {
     use std::ffi::CStr;
     use std::sync::OnceLock;
     use nix::libc;
+
+    #[cfg(test)]
+    use std::sync::Mutex;
 }
 
 cfg_langinfo! {
     /// Cached locale date/time format string
     static DEFAULT_FORMAT_CACHE: OnceLock<&'static str> = OnceLock::new();
 
+    /// Mutex to serialize setlocale() calls during tests.
+    ///
+    /// setlocale() is process-global, so parallel tests that call it can
+    /// interfere with each other. This mutex ensures only one test accesses
+    /// locale functions at a time.
+    #[cfg(test)]
+    static LOCALE_MUTEX: Mutex<()> = Mutex::new(());
+
     /// Returns the default date format string for the current locale.
     ///
     /// The format respects locale preferences for time display (12-hour vs 24-hour),
@@ -55,6 +66,11 @@ cfg_langinfo! {
 
     /// Retrieves the date/time format string from the system locale
     fn get_locale_format_string() -> Option<String> {
+        // In tests, acquire mutex to prevent race conditions with setlocale()
+        // which is process-global and not thread-safe
+        #[cfg(test)]
+        let _lock = LOCALE_MUTEX.lock().unwrap();
+
         unsafe {
             // Set locale from environment variables
             libc::setlocale(libc::LC_TIME, c"".as_ptr());
@@ -158,11 +174,24 @@ mod tests {
 
         #[test]
         fn test_c_locale_format() {
-            // Save original locale
+            // Acquire mutex to prevent interference with other tests
+            let _lock = LOCALE_MUTEX.lock().unwrap();
+
+            // Save original locale (both environment and process locale)
             let original_lc_all = std::env::var("LC_ALL").ok();
             let original_lc_time = std::env::var("LC_TIME").ok();
             let original_lang = std::env::var("LANG").ok();
 
+            // Save current process locale
+            let original_process_locale = unsafe {
+                let ptr = libc::setlocale(libc::LC_TIME, std::ptr::null());
+                if ptr.is_null() {
+                    None
+                } else {
+                    CStr::from_ptr(ptr).to_str().ok().map(|s| s.to_string())
+                }
+            };
+
             unsafe {
                 // Set C locale
                 std::env::set_var("LC_ALL", "C");
@@ -177,7 +206,7 @@ mod tests {
                 if d_t_fmt_ptr.is_null() {
                     None
                 } else {
-                    std::ffi::CStr::from_ptr(d_t_fmt_ptr).to_str().ok()
+                    CStr::from_ptr(d_t_fmt_ptr).to_str().ok()
                 }
             };
 
@@ -190,7 +219,7 @@ mod tests {
                 assert!(uses_24_hour, "C locale should use 24-hour format, got: {locale_format}");
             }
 
-            // Restore original locale
+            // Restore original environment variables
             unsafe {
                 if let Some(val) = original_lc_all {
                     std::env::set_var("LC_ALL", val);
@@ -208,6 +237,17 @@ mod tests {
                     std::env::remove_var("LANG");
                 }
             }
+
+            // Restore original process locale
+            unsafe {
+                if let Some(locale) = original_process_locale {
+                    let c_locale = std::ffi::CString::new(locale).unwrap();
+                    libc::setlocale(libc::LC_TIME, c_locale.as_ptr());
+                } else {
+                    // Restore from environment
+                    libc::setlocale(libc::LC_TIME, c"".as_ptr());
+                }
+            }
         }
 
         #[test]

src/uu/date/src/locale.rs

@@ -701,9 +701,24 @@ impl EnvAppData {
         #[cfg(unix)]
         {
             let mut signal_action_log = SignalActionLog::default();
-            apply_default_signal(&opts.default_signal, &mut signal_action_log)?;
-            apply_ignore_signal(&opts.ignore_signal, &mut signal_action_log)?;
-            apply_block_signal(&opts.block_signal, &mut signal_action_log)?;
+            apply_signal_action(
+                &opts.default_signal,
+                &mut signal_action_log,
+                SignalActionKind::Default,
+                reset_signal,
+            )?;
+            apply_signal_action(
+                &opts.ignore_signal,
+                &mut signal_action_log,
+                SignalActionKind::Ignore,
+                ignore_signal,
+            )?;
+            apply_signal_action(
+                &opts.block_signal,
+                &mut signal_action_log,
+                SignalActionKind::Block,
+                block_signal,
+            )?;
             if opts.list_signal_handling {
                 list_signal_handling(&signal_action_log);
             }
@@ -990,19 +1005,29 @@ fn apply_specified_env_vars(opts: &Options<'_>) {
 }
 
 #[cfg(unix)]
-fn apply_default_signal(request: &SignalRequest, log: &mut SignalActionLog) -> UResult<()> {
+fn apply_signal_action<F>(
+    request: &SignalRequest,
+    log: &mut SignalActionLog,
+    action_kind: SignalActionKind,
+    signal_fn: F,
+) -> UResult<()>
+where
+    F: Fn(Signal) -> UResult<()>,
+{
     request.for_each_signal(|sig_value, explicit| {
         // On some platforms ALL_SIGNALS may contain values that are not valid in libc.
         // Skip those invalid ones and continue (GNU env also ignores undefined signals).
         let Ok(sig) = signal_from_value(sig_value) else {
             return Ok(());
         };
-        reset_signal(sig)?;
-        log.record(sig_value, SignalActionKind::Default, explicit);
+        signal_fn(sig)?;
+        log.record(sig_value, action_kind, explicit);
 
         // Set environment variable to communicate to Rust child processes
         // that SIGPIPE should be default (not ignored)
-        if sig_value == nix::libc::SIGPIPE as usize {
+        if matches!(action_kind, SignalActionKind::Default)
+            && sig_value == nix::libc::SIGPIPE as usize
+        {
             unsafe {
                 std::env::set_var("RUST_SIGPIPE", "default");
             }
@@ -1012,30 +1037,6 @@ fn apply_default_signal(request: &SignalRequest, log: &mut SignalActionLog) -> U
     })
 }
 
-#[cfg(unix)]
-fn apply_ignore_signal(request: &SignalRequest, log: &mut SignalActionLog) -> UResult<()> {
-    request.for_each_signal(|sig_value, explicit| {
-        let Ok(sig) = signal_from_value(sig_value) else {
-            return Ok(());
-        };
-        ignore_signal(sig)?;
-        log.record(sig_value, SignalActionKind::Ignore, explicit);
-        Ok(())
-    })
-}
-
-#[cfg(unix)]
-fn apply_block_signal(request: &SignalRequest, log: &mut SignalActionLog) -> UResult<()> {
-    request.for_each_signal(|sig_value, explicit| {
-        let Ok(sig) = signal_from_value(sig_value) else {
-            return Ok(());
-        };
-        block_signal(sig)?;
-        log.record(sig_value, SignalActionKind::Block, explicit);
-        Ok(())
-    })
-}
-
 #[cfg(unix)]
 fn ignore_signal(sig: Signal) -> UResult<()> {
     // SAFETY: This is safe because we write the handler for each signal only once, and therefore "the current handler is the default", as the documentation requires it.

src/uu/env/src/env.rs

@@ -60,3 +60,4 @@ harness = false
 
 [features]
 feat_selinux = ["selinux", "uucore/selinux"]
+smack = ["uucore/smack"]

src/uu/ls/Cargo.toml

@@ -124,3 +124,13 @@ ls-invalid-columns-width = ignoring invalid width in environment variable COLUMN
 ls-invalid-ignore-pattern = Invalid pattern for ignore: {$pattern}
 ls-invalid-hide-pattern = Invalid pattern for hide: {$pattern}
 ls-total = total {$size}
+
+# Security context warnings
+ls-warning-failed-to-get-security-context = failed to get security context of: {$path}
+ls-warning-getting-security-context = getting security context of: {$path}: {$error}
+
+# SMACK error messages (used by uucore::smack when called from ls)
+smack-error-not-enabled = SMACK is not enabled on this system
+smack-error-label-retrieval-failure = failed to get SMACK label: { $error }
+smack-error-label-set-failure = failed to set SMACK label to '{ $context }': { $error }
+smack-error-no-label-set = no SMACK label set

src/uu/ls/locales/en-US.ftl

@@ -365,7 +365,10 @@ pub struct Config {
     time_format_recent: String,        // Time format for recent dates
     time_format_older: Option<String>, // Time format for older dates (optional, if not present, time_format_recent is used)
     context: bool,
+    #[cfg(all(feature = "selinux", target_os = "linux"))]
     selinux_supported: bool,
+    #[cfg(all(feature = "smack", target_os = "linux"))]
+    smack_supported: bool,
     group_directories_first: bool,
     line_ending: LineEnding,
     dired: bool,
@@ -1157,16 +1160,10 @@ impl Config {
             time_format_recent,
             time_format_older,
             context,
-            selinux_supported: {
-                #[cfg(all(feature = "selinux", target_os = "linux"))]
-                {
-                    uucore::selinux::is_selinux_enabled()
-                }
-                #[cfg(not(all(feature = "selinux", target_os = "linux")))]
-                {
-                    false
-                }
-            },
+            #[cfg(all(feature = "selinux", target_os = "linux"))]
+            selinux_supported: uucore::selinux::is_selinux_enabled(),
+            #[cfg(all(feature = "smack", target_os = "linux"))]
+            smack_supported: uucore::smack::is_smack_enabled(),
             group_directories_first: options.get_flag(options::GROUP_DIRECTORIES_FIRST),
             line_ending: LineEnding::from_zero_flag(options.get_flag(options::ZERO)),
             dired,
@@ -3387,37 +3384,59 @@ fn get_security_context<'a>(
         }
     }
 
+    #[cfg(all(feature = "selinux", target_os = "linux"))]
     if config.selinux_supported {
-        #[cfg(all(feature = "selinux", target_os = "linux"))]
-        {
-            match selinux::SecurityContext::of_path(path, must_dereference, false) {
-                Err(_r) => {
-                    // TODO: show the actual reason why it failed
-                    show_warning!("failed to get security context of: {}", path.quote());
-                    return Cow::Borrowed(SUBSTITUTE_STRING);
-                }
-                Ok(None) => return Cow::Borrowed(SUBSTITUTE_STRING),
-                Ok(Some(context)) => {
-                    let context = context.as_bytes();
+        match selinux::SecurityContext::of_path(path, must_dereference, false) {
+            Err(_r) => {
+                // TODO: show the actual reason why it failed
+                show_warning!(
+                    "{}",
+                    translate!(
+                        "ls-warning-failed-to-get-security-context",
+                        "path" => path.quote().to_string()
+                    )
+                );
+                return Cow::Borrowed(SUBSTITUTE_STRING);
+            }
+            Ok(None) => return Cow::Borrowed(SUBSTITUTE_STRING),
+            Ok(Some(context)) => {
+                let context = context.as_bytes();
 
-                    let context = context.strip_suffix(&[0]).unwrap_or(context);
+                let context = context.strip_suffix(&[0]).unwrap_or(context);
 
-                    let res: String = String::from_utf8(context.to_vec()).unwrap_or_else(|e| {
-                        show_warning!(
-                            "getting security context of: {}: {}",
-                            path.quote(),
-                            e.to_string()
-                        );
+                let res: String = String::from_utf8(context.to_vec()).unwrap_or_else(|e| {
+                    show_warning!(
+                        "{}",
+                        translate!(
+                            "ls-warning-getting-security-context",
+                            "path" => path.quote().to_string(),
+                            "error" => e.to_string()
+                        )
+                    );
 
-                        String::from_utf8_lossy(context).to_string()
-                    });
+                    String::from_utf8_lossy(context).to_string()
+                });
 
-                    return Cow::Owned(res);
-                }
+                return Cow::Owned(res);
             }
         }
     }
 
+    #[cfg(all(feature = "smack", target_os = "linux"))]
+    if config.smack_supported {
+        // For SMACK, use the path to get the label
+        // If must_dereference is true, we follow the symlink
+        let target_path = if must_dereference {
+            std::fs::canonicalize(path).unwrap_or_else(|_| path.to_path_buf())
+        } else {
+            path.to_path_buf()
+        };
+
+        return uucore::smack::get_smack_label_for_path(&target_path)
+            .map(Cow::Owned)
+            .unwrap_or(Cow::Borrowed(SUBSTITUTE_STRING));
+    }
+
     Cow::Borrowed(SUBSTITUTE_STRING)
 }
 

src/uu/ls/src/ls.rs

@@ -28,3 +28,5 @@ ptx-error-dumb-format = There is no dumb format with GNU extensions disabled
 ptx-error-not-implemented = { $feature } not implemented yet
 ptx-error-write-failed = write failed
 ptx-error-extra-operand = extra operand { $operand }
+ptx-error-empty-regexp = A regular expression cannot match a length zero string
+ptx-error-invalid-regexp = Invalid regexp: { $error }