Merge branch 'main' into patch-3

Author: oech3

.busybox-config

@@ -2,3 +2,8 @@ CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_UNICODE_SUPPORT=y
 CONFIG_DESKTOP=y
 CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_FEATURE_CATV=y
+CONFIG_FEATURE_CATN=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_READLINK_FOLLOW=y

.github/workflows/CICD.yml

@@ -502,14 +502,14 @@ jobs:
               --arg multisize "$SIZE_MULTI" \
               '{($date): { sha: $sha, size: $size, multisize: $multisize, }}' > size-result.json
     - name: Download the previous individual size result
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       with:
         workflow: CICD.yml
         name: individual-size-result
         repo: uutils/coreutils
         path: dl
     - name: Download the previous size result
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       with:
         workflow: CICD.yml
         name: size-result

.github/workflows/GnuTests.yml

@@ -91,6 +91,7 @@ jobs:
         sudo locale-gen --keep-existing fa_IR.UTF-8 # Iran
         sudo locale-gen --keep-existing am_ET.UTF-8 # Ethiopia
         sudo locale-gen --keep-existing th_TH.UTF-8 # Thailand
+        sudo locale-gen --keep-existing zh_CN.GB18030 # China
 
         sudo update-locale
         echo "After:"
@@ -343,7 +344,7 @@ jobs:
         path: 'uutils'
         persist-credentials: false
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v11
+      uses: dawidd6/action-download-artifact@v12
       # ref: <https://github.com/dawidd6/action-download-artifact>
       continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
       with:

.vscode/cspell.dictionaries/acronyms+names.wordlist.txt

@@ -3,6 +3,8 @@ aarch
 AIX
 ASLR # address space layout randomization
 AST # abstract syntax tree
+CATN # busybox cat -n feature flag
+CATV # busybox cat -v feature flag
 CICD # continuous integration/deployment
 CPU
 CPUs

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

@@ -1,4 +1,6 @@
 AFAICT
+asimd
+ASIMD
 alloc
 arity
 autogenerate
@@ -71,6 +73,7 @@ hardlink
 hardlinks
 hasher
 hashsums
+hwcaps
 infile
 iflag
 iflags
@@ -97,6 +100,7 @@ nocache
 nocreat
 noctty
 noerror
+noexec
 nofollow
 nolinks
 nonblock
@@ -149,6 +153,8 @@ tokenize
 toolchain
 totalram
 truthy
+tunables
+TUNABLES
 ucase
 unbuffered
 udeps

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

@@ -364,6 +364,22 @@ getcwd
 weblate
 algs
 
+# * stty terminal flags
+brkint
+cstopb
+decctlq
+echoctl
+echoe
+echoke
+ignbrk
+ignpar
+icrnl
+isig
+istrip
+litout
+opost
+parodd
+
 # translation tests
 CLICOLOR
 erreur

CONTRIBUTING.md

@@ -45,7 +45,8 @@ crates is as follows:
 - `Cargo.toml`
 - `src/main.rs`: contains only a single macro call
 - `src/<util name>.rs`: the actual code for the utility
-- `<util name>.md`: the documentation for the utility
+- `locales/en-US.ftl`: the util's strings
+- `locales/fr-FR.ftl`: French translation of the util's strings
 
 We have separated repositories for crates that we maintain but also publish for
 use by others:

Cargo.lock

@@ -667,7 +667,6 @@ should_panic_without_expect = "allow"        # 2
 doc_markdown = "allow"
 unused_self = "allow"
 enum_glob_use = "allow"
-needless_raw_string_hashes = "allow"
 unreadable_literal = "allow"
 unnested_or_patterns = "allow"
 implicit_hasher = "allow"

Cargo.toml

@@ -62,15 +62,15 @@ TOYBOX_SRC  := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
 
 #------------------------------------------------------------------------
 # Detect the host system.
-# On Windows the environment already sets  OS = Windows_NT.
+# 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)
+OS := $(shell uname -s)
 
 # Windows does not allow symlink by default.
 # Allow to override LN for AppArmor.
-ifeq ($(OS),Windows_NT)
+ifneq (,$(findstring _NT,$(OS)))
 	LN ?= ln -f
 endif
 LN ?= ln -sf
@@ -195,7 +195,7 @@ HASHSUM_PROGS := \
 
 $(info Detected OS = $(OS))
 
-ifneq ($(OS),Windows_NT)
+ifeq (,$(findstring MINGW,$(OS)))
 	PROGS += $(UNIX_PROGS)
 endif
 ifeq ($(SELINUX_ENABLED),1)
@@ -450,8 +450,12 @@ 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)))
+	$(INSTALL) -m 755 $(BUILDDIR)/deps/stdbuf.dll $(DESTDIR)$(LIBSTDBUF_DIR)/libstdbuf.dll
+else
 	$(INSTALL) -m 755 $(BUILDDIR)/deps/libstdbuf.* $(DESTDIR)$(LIBSTDBUF_DIR)/
 endif
+endif
 ifeq (${MULTICALL}, y)
 	$(INSTALL) -m 755 $(BUILDDIR)/coreutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)coreutils
 	$(foreach prog, $(filter-out coreutils, $(INSTALLEES)), \
@@ -472,7 +476,7 @@ else
 endif
 
 uninstall:
-ifneq ($(OS),Windows_NT)
+ifeq (,$(findstring MINGW,$(OS)))
 	rm -f $(DESTDIR)$(LIBSTDBUF_DIR)/libstdbuf.*
 	-rm -d $(DESTDIR)$(LIBSTDBUF_DIR) 2>/dev/null || true
 endif