Merge branch 'uutils:main' into uucore-memory

Author: mattsu2020

.github/workflows/CICD.yml

@@ -379,6 +379,11 @@ jobs:
         set -x
         # Regression-test for https://github.com/uutils/coreutils/issues/8701
         make UTILS="rm chmod chown chgrp mv du"
+        # Verifies that
+        # 1. there is no "error: none of the selected packages contains this
+        # feature: feat_external_libstdbuf"
+        # 2. the makefile doesn't try to install libstdbuf even though stdbuf is skipped
+        DESTDIR=/tmp/ make SKIP_UTILS="stdbuf" install
 
   build_rust_stable:
     name: Build/stable

GNUmakefile

@@ -107,6 +107,7 @@ PROGS       := \
 	dir \
 	dircolors \
 	dirname \
+	du \
 	echo \
 	env \
 	expand \
@@ -117,6 +118,7 @@ PROGS       := \
 	fold \
 	hashsum \
 	head \
+	hostname \
 	join \
 	link \
 	ln \
@@ -145,17 +147,18 @@ PROGS       := \
 	sleep \
 	sort \
 	split \
-	stty \
 	sum \
 	sync \
 	tac \
 	tail \
 	tee \
 	test \
+	touch \
 	tr \
 	true \
 	truncate \
 	tsort \
+	uname \
 	unexpand \
 	uniq \
 	vdir \
@@ -169,10 +172,8 @@ UNIX_PROGS := \
 	chmod \
 	chown \
 	chroot \
-	du \
 	groups \
 	hostid \
-	hostname \
 	id \
 	install \
 	kill \
@@ -185,10 +186,9 @@ UNIX_PROGS := \
 	pinky \
 	stat \
 	stdbuf \
+	stty \
 	timeout \
-	touch \
 	tty \
-	uname \
 	unlink \
 	uptime \
 	users \
@@ -228,7 +228,7 @@ ifneq ($(OS),Windows_NT)
 	PROGS := $(PROGS) $(SELINUX_PROGS)
 endif
 
-UTILS ?= $(PROGS)
+UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
 
 ifneq ($(findstring stdbuf,$(UTILS)),)
     # Use external libstdbuf per default. It is more robust than embedding libstdbuf.
@@ -306,7 +306,7 @@ TEST_PROGS  := \
 	who
 
 TESTS       := \
-	$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(TEST_PROGS))))
+	$(sort $(filter $(UTILS),$(TEST_PROGS)))
 
 TEST_NO_FAIL_FAST :=
 TEST_SPEC_FEATURE :=
@@ -326,7 +326,7 @@ endef
 
 # Output names
 EXES        := \
-	$(sort $(filter $(UTILS),$(filter-out $(SKIP_UTILS),$(PROGS))))
+	$(sort $(UTILS))
 
 INSTALLEES  := ${EXES}
 ifeq (${MULTICALL}, y)
@@ -352,7 +352,7 @@ build-coreutils:
 
 build: build-coreutils build-pkgs locales
 
-$(foreach test,$(filter-out $(SKIP_UTILS),$(PROGS)),$(eval $(call TEST_BUSYBOX,$(test))))
+$(foreach test,$(UTILS),$(eval $(call TEST_BUSYBOX,$(test))))
 
 test:
 	${CARGO} test ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" --no-default-features $(TEST_NO_FAIL_FAST)
@@ -482,7 +482,7 @@ endif
 
 install: build install-manpages install-completions install-locales
 	mkdir -p $(INSTALLDIR_BIN)
-ifneq ($(OS),Windows_NT)
+ifneq (,$(and $(findstring stdbuf,$(UTILS)),$(findstring feat_external_libstdbuf,$(CARGOFLAGS))))
 	mkdir -p $(DESTDIR)$(LIBSTDBUF_DIR)
 	$(INSTALL) -m 755 $(BUILDDIR)/deps/libstdbuf* $(DESTDIR)$(LIBSTDBUF_DIR)/
 endif

fuzz/Cargo.toml

@@ -18,6 +18,11 @@ license = "MIT"
 [package.metadata]
 cargo-fuzz = true
 
+# Enable debug symbols in release builds for readable backtraces
+# when fuzzing discovers crashes. This addresses issue #5343.
+[profile.release]
+debug = true
+
 [dependencies]
 libfuzzer-sys = "0.4.7"
 rand = { version = "0.9.0", features = ["small_rng"] }

src/uu/df/src/blocks.rs

@@ -9,7 +9,7 @@ use std::{env, fmt};
 
 use uucore::{
     display::Quotable,
-    parser::parse_size::{ParseSizeError, parse_size_u64},
+    parser::parse_size::{ParseSizeError, parse_size_non_zero_u64, parse_size_u64},
 };
 
 /// The first ten powers of 1024.
