Merge branch 'main' into sylvestre-patch-4

Author: sylvestre

.github/workflows/CICD.yml

@@ -378,8 +378,7 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross, skip-publish: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl , use-cross: use-cross }
-          # utmpx, chroot stdbuf is broken on NetBSD at least for...
-          - { os: ubuntu-latest  , target: x86_64-unknown-netbsd       , features: "feat_Tier1" , use-cross: use-cross , skip-tests: true , check-only: true }
+          - { os: ubuntu-latest  , target: x86_64-unknown-netbsd, features: "feat_Tier1,feat_require_unix_core,feat_require_unix_hostid,feat_require_unix_utmpx", use-cross: use-cross , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: wasm32-wasip1, default-features: false, features: feat_wasm, skip-tests: true }
           - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU

.github/workflows/code-quality.yml

@@ -116,7 +116,7 @@ jobs:
           ;;
         esac
     - name: "`cargo clippy` lint testing"
-      uses: nick-fields/retry@v3
+      uses: nick-fields/retry@v4
       with:
         max_attempts: 3
         retry_on: error

.github/workflows/make.yml

@@ -266,6 +266,40 @@ jobs:
         # 2. the makefile doesn't try to install libstdbuf even though stdbuf is skipped
         DESTDIR=/tmp/ make SKIP_UTILS="stdbuf" install
 
+  # keep this job minimal to avoid have many duplicated build with CICD
+  build_makefile-other:
+    name: Build/Makefile
+    runs-on: ${{ matrix.job.os }}
+    env:
+      CARGO_INCREMENTAL: 0
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { os: windows-latest , features: feat_os_windows }
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - uses: Swatinem/rust-cache@v2
+    - name: Run sccache-cache
+      id: sccache-setup
+      uses: mozilla-actions/sccache-action@v0.0.9
+      continue-on-error: true
+    - name: Export sccache
+      if: steps.sccache-setup.outcome == 'success'
+      run: |
+        echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
+        echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
+    - name: "`make build`"
+      shell: bash
+      run: |
+        set -x
+        # Check that we exclude unix programs to avoid build failure
+        make PREFIX=/tmp/usr MULTICALL=y COMPLETIONS=n MANPAGES=n LOCALES=n \
+         SKIP_UTILS="arch b2sum base32 base64 basename basenc cat cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold head hostname join link ln ls md5sum mkdir mktemp more mv nl nproc numfmt od paste pr printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split sum sync tac tail tee test touch tr truncate tsort uname unexpand uniq unlink vdir wc whoami yes"
+        target/debug/coreutils.exe true
+
   test_busybox:
     name: Tests/BusyBox test suite
     runs-on: ${{ matrix.job.os }}

.github/workflows/manpage-lint.yml

@@ -0,0 +1,109 @@
+# spell-checker:ignore mandoc uudoc manpages dtolnay libsystemd libattr libcap DESTDIR
+
+name: Manpage Validation
+
+on:
+  pull_request:
+    paths:
+      - 'src/bin/uudoc.rs'
+      - 'src/uu/*/locales/*.ftl'
+      - 'src/uu/*/src/*.rs'
+      - 'Cargo.toml'
+      - 'GNUmakefile'
+      - '.github/workflows/manpage-lint.yml'
+  push:
+    branches:
+      - main
+    paths:
+      - 'src/bin/uudoc.rs'
+      - 'src/uu/*/locales/*.ftl'
+      - 'src/uu/*/src/*.rs'
+      - 'Cargo.toml'
+      - 'GNUmakefile'
+      - '.github/workflows/manpage-lint.yml'
+
+jobs:
+  manpage-lint:
+    name: Validate manpages with mandoc
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        locale: [en_US.UTF-8, fr_FR.UTF-8]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install prerequisites
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y mandoc locales-all
+          sudo apt-get install -y libselinux1-dev libsystemd-dev libacl1-dev libattr1-dev libcap-dev
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Build manpages (${{ matrix.locale }})
+        run: |
+          # Create temporary directory for manpages
+          MANPAGE_DIR=$(mktemp -d)
+          echo "MANPAGE_DIR=${MANPAGE_DIR}" >> $GITHUB_ENV
+
+          # Set locale for manpage generation
+          export LANG=${{ matrix.locale }}
+
+          # Build and install manpages to temporary directory
+          make install-manpages DESTDIR="${MANPAGE_DIR}"
+
+      - name: Validate manpages with mandoc (${{ matrix.locale }})
+        run: |
+          # Find all generated manpages
+          MANPAGE_PATH="${MANPAGE_DIR}/usr/local/share/man/man1"
+
+          # Check if manpages were generated
+          if [ ! -d "${MANPAGE_PATH}" ]; then
+            echo "Error: No manpages found at ${MANPAGE_PATH}"
+            exit 1
+          fi
+
+          # Initialize error tracking
+          ERRORS_FOUND=0
+          ERROR_LOG=$(mktemp)
+
+          echo "Validating ${{ matrix.locale }} manpages with mandoc..."
+          echo "=========================================="
+
+          # Validate each manpage
+          for manpage in "${MANPAGE_PATH}"/*.1; do
+            if [ -f "$manpage" ]; then
+              filename=$(basename "$manpage")
+
+              # Run mandoc lint and capture output (only errors, not style warnings)
+              if ! mandoc -T lint -W error "$manpage" 2>&1 | tee -a "$ERROR_LOG"; then
+                echo "Errors found in $filename"
+                ERRORS_FOUND=1
+              else
+                # Check if mandoc produced any output (errors only, not style warnings)
+                if mandoc -T lint -W error "$manpage" 2>&1 | grep -q .; then
+                  echo "Warnings found in $filename"
+                  ERRORS_FOUND=1
+                else
+                  echo "$filename is valid"
+                fi
+              fi
+            fi
+          done
+
+          echo ""
+          echo "=================================="
+
+          # Summary and exit
+          if [ "$ERRORS_FOUND" -eq 1 ]; then
+            echo "Manpage validation failed. Issues found:"
+            echo ""
+            cat "$ERROR_LOG"
+            exit 1
+          else
+            echo "All manpages validated successfully!"
+          fi

Cargo.lock

@@ -31,7 +31,14 @@ expensive_tests = []
 # "test_risky_names" == enable tests that create problematic file names (would make a network share inaccessible to Windows, breaks SVN on Mac OS, etc.)
 test_risky_names = []
 # * only build `uudoc` when `--feature uudoc` is activated
-uudoc = ["dep:clap_complete", "dep:clap_mangen", "dep:fluent-syntax", "dep:zip"]
+uudoc = [
+  "dep:clap_complete",
+  "dep:clap_mangen",
+  "dep:fluent-syntax",
+  "dep:jiff",
+  "dep:regex",
+  "dep:zip",
+]
 ## features
 ## Optional feature for stdbuf
 # "feat_external_libstdbuf" == use an external libstdbuf.so for stdbuf instead of embedding it
@@ -471,12 +478,14 @@ uu_checksum_common = { version = "0.7.0", path = "src/uu/checksum_common" }
 uutests = { version = "0.7.0", package = "uutests", path = "tests/uutests" }
 
 [dependencies]
+clap.workspace = true
 clap_complete = { workspace = true, optional = true }
 clap_mangen = { workspace = true, optional = true }
-clap.workspace = true
 fluent-syntax = { workspace = true, optional = true }
 itertools.workspace = true
+jiff = { workspace = true, optional = true }
 phf.workspace = true
+regex = { workspace = true, optional = true }
 selinux = { workspace = true, optional = true }
 textwrap.workspace = true
 uucore.workspace = true

Cargo.toml

@@ -62,44 +62,31 @@ TOYBOX_ROOT := $(BASEDIR)/tmp
 TOYBOX_VER  := 0.8.12
 TOYBOX_SRC  := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
 
-#------------------------------------------------------------------------
-# Detect the host system.
-# On Windows uname -s might return MINGW_NT-* or CYGWIN_NT-*.
-# Otherwise let it default to the kernel name returned by uname -s
-# (Linux, Darwin, FreeBSD, …).
-#------------------------------------------------------------------------
-OS ?= $(shell uname -s)
+# Detect the target system
+# See https://doc.rust-lang.org/beta/rustc/platform-support.html
+# todo: support building wasm
+OS := $(or $(CARGO_BUILD_TARGET),$(shell rustc --print host-tuple))
 
 # Windows does not allow symlink by default.
 # Allow to override LN for AppArmor.
-ifneq (,$(findstring _NT,$(OS)))
+ifneq (,$(findstring windows,$(OS)))
 	LN ?= ln -f
 endif
 LN ?= ln -sf
 
-# Possible programs
-PROGS := \
-	$(shell sed -n '/feat_Tier1 = \[/,/\]/p' Cargo.toml | sed '1d;2d' |tr -d '],"\n')\
-	$(shell sed -n '/feat_common_core = \[/,/\]/p' Cargo.toml | sed '1d' |tr -d '],"\n')
-
-UNIX_PROGS := \
-	$(shell sed -n '/feat_require_unix_core = \[/,/\]/p' Cargo.toml | sed '1d' |tr -d '],"\n') \
-	hostid \
-	pinky \
-	stdbuf \
-	uptime \
-	users \
-	who
-
 SELINUX_PROGS := \
 	chcon \
 	runcon
 
 $(info Detected OS = $(OS))
 
-ifeq (,$(findstring MINGW,$(OS)))
-	PROGS += $(UNIX_PROGS)
+ifeq (,$(findstring windows,$(OS)))
+	FEATURE_EXTRACT_UTILS := feat_os_unix
+else
+	FEATURE_EXTRACT_UTILS := feat_Tier1
 endif
+PROGS := $(shell cargo tree --depth 1 --features $(FEATURE_EXTRACT_UTILS) --format "{p}" --prefix none | sed -E -n 's/^uu_([^ ]+).*/\1/p')
+
 ifeq ($(SELINUX_ENABLED),1)
 	PROGS += $(SELINUX_PROGS)
 endif
@@ -114,7 +101,7 @@ endif
 # Programs with usable tests
 
 TESTS       := \
-	$(sort $(filter $(UTILS),$(PROGS) $(UNIX_PROGS) $(SELINUX_PROGS)))
+	$(sort $(filter $(UTILS),$(PROGS) $(SELINUX_PROGS)))
 
 TEST_NO_FAIL_FAST :=
 TEST_SPEC_FEATURE :=
@@ -288,7 +275,7 @@ install: build install-manpages install-completions install-locales
 	mkdir -p $(INSTALLDIR_BIN)
 ifneq (,$(and $(findstring stdbuf,$(UTILS)),$(findstring feat_external_libstdbuf,$(CARGOFLAGS))))
 	mkdir -p $(DESTDIR)$(LIBSTDBUF_DIR)
-ifneq (,$(findstring CYGWIN,$(OS)))
+ifneq (,$(findstring cygwin,$(OS)))
 	$(INSTALL) -m 755 $(BUILDDIR)/deps/stdbuf.dll $(DESTDIR)$(LIBSTDBUF_DIR)/libstdbuf.dll
 else
 	$(INSTALL) -m 755 $(BUILDDIR)/deps/libstdbuf.* $(DESTDIR)$(LIBSTDBUF_DIR)/
@@ -308,7 +295,7 @@ else
 endif
 
 uninstall:
-ifeq (,$(findstring MINGW,$(OS)))
+ifeq (,$(findstring windows,$(OS)))
 	rm -f $(DESTDIR)$(LIBSTDBUF_DIR)/libstdbuf.*
 	-rm -d $(DESTDIR)$(LIBSTDBUF_DIR) 2>/dev/null || true
 endif