Merge branch 'main' into noselinuxprogs

Author: oech3

.github/workflows/CICD.yml

@@ -303,11 +303,11 @@ jobs:
       run: make nextest CARGOFLAGS="--profile ci --hide-progress-bar"
       env:
         RUST_BACKTRACE: "1"
-    - name: "`make install COMPLETIONS=n MANPAGES=n`"
+    - name: "`make install COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: bash
       run: |
         set -x
-        DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n install
+        DESTDIR=/tmp/ make PROFILE=release COMPLETIONS=n MANPAGES=n LOCALES=n install
         # Check that SELinux progs are missing
         ! test -f /tmp/usr/local/bin/chcon
         # Check that the utils are present
@@ -357,20 +357,12 @@ jobs:
         test -f /tmp/usr/local/bin/hashsum
         # Check that hashsum symlinks are present
         test -h /tmp/usr/local/bin/b2sum
-        test -h /tmp/usr/local/bin/b3sum
         test -h /tmp/usr/local/bin/md5sum
         test -h /tmp/usr/local/bin/sha1sum
         test -h /tmp/usr/local/bin/sha224sum
         test -h /tmp/usr/local/bin/sha256sum
-        test -h /tmp/usr/local/bin/sha3-224sum
-        test -h /tmp/usr/local/bin/sha3-256sum
-        test -h /tmp/usr/local/bin/sha3-384sum
-        test -h /tmp/usr/local/bin/sha3-512sum
         test -h /tmp/usr/local/bin/sha384sum
-        test -h /tmp/usr/local/bin/sha3sum
         test -h /tmp/usr/local/bin/sha512sum
-        test -h /tmp/usr/local/bin/shake128sum
-        test -h /tmp/usr/local/bin/shake256sum
     - name: "`make install MULTICALL=y LN=ln -svf`"
       shell: bash
       run: |

.github/workflows/benchmarks.yml

@@ -43,6 +43,7 @@ jobs:
           - { package: uu_unexpand }
           - { package: uu_uniq }
           - { package: uu_wc }
+          - { package: uu_factor }
     steps:
       - uses: actions/checkout@v5
         with:

.github/workflows/code-quality.yml

@@ -133,7 +133,7 @@ jobs:
           else
             extra="--features ${{ matrix.job.features }}"
           fi
-          case '${{ matrix.job.workspace-tests }}' in
+          case '${{ matrix.job.workspace }}' in
           1|t|true|y|yes)
             extra="${extra} --workspace"
             ;;
@@ -186,7 +186,7 @@ jobs:
         cfg_files=($(shopt -s nullglob ; echo {.vscode,.}/{,.}c[sS]pell{.json,.config{.js,.cjs,.json,.yaml,.yml},.yaml,.yml} ;))
         cfg_file=${cfg_files[0]}
         unset CSPELL_CFG_OPTION ; if [ -n "$cfg_file" ]; then CSPELL_CFG_OPTION="--config $cfg_file" ; fi
-        S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/${PWD//\//\\/}\/(.*):(.*):(.*) - (.*)/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \4 (file:'\1', line:\2)/p" ; fault=true ; true ; }
+        S=$(cspell ${CSPELL_CFG_OPTION} --no-summary --no-progress .) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n "s/^(.*):([0-9]+):([0-9]+) - Unknown word \(([^)]+)\).*$/::${fault_type} file=\1,line=\2,col=\3::${fault_type^^}: \`cspell\`: Unknown word '\4' (file:'\1', line:\2)/p" ; fault=true ; true ; }
         if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
 
   toml_format:

Cargo.lock

@@ -199,20 +199,12 @@ SELINUX_PROGS := \
 
 HASHSUM_PROGS := \
 	b2sum \
-	b3sum \
 	md5sum \
 	sha1sum \
 	sha224sum \
 	sha256sum \
-	sha3-224sum \
-	sha3-256sum \
-	sha3-384sum \
-	sha3-512sum \
 	sha384sum \
-	sha3sum \
-	sha512sum \
-	shake128sum \
-	shake256sum
+	sha512sum
 
 $(info Detected OS = $(OS))
 
@@ -465,6 +457,7 @@ install-locales:
 		fi; \
 	done
 else
+locales:
 install-locales:
 endif
 

GNUmakefile

@@ -79,23 +79,13 @@ pub fn main() {
                 phf_map.entry(krate, format!("({krate}::uumain, {krate}::uu_app_custom)"));
 
                 let map_value = format!("({krate}::uumain, {krate}::uu_app_common)");
-                let map_value_bits = format!("({krate}::uumain, {krate}::uu_app_bits)");
-                let map_value_b3sum = format!("({krate}::uumain, {krate}::uu_app_b3sum)");
                 phf_map.entry("md5sum", map_value.clone());
                 phf_map.entry("sha1sum", map_value.clone());
                 phf_map.entry("sha224sum", map_value.clone());
                 phf_map.entry("sha256sum", map_value.clone());
                 phf_map.entry("sha384sum", map_value.clone());
                 phf_map.entry("sha512sum", map_value.clone());
-                phf_map.entry("sha3sum", map_value_bits.clone());
-                phf_map.entry("sha3-224sum", map_value.clone());
-                phf_map.entry("sha3-256sum", map_value.clone());
-                phf_map.entry("sha3-384sum", map_value.clone());
-                phf_map.entry("sha3-512sum", map_value.clone());
-                phf_map.entry("shake128sum", map_value_bits.clone());
-                phf_map.entry("shake256sum", map_value_bits.clone());
                 phf_map.entry("b2sum", map_value.clone());
-                phf_map.entry("b3sum", map_value_b3sum);
             }
             _ => {
                 phf_map.entry(krate, map_value.clone());

build.rs

@@ -54,13 +54,6 @@ supports computing the checksums with several algorithms. The flags and options
 are identical to the `*sum` family of utils (`sha1sum`, `sha256sum`, `b2sum`,
 etc.). This utility will be removed in the future and it is advised to use `cksum --untagged` instead.
 
-## `b3sum`
-
-This utility does not exist in GNU coreutils. The behavior is modeled after both
-the `b2sum` utility of GNU and the
-[`b3sum`](https://github.com/BLAKE3-team/BLAKE3) utility by the BLAKE3 team. It also
-supports the `--no-names` option, that does not appear in the GNU utility.
-
 ## `more`
 
 We provide a simple implementation of `more`, which is not part of GNU

docs/src/extensions.md

@@ -171,18 +171,16 @@ pub fn get_input(config: &Config) -> UResult<Box<dyn ReadSeek>> {
     }
 }
 
-/// Determines if the input buffer ends with padding ('=') after trimming trailing whitespace.
+/// Determines if the input buffer contains any padding ('=') ignoring trailing whitespace.
 fn read_and_has_padding<R: Read>(input: &mut R) -> UResult<(bool, Vec<u8>)> {
     let mut buf = Vec::new();
     input
         .read_to_end(&mut buf)
         .map_err(|err| USimpleError::new(1, format_read_error(err.kind())))?;
 
-    // Reverse iterator and skip trailing whitespace without extra collections
-    let has_padding = buf
-        .iter()
-        .rfind(|&&byte| !byte.is_ascii_whitespace())
-        .is_some_and(|&byte| byte == b'=');
+    // Treat the stream as padded if any '=' exists (GNU coreutils continues decoding
+    // even when padding bytes are followed by more data).
+    let has_padding = buf.contains(&b'=');
 
     Ok((has_padding, buf))
 }
@@ -665,6 +663,8 @@ mod tests {
             ("aGVsbG8sIHdvcmxkIQ== \n", true),
             ("aGVsbG8sIHdvcmxkIQ=", true),
             ("aGVsbG8sIHdvcmxkIQ= ", true),
+            ("MTIzNA==MTIzNA", true),
+            ("MTIzNA==\nMTIzNA", true),
             ("aGVsbG8sIHdvcmxkIQ \n", false),
             ("aGVsbG8sIHdvcmxkIQ", false),
         ];

src/uu/base32/src/base_common.rs

@@ -45,6 +45,7 @@ fn du_all_balanced_tree(
 }
 */
 
+/* too much variance
 /// Benchmark du -h (human readable) on balanced tree
 #[divan::bench(args = [(5, 4, 10)])]
 fn du_human_balanced_tree(
@@ -55,6 +56,7 @@ fn du_human_balanced_tree(
     fs_tree::create_balanced_tree(temp_dir.path(), depth, dirs_per_level, files_per_dir);
     bench_du_with_args(bencher, &temp_dir, &["-h"]);
 }
+*/
 
 /// Benchmark du on wide directory structures (many files/dirs, shallow)
 #[divan::bench(args = [(5000, 500)])]

src/uu/du/benches/du_bench.rs

@@ -29,5 +29,13 @@ fluent = { workspace = true }
 name = "factor"
 path = "src/main.rs"
 
+[dev-dependencies]
+divan = { workspace = true }
+uucore = { workspace = true, features = ["benchmark"] }
+
 [lib]
 path = "src/factor.rs"
+
+[[bench]]
+name = "factor_bench"
+harness = false