Merge branch 'main' into misc/close-stdout.sh

Author: mattsu2020

.cargo/config.toml

@@ -6,6 +6,8 @@
 linker = "x86_64-unknown-redox-gcc"
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
+[target.riscv64gc-unknown-linux-musl]
+rustflags = ["-C", "target-feature=+crt-static"]
 
 [env]
 # See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml

.github/workflows/CICD.yml

@@ -309,7 +309,7 @@ jobs:
         ./target/release-fast/true
         # Check that the progs have prefix
         test -f /tmp/usr/local/bin/uu-tty
-        test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*   
+        test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
         # Check that the manpage is not present
         ! test -f /tmp/usr/local/share/man/man1/uu-whoami.1
         # Check that the completion is not present
@@ -576,6 +576,7 @@ jobs:
           - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross , skip-tests: true }
           - { os: ubuntu-24.04-arm  , target: aarch64-unknown-linux-gnu   , features: feat_os_unix_gnueabihf }
           - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl  , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
+          - { os: ubuntu-latest  , target: riscv64gc-unknown-linux-musl  , features: feat_os_unix_musl , use-cross: use-cross , skip-tests: true }
           # - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_selinux           , use-cross: use-cross }
           - { os: ubuntu-latest  , target: i686-unknown-linux-gnu      , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
           - { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix_musl , use-cross: use-cross }
@@ -636,6 +637,7 @@ jobs:
         unset TARGET_ARCH
         case '${{ matrix.job.target }}' in
           aarch64-*) TARGET_ARCH=arm64 ;;
+          riscv64gc-*) TARGET_ARCH=riscv64 ;;
           arm-*-*hf) TARGET_ARCH=armhf ;;
           i686-*) TARGET_ARCH=i686 ;;
           x86_64-*) TARGET_ARCH=x86_64 ;;
@@ -700,6 +702,7 @@ jobs:
         STRIP="strip"
         case ${{ matrix.job.target }} in
           aarch64-*-linux-*) STRIP="aarch64-linux-gnu-strip" ;;
+          riscv64gc-*-linux-*) STRIP="riscv64-linux-gnu-strip" ;;
           arm-*-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;;
           *-pc-windows-msvc) STRIP="" ;;
         esac;
@@ -726,6 +729,10 @@ jobs:
             sudo apt-get -y update
             sudo apt-get -y install gcc-aarch64-linux-gnu
           ;;
+          riscv64gc-unknown-linux-*)
+            sudo apt-get -y update
+            sudo apt-get -y install gcc-riscv64-linux-gnu
+          ;;
           *-redox*)
             sudo apt-get -y update
             sudo apt-get -y install fuse3 libfuse-dev
@@ -814,6 +821,8 @@ jobs:
       if: matrix.job.skip-tests != true
       shell: bash
       run: |
+        command -v sudo && sudo rm -rf /usr/local/lib/android /usr/share/dotnet # avoid no space left
+        df -h ||:
         ## Test individual utilities
         ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} test --target=${{ matrix.job.target }} \
         ${{ matrix.job.cargo-options }} ${{ steps.dep_vars.outputs.CARGO_UTILITY_LIST_OPTIONS }}
@@ -1194,7 +1203,8 @@ jobs:
     - name: build and test all features individually
       shell: bash
       run: |
-        command -v sudo && sudo rm -rf /usr/share/dotnet # avoid no space left
+        command -v sudo && sudo rm -rf /usr/local/lib/android /usr/share/dotnet # avoid no space left
+        df -h ||:
         CARGO_FEATURES_OPTION='--features=${{ matrix.job.features }}' ;
         for f in $(util/show-utils.sh ${CARGO_FEATURES_OPTION})
         do

.github/workflows/GnuTests.yml

@@ -2,7 +2,7 @@ name: GnuTests
 
 # spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
 # spell-checker:ignore (jargon) submodules devel
-# spell-checker:ignore (libs/utils) autopoint chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt texinfo valgrind libattr libcap taiki-e zstd cpio
+# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
 # spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
 # spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
 # spell-checker:ignore (vars) FILESET SUBDIRS XPASS
@@ -47,7 +47,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
-        components: rustfmt
     - uses: Swatinem/rust-cache@v2
       with:
         workspaces: "./uutils -> target"
@@ -69,7 +68,7 @@ jobs:
         ## Install dependencies
         sudo apt-get update
         ## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
-        sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
+        sudo apt-get install -y gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
         curl http://launchpadlibrarian.net/831710181/automake_1.18.1-3_all.deb > automake-1.18.deb
         sudo dpkg -i --force-depends automake-1.18.deb
     - name: Add various locales
@@ -105,7 +104,7 @@ jobs:
         ## Build binaries
         cd 'uutils'
         env PROFILE=release-small bash util/build-gnu.sh
-        
+
     - name: Save files for faster configure and skipping make
       uses: actions/cache/save@v5
       if: always() && steps.cache-config-gnu.outputs.cache-hit != 'true'
@@ -211,7 +210,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
-        components: rustfmt
     - uses: Swatinem/rust-cache@v2
       with:
         workspaces: "./uutils -> target"
@@ -247,8 +245,8 @@ jobs:
     - name: Install dependencies in VM
       run: |
         lima sudo dnf -y update
-        lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex automake patch quilt
-        lima rustup-init -y --default-toolchain stable
+        lima sudo dnf -y install autoconf bison gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel automake patch quilt
+        lima rustup-init -y --profile=minimal --default-toolchain stable
     - name: Copy the sources to VM
       run: |
         rsync -a -e ssh . lima-default:~/work/
@@ -331,7 +329,6 @@ jobs:
     - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: stable
-        components: rustfmt
     - uses: Swatinem/rust-cache@v2
       with:
         workspaces: "./uutils -> target"

.github/workflows/android.yml

@@ -166,7 +166,7 @@ jobs:
         disk-size: ${{ env.EMULATOR_DISK_SIZE }}
         cores: ${{ env.EMULATOR_CORES }}
         force-avd-creation: false
-        emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
+        emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-metrics -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
         emulator-boot-timeout: ${{ env.EMULATOR_BOOT_TIMEOUT }}
         # This is not a usual script. Every line is executed in a separate shell with `sh -c`. If
         # one of the lines returns with error the whole script is failed (like running a script with

.github/workflows/benchmarks.yml

@@ -27,10 +27,11 @@ jobs:
           - { package: uu_cksum }
           - { package: uu_cp }
           - { package: uu_cut }
+          - { package: uu_dd }
           - { package: uu_du }
           - { package: uu_expand }
           - { package: uu_fold }
-          - { package: uu_hashsum }
+          - { package: uu_join }
           - { package: uu_ls }
           - { package: uu_mv }
           - { package: uu_nl }
@@ -45,6 +46,7 @@ jobs:
           - { package: uu_uniq }
           - { package: uu_wc }
           - { package: uu_factor }
+          - { package: uu_date }
     steps:
       - uses: actions/checkout@v6
         with:
@@ -72,7 +74,7 @@ jobs:
         env:
           CODSPEED_LOG: debug
         with:
-          mode: instrumentation
+          mode: simulation
           run: |
             echo "Running benchmarks for ${{ matrix.benchmark-target.package }}"
             cargo codspeed run -p ${{ matrix.benchmark-target.package }} > /dev/null

.github/workflows/openbsd.yml

@@ -47,7 +47,7 @@ jobs:
         prepare: |
           # Clean up disk space before installing packages
           df -h
-          rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
+          rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
           pkg_add curl sudo-- jq coreutils bash rust rust-clippy rust-rustfmt llvm--
           # Clean up package cache after installation
           pkg_delete -a || true
@@ -115,8 +115,6 @@ jobs:
           fi
           # Clean to avoid to rsync back the files and free up disk space
           cargo clean
-          # Additional cleanup to free disk space
-          rm -rf ~/.cargo/registry/cache ~/.cargo/git/db || true
           if [ -n "\${FAIL_ON_FAULT}" ] && [ -n "\${FAULT}" ]; then exit 1 ; fi
           EOF
 
@@ -144,10 +142,10 @@ jobs:
         prepare: |
           # Clean up disk space before installing packages
           df -h
-          rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
+          rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
           pkg_add curl gmake sudo-- jq rust llvm--
           # Clean up package cache after installation
-          pkg_delete -a || true
+          pkg_delete -a || :
           df -h
         run: |
           ## Prepare, build, and test
@@ -197,8 +195,6 @@ jobs:
           cd "${WORKSPACE}"
           unset FAULT
           cargo build || FAULT=1
-          # Clean build artifacts to save disk space before testing
-          rm -rf target/debug/build target/debug/incremental || true
           export PATH=~/.cargo/bin:${PATH}
           export RUST_BACKTRACE=1
           export CARGO_TERM_COLOR=always
@@ -216,6 +212,5 @@ jobs:
           # Clean to avoid to rsync back the files and free up disk space
           cargo clean
           # Additional cleanup to free disk space
-          rm -rf ~/.cargo/registry/cache ~/.cargo/git/db target/debug/deps target/release/deps || true
           if (test -n "\$FAULT"); then exit 1 ; fi
           EOF

.vscode/cspell.dictionaries/jargon.wordlist.txt

@@ -86,6 +86,7 @@ listxattr
 llistxattr
 lossily
 lstat
+makedev
 mebi
 mebibytes
 mergeable

.vscode/cspell.dictionaries/workspace.wordlist.txt

@@ -379,6 +379,7 @@ istrip
 litout
 opost
 parodd
+ENOTTY
 
 # translation tests
 CLICOLOR