Merge branch 'main' into multicall-gtest

Author: oech3

.github/workflows/GnuTests.yml

@@ -80,7 +80,7 @@ jobs:
       run: |
         ## Install dependencies
         sudo apt-get update
-        sudo apt-get install -y autoconf autopoint bison texinfo gperf gcc g++ gdb python3-pyinotify jq valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev libselinux1-dev attr quilt
+        sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev libselinux1-dev attr quilt
     - name: Add various locales
       shell: bash
       run: |
@@ -235,7 +235,7 @@ jobs:
     - name: Install dependencies in VM
       run: |
         lima sudo dnf -y update
-        lima sudo dnf -y install git autoconf autopoint bison texinfo gperf gcc g++ gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel texinfo-tex wget automake patch quilt
+        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 wget automake patch quilt
         lima rustup-init -y --default-toolchain stable
     - name: Copy the sources to VM
       run: |

.github/workflows/freebsd.yml

@@ -160,7 +160,6 @@ jobs:
           WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}"
           #
           pw adduser -n ${TEST_USER} -d /root/ -g wheel -c "Coreutils user to build" -w random
-          # chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
           chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
           whoami
           #

.github/workflows/openbsd.yml

@@ -147,6 +147,8 @@ jobs:
           useradd -m -G wheel ${TEST_USER}
           chown -R ${TEST_USER}:wheel /root/ "${WORKSPACE_PARENT}"/
           whoami
+          # Add fake host for reverse DNS lookup (needed for hostname test)
+          printf "10.0.2.15\topenbsd.my.domain openbsd\n" >> /etc/hosts
           #
           # Further work needs to be done in a sudo as we are changing users
           sudo -i -u ${TEST_USER} sh << EOF

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

@@ -120,6 +120,7 @@ pseudoprimes
 quantiles
 readonly
 reparse
+rposition
 seedable
 semver
 semiprime

Cargo.lock

@@ -21,6 +21,7 @@ path = "src/fold.rs"
 clap = { workspace = true }
 uucore = { workspace = true }
 fluent = { workspace = true }
+unicode-width = { workspace = true }
 
 [dev-dependencies]
 divan = { workspace = true }

src/uu/fold/Cargo.toml

@@ -2,6 +2,7 @@ fold-about = Writes each file (or standard input if no files are given)
   to standard output whilst breaking long lines
 fold-usage = fold [OPTION]... [FILE]...
 fold-bytes-help = count using bytes rather than columns (meaning control characters such as newline are not treated specially)
+fold-characters-help = count using character positions rather than display columns
 fold-spaces-help = break lines at word boundaries rather than a hard cut-off
 fold-width-help = set WIDTH as the maximum line width rather than 80
 fold-error-illegal-width = illegal width value

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

@@ -1,6 +1,7 @@
 fold-about = Écrit chaque fichier (ou l'entrée standard si aucun fichier n'est donné) sur la sortie standard en coupant les lignes trop longues
 fold-usage = fold [OPTION]... [FICHIER]...
 fold-bytes-help = compter en octets plutôt qu'en colonnes (les caractères de contrôle comme retour chariot ne sont pas traités spécialement)
+fold-characters-help = compter en caractères plutôt qu'en colonnes d'affichage
 fold-spaces-help = couper les lignes aux limites de mots plutôt qu'à une largeur fixe
 fold-width-help = définir WIDTH comme largeur de ligne maximale au lieu de 80
 fold-error-illegal-width = valeur de largeur illégale