@@ -213,7 +213,7 @@ pub(crate) fn read_block_size(matches: &ArgMatches) -> Result<BlockSize, ParseSi
 fn block_size_from_env() -> Option<u64> {
     for env_var in ["DF_BLOCK_SIZE", "BLOCK_SIZE", "BLOCKSIZE"] {
         if let Ok(env_size) = env::var(env_var) {
-            return parse_size_u64(&env_size).ok();
+            return parse_size_non_zero_u64(&env_size).ok();
         }
     }
 

src/uu/ls/src/ls.rs

@@ -68,7 +68,7 @@ use uucore::{
     line_ending::LineEnding,
     os_str_as_bytes_lossy,
     parser::parse_glob,
-    parser::parse_size::parse_size_u64,
+    parser::parse_size::parse_size_non_zero_u64,
     parser::shortcut_value_parser::ShortcutValueParser,
     quoting_style::{QuotingStyle, locale_aware_escape_dir_name, locale_aware_escape_name},
     show, show_error, show_warning,
@@ -902,7 +902,7 @@ impl Config {
 
         let (file_size_block_size, block_size) = if !opt_si && !opt_hr && !raw_block_size.is_empty()
         {
-            match parse_size_u64(&raw_block_size.to_string_lossy()) {
+            match parse_size_non_zero_u64(&raw_block_size.to_string_lossy()) {
                 Ok(size) => match (is_env_var_blocksize, opt_kb) {
                     (true, true) => (DEFAULT_FILE_SIZE_BLOCK_SIZE, DEFAULT_BLOCK_SIZE),
                     (true, false) => (DEFAULT_FILE_SIZE_BLOCK_SIZE, size),

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

@@ -66,6 +66,7 @@ od-help-address-radix = Select the base in which file offsets are printed.
 od-help-skip-bytes = Skip bytes input bytes before formatting and writing.
 od-help-read-bytes = limit dump to BYTES input bytes
 od-help-endian = byte order to use for multi-byte formats
+od-help-strings = output strings of at least BYTES graphic chars. 3 is assumed when BYTES is not specified.
 od-help-a = named characters, ignoring high-order bit
 od-help-b = octal bytes
 od-help-c = ASCII characters or backslash escapes
@@ -76,3 +77,17 @@ od-help-output-duplicates = do not use * to mark line suppression
 od-help-width = output BYTES bytes per output line. 32 is implied when BYTES is not
                 specified.
 od-help-traditional = compatibility mode with one input, offset and label.
+od-help-o = octal 2-byte units
+od-help-capital-i = decimal 8-byte units
+od-help-capital-l = decimal 8-byte units
+od-help-i = decimal 4-byte units
+od-help-l = decimal 8-byte units
+od-help-x = hexadecimal 2-byte units
+od-help-h = hexadecimal 2-byte units
+od-help-capital-o = octal 4-byte units
+od-help-s = decimal 2-byte units
+od-help-capital-x = hexadecimal 4-byte units
+od-help-capital-h = hexadecimal 4-byte units
+od-help-e = floating point double precision (64-bit) units
+od-help-f = floating point double precision (32-bit) units
+od-help-capital-f = floating point double precision (64-bit) units

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

@@ -67,6 +67,7 @@ od-help-address-radix = Sélectionner la base dans laquelle les décalages de fi
 od-help-skip-bytes = Ignorer les octets d'entrée avant le formatage et l'écriture.
 od-help-read-bytes = limiter le dump à OCTETS octets d'entrée
 od-help-endian = ordre des octets à utiliser pour les formats multi-octets
+od-help-strings = afficher les chaînes d'au moins OCTETS caractères graphiques. 3 est supposé quand OCTETS n'est pas spécifié.
 od-help-a = caractères nommés, ignorant le bit d'ordre supérieur
 od-help-b = octets octaux
 od-help-c = caractères ASCII ou échappements antislash
@@ -77,3 +78,17 @@ od-help-output-duplicates = ne pas utiliser * pour marquer la suppression de lig
 od-help-width = sortir OCTETS octets par ligne de sortie. 32 est impliqué quand OCTETS n'est pas
                 spécifié.
 od-help-traditional = mode de compatibilité avec une entrée, décalage et étiquette.
+od-help-o = unités octales 2-octets
+od-help-capital-i = unités décimales 8-octets
+od-help-capital-l = unités décimales 8-octets
+od-help-i = unités décimales 4-octets
+od-help-l = unités décimales 8-octets
+od-help-x = unités hexadécimales 2-octets
+od-help-h = unités hexadécimales 2-octets
+od-help-capital-o = unités octales 4-octets
+od-help-s = unités décimales 2-octets
+od-help-capital-x = unités hexadécimales 4-octets
+od-help-capital-h = unités hexadécimales 4-octets
+od-help-e = unités virgule flottante double précision (64-bits)
+od-help-f = unités virgule flottante double précision (32-bits)
+od-help-capital-f = unités virgule flottante double précision (64-bits)