Merge branch 'main' into patch-3

Author: oech3

.github/workflows/CICD.yml

@@ -300,22 +300,22 @@ jobs:
       run: make nextest PROFILE=ci CARGOFLAGS="--hide-progress-bar"
       env:
         RUST_BACKTRACE: "1"
-
-    - name: "`make install PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
+    - name: "`make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: bash
       run: |
         set -x
-        DESTDIR=/tmp/ make PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n install
+        DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n
         # Check that utils are built with given profile
         ./target/release-fast/true
-        # Check that the utils are present
-        test -f /tmp/usr/local/bin/tty
+        # Check that the progs have prefix
+        test -f /tmp/usr/local/bin/uu-tty
+        test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*   
         # Check that the manpage is not present
-        ! test -f /tmp/usr/local/share/man/man1/whoami.1
+        ! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
         # Check that the completion is not present
-        ! test -f /tmp/usr/local/share/zsh/site-functions/_install
-        ! test -f /tmp/usr/local/share/bash-completion/completions/head.bash
-        ! test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
+        ! test -f /tmp/usr/local/share/zsh/site-functions/_uu-install
+        ! test -f /tmp/usr/local/share/bash-completion/completions/uu-head.bash
+        ! test -f /tmp/usr/local/share/fish/vendor_completions.d/uu-cat.fish
       env:
         RUST_BACKTRACE: "1"
     - name: "`make install`"

.github/workflows/GnuTests.yml

@@ -6,6 +6,7 @@ name: GnuTests
 # spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
 # spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
 # spell-checker:ignore (vars) FILESET SUBDIRS XPASS
+# spell-checker:ignore userns
 
 # * note: to run a single test => `REPO/util/run-gnu-test.sh PATH/TO/TEST/SCRIPT`
 
@@ -116,6 +117,9 @@ jobs:
     - name: Run GNU tests
       shell: bash
       run: |
+        ## Use unshare
+        sudo sysctl -w kernel.unprivileged_userns_clone=1
+        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
         ## Run GNU tests
         path_GNU='gnu'
         path_UUTILS='uutils'

.github/workflows/fuzzing.yml

@@ -79,8 +79,7 @@ jobs:
       matrix:
         test-target:
           - { name: fuzz_test, should_pass: true }
-          # https://github.com/uutils/coreutils/issues/5311
-          - { name: fuzz_date, should_pass: false }
+          - { name: fuzz_date, should_pass: true }
           - { name: fuzz_expr, should_pass: true }
           - { name: fuzz_printf, should_pass: true }
           - { name: fuzz_echo, should_pass: true }

GNUmakefile

@@ -27,20 +27,20 @@ CARGO  ?= cargo
 CARGOFLAGS ?=
 RUSTC_ARCH ?= # should be empty except for cross-build, not --target $(shell rustc --print host-tuple)
 
+#prefix prepended to all binaries and library dir
+PROG_PREFIX ?=
+
 # Install directories
 PREFIX ?= /usr/local
 DESTDIR ?=
 BINDIR ?= $(PREFIX)/bin
 DATAROOTDIR ?= $(PREFIX)/share
-LIBSTDBUF_DIR ?= $(PREFIX)/libexec/coreutils
+LIBSTDBUF_DIR ?= $(PREFIX)/libexec/$(PROG_PREFIX)coreutils
 # Export variable so that it is used during the build
 export LIBSTDBUF_DIR
 
 INSTALLDIR_BIN=$(DESTDIR)$(BINDIR)
 
-#prefix to apply to coreutils binary and all tool binaries
-PROG_PREFIX ?=
-
 # This won't support any directory with spaces in its name, but you can just
 # make a symlink without spaces that points to the directory.
 BASEDIR       ?= $(shell pwd)

docs/src/extensions.md

@@ -190,10 +190,6 @@ Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provide
 
 Just like on macOS, `base32/base64/basenc` provides `-D` to decode data.
 
-## `shred`
-
-The number of random passes is deterministic in both GNU and uutils. However, uutils `shred` computes the number of random passes in a simplified way, specifically `max(3, x / 10)`, which is very close but not identical to the number of random passes that GNU would do. This also satisfies an expectation that reasonable users might have, namely that the number of random passes increases monotonically with the number of passes overall; GNU `shred` violates this assumption.
-
 ## `unexpand`
 
 GNU `unexpand` provides `--first-only` to convert only leading sequences of blanks. We support a

fuzz/fuzz_targets/fuzz_date.rs

@@ -3,12 +3,38 @@ use libfuzzer_sys::fuzz_target;
 
 use std::ffi::OsString;
 use uu_date::uumain;
+use uufuzz::generate_and_run_uumain;
 
 fuzz_target!(|data: &[u8]| {
     let delim: u8 = 0; // Null byte
-    let args = data
+    let fuzz_args: Vec<OsString> = data
         .split(|b| *b == delim)
         .filter_map(|e| std::str::from_utf8(e).ok())
-        .map(OsString::from);
-    uumain(args);
+        .map(OsString::from)
+        .collect();
+
+    // Skip test cases that would cause the program to read from stdin
+    // These would hang the fuzzer waiting for input
+    for i in 0..fuzz_args.len() {
+        if let Some(arg) = fuzz_args.get(i) {
+            let arg_str = arg.to_string_lossy();
+            // Skip if -f- or --file=- (reads dates from stdin)
+            if (arg_str == "-f"
+                && fuzz_args
+                    .get(i + 1)
+                    .map(|a| a.to_string_lossy() == "-")
+                    .unwrap_or(false))
+                || arg_str == "-f-"
+                || arg_str == "--file=-"
+            {
+                return;
+            }
+        }
+    }
+
+    // Add program name as first argument (required for proper argument parsing)
+    let mut args = vec![OsString::from("date")];
+    args.extend(fuzz_args);
+
+    let _ = generate_and_run_uumain(&args, uumain, None);
 });

src/uu/cksum/src/cksum.rs

@@ -216,7 +216,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         algo_kind: algo,
         output_format,
         line_ending,
-        no_names: false,
     };
 
     perform_checksum_computation(opts, files)?;

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

@@ -104,3 +104,4 @@ date-error-date-overflow = date overflow '{$date}'
 date-error-setting-date-not-supported-macos = setting the date is not supported by macOS
 date-error-setting-date-not-supported-redox = setting the date is not supported by Redox
 date-error-cannot-set-date = cannot set date
+date-error-extra-operand = extra operand '{$operand}'

src/uu/date/locales/fr-FR.ftl

@@ -99,3 +99,4 @@ date-error-date-overflow = débordement de date '{$date}'
 date-error-setting-date-not-supported-macos = la définition de la date n'est pas prise en charge par macOS
 date-error-setting-date-not-supported-redox = la définition de la date n'est pas prise en charge par Redox
 date-error-cannot-set-date = impossible de définir la date
+date-error-extra-operand = opérande supplémentaire '{$operand}'

src/uu/date/src/date.rs

@@ -171,6 +171,17 @@ fn parse_military_timezone_with_offset(s: &str) -> Option<i32> {
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let matches = uucore::clap_localization::handle_clap_result(uu_app(), args)?;
 
+    // Check for extra operands (multiple positional arguments)
+    if let Some(formats) = matches.get_many::<String>(OPT_FORMAT) {
+        let format_args: Vec<&String> = formats.collect();
+        if format_args.len() > 1 {
+            return Err(USimpleError::new(
+                1,
+                translate!("date-error-extra-operand", "operand" => format_args[1]),
+            ));
+        }
+    }
+
     let format = if let Some(form) = matches.get_one::<String>(OPT_FORMAT) {
         if !form.starts_with('+') {
             return Err(USimpleError::new(
@@ -515,7 +526,7 @@ pub fn uu_app() -> Command {
                 .help(translate!("date-help-universal"))
                 .action(ArgAction::SetTrue),
         )
-        .arg(Arg::new(OPT_FORMAT))
+        .arg(Arg::new(OPT_FORMAT).num_args(0..).trailing_var_arg(true))
 }
 
 /// Return the appropriate format string for the given settings.