diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 50f8a25b1..000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-env:
-  # Temporary workaround for error `error: sysinfo not supported on
-  # this platform` seen on FreeBSD platforms, affecting Rustup
-  #
-  # References: https://github.com/rust-lang/rustup/issues/2774
-  RUSTUP_IO_THREADS: 1
-
-task:
-  name: stable x86_64-unknown-freebsd-12
-  freebsd_instance:
-    image: freebsd-12-2-release-amd64
-  setup_script:
-    - pkg install -y curl gmake
-    - curl https://sh.rustup.rs -sSf --output rustup.sh
-    - sh rustup.sh -y --profile=minimal
-  build_script:
-    - . $HOME/.cargo/env
-    - cargo build
-  test_script:
-    - . $HOME/.cargo/env
-    - cargo test -p uucore -p coreutils
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index b2d77a5a4..0372336a7 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -13,8 +13,7 @@ env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.43.1" ## v1.43.0
-  RUST_COV_SRV: "2020-08-01" ## (~v1.47.0) supported rust version for code coverage; (date required/used by 'coverage') ## !maint: refactor when code coverage support is included in the stable channel
+  RUST_MIN_SRV: "1.47.0" ## MSRV v1.47.0
 
 on: [push, pull_request]
 
@@ -102,11 +101,17 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: ubuntu-latest  , features: feat_os_unix }
+          - { os: ubuntu-latest }
           - { os: macos-latest   , features: feat_os_macos }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v2
+    - name: Install/setup prerequisites
+      shell: bash
+      run: |
+        case '${{ matrix.job.os }}' in
+          macos-latest) brew install coreutils ;; # needed for show-utils.sh
+        esac
     - name: Initialize workflow variables
       id: vars
       shell: bash
@@ -115,9 +120,14 @@ jobs:
         outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
         # target-specific options
         # * CARGO_FEATURES_OPTION
-        CARGO_FEATURES_OPTION='' ;
-        if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features "${{ matrix.job.features }}"' ; fi
+        CARGO_FEATURES_OPTION='--all-features' ;
+        if [ -n "${{ matrix.job.features }}" ]; then CARGO_FEATURES_OPTION='--features ${{ matrix.job.features }}' ; fi
         outputs CARGO_FEATURES_OPTION
+        # * determine sub-crate utility list
+        UTILITY_LIST="$(./util/show-utils.sh ${CARGO_FEATURES_OPTION})"
+        echo UTILITY_LIST=${UTILITY_LIST}
+        CARGO_UTILITY_LIST_OPTIONS="$(for u in ${UTILITY_LIST}; do echo "-puu_${u}"; done;)"
+        outputs CARGO_UTILITY_LIST_OPTIONS
     - name: Install `rust` toolchain
       uses: actions-rs/toolchain@v1
       with:
@@ -130,7 +140,7 @@ jobs:
       run: |
         ## `clippy` lint testing
         # * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
-        S=$(cargo +nightly clippy --all-targets ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+${PWD//\//\\/}\/(.*):([0-9]+):([0-9]+).*$/::error file=\2,line=\3,col=\4::ERROR: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; exit 1 ; }
+        S=$(cargo +nightly clippy --all-targets ${{ steps.vars.outputs.CARGO_UTILITY_LIST_OPTIONS }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+${PWD//\//\\/}\/(.*):([0-9]+):([0-9]+).*$/::error file=\2,line=\3,col=\4::ERROR: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; exit 1 ; }
 
   code_spellcheck:
     name: Style/spelling
@@ -249,6 +259,8 @@ jobs:
           # { os, target, cargo-options, features, use-cross, toolchain }
           - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross }
           - { os: ubuntu-latest  , target: aarch64-unknown-linux-gnu   , features: feat_os_unix_gnueabihf , use-cross: use-cross }
+          - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_os_unix           , use-cross: use-cross }
+          # - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_selinux           , use-cross: use-cross }
           # - { os: ubuntu-18.04   , target: i586-unknown-linux-gnu      , features: feat_os_unix           , use-cross: use-cross } ## note: older windows platform; not required, dev-FYI only
           # - { os: ubuntu-18.04   , target: i586-unknown-linux-gnu      , features: feat_os_unix           , use-cross: use-cross } ## note: older windows platform; not required, dev-FYI only
           - { os: ubuntu-18.04   , target: i686-unknown-linux-gnu      , features: feat_os_unix           , use-cross: use-cross }
@@ -519,6 +531,52 @@ jobs:
         n_fails=$(echo "$output" | grep "^FAIL:\s" | wc --lines)
         if [ $n_fails -gt 0 ] ; then echo "::warning ::${n_fails}+ test failures" ; fi
 
+  test_freebsd:
+    runs-on: macos-10.15
+    name: Tests/FreeBSD test suite
+    env:
+      mem: 2048
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare, build and test
+      id: test
+      uses: vmactions/freebsd-vm@v0.1.5
+      with:
+        usesh: true
+        prepare: pkg install -y curl gmake sudo
+        run: |
+          # Need to be run in the same block. Otherwise, we are back on the mac host.
+          set -e
+          pw adduser -n cuuser -d /root/ -g wheel -c "Coreutils user to build" -w random
+          chown -R cuuser:wheel /root/ /Users/runner/work/coreutils/
+          whoami
+
+          # Needs to be done in a sudo as we are changing users
+          sudo -i -u cuuser sh << EOF
+          set -e
+          whoami
+          curl https://sh.rustup.rs -sSf --output rustup.sh
+          sh rustup.sh -y --profile=minimal
+          ## Info
+          # environment
+          echo "## environment"
+          echo "CI='${CI}'"
+          # tooling info display
+          echo "## tooling"
+          . $HOME/.cargo/env
+          cargo -V
+          rustc -V
+          env
+
+          # where the files are resynced
+          cd /Users/runner/work/coreutils/coreutils/
+          cargo build
+          cargo test --features feat_os_unix -p uucore -p coreutils
+          # Clean to avoid to rsync back the files
+          cargo clean
+          EOF
+
+
   coverage:
     name: Code Coverage
     runs-on: ${{ matrix.job.os }}
@@ -548,7 +606,7 @@ jobs:
         ## VARs setup
         outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
         # toolchain
-        TOOLCHAIN="nightly-${{ env.RUST_COV_SRV }}" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
+        TOOLCHAIN="nightly" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
         # * specify gnu-type TOOLCHAIN for windows; `grcov` requires gnu-style code coverage data files
         case ${{ matrix.job.os }} in windows-*) TOOLCHAIN="$TOOLCHAIN-x86_64-pc-windows-gnu" ;; esac;
         # * use requested TOOLCHAIN if specified
@@ -650,3 +708,35 @@ jobs:
         flags: ${{ steps.vars.outputs.CODECOV_FLAGS }}
         name: codecov-umbrella
         fail_ci_if_error: false
+
+  unused_deps:
+    name: Unused deps
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - { os: ubuntu-latest , features: feat_os_unix }
+          - { os: macos-latest   , features: feat_os_macos }
+          - { os: windows-latest , features: feat_os_windows }
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install `rust` toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        default: true
+        profile: minimal
+    - name: Install `cargo-udeps`
+      uses: actions-rs/install@v0.1
+      with:
+        crate: cargo-udeps
+        version: latest
+        use-tool-cache: true
+      env:
+        RUSTUP_TOOLCHAIN: stable
+    - name: Confirms there isn't any unused deps
+      shell: bash
+      run: |
+        cargo +nightly udeps --all-targets &> udeps.log || cat udeps.log
+        grep "seem to have been used" udeps.log
diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml
index 8bf6c091b..dad53f20c 100644
--- a/.github/workflows/GnuTests.yml
+++ b/.github/workflows/GnuTests.yml
@@ -90,3 +90,42 @@ jobs:
       with:
         name: gnu-result
         path: gnu-result.json
+    - name: Download the result
+      uses: dawidd6/action-download-artifact@v2
+      with:
+        workflow: GnuTests.yml
+        name: gnu-result
+        repo: uutils/coreutils
+        branch: master
+        path: dl
+    - name: Download the log
+      uses: dawidd6/action-download-artifact@v2
+      with:
+        workflow: GnuTests.yml
+        name: test-report
+        repo: uutils/coreutils
+        branch: master
+        path: dl
+    - name: Compare failing tests against master
+      shell: bash
+      run: |
+            OLD_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" dl/test-suite.log | sort)
+            NEW_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" gnu/tests/test-suite.log | sort)
+            for LINE in $OLD_FAILING
+            do
+              if ! grep -Fxq $LINE<<<"$NEW_FAILING"; then
+                echo "::warning ::Congrats! The gnu test $LINE is now passing!"
+              fi
+            done
+            for LINE in $NEW_FAILING
+            do
+              if ! grep -Fxq $LINE<<<"$OLD_FAILING"
+              then
+                echo "::error ::GNU test failed: $LINE. $LINE is passing on 'master'. Maybe you have to rebase?"
+              fi
+            done
+    - name: Compare against master results
+      shell: bash
+      run: |
+        mv dl/gnu-result.json master-gnu-result.json
+        python uutils/util/compare_gnu_result.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e3ad98ee3..f90466bed 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
     -   id: rust-clippy
         name: Rust clippy
         description: Run cargo clippy on files included in the commit.
-        entry: cargo +nightly clippy --all-targets --all-features --
+        entry: cargo +nightly clippy --workspace --all-targets --all-features --
         pass_filenames: false
         types: [file, rust]
         language: system
diff --git a/.vscode/cSpell.json b/.vscode/cSpell.json
index 9869923a4..498360139 100644
--- a/.vscode/cSpell.json
+++ b/.vscode/cSpell.json
@@ -11,7 +11,7 @@
     { "name": "workspace", "path": "./cspell.dictionaries/workspace.wordlist.txt" }
   ],
   // ignorePaths -  a list of globs to specify which files are to be ignored
-  "ignorePaths": ["Cargo.lock", "target/**", "tests/**/fixtures/**"],
+  "ignorePaths": ["Cargo.lock", "target/**", "tests/**/fixtures/**", "src/uu/dd/test-resources/**"],
   // ignoreWords - a list of words to be ignored (even if they are in the flagWords)
   "ignoreWords": [],
   // words - list of words to be always considered correct
diff --git a/.vscode/cspell.dictionaries/jargon.wordlist.txt b/.vscode/cspell.dictionaries/jargon.wordlist.txt
index c2e2c29f3..9b1d0a8da 100644
--- a/.vscode/cspell.dictionaries/jargon.wordlist.txt
+++ b/.vscode/cspell.dictionaries/jargon.wordlist.txt
@@ -1,3 +1,4 @@
+AFAICT
 arity
 autogenerate
 autogenerated
@@ -8,10 +9,13 @@ bytewise
 canonicalization
 canonicalize
 canonicalizing
+codepoint
+codepoints
 colorizable
 colorize
 coprime
 consts
+conv
 cyclomatic
 dedup
 deduplication
@@ -23,6 +27,7 @@ dev
 devs
 discoverability
 duplicative
+dsync
 enqueue
 errored
 executable
@@ -30,17 +35,30 @@ executables
 exponentiate
 eval
 falsey
+fileio
 flamegraph
+fullblock
+getfacl
+gibi
 gibibytes
 glob
 globbing
+hardcode
+hardcoded
+hardcoding
 hardfloat
 hardlink
 hardlinks
 hasher
 hashsums
+infile
+iflag
+iflags
 kibi
 kibibytes
+libacl
+lcase
+lossily
 mebi
 mebibytes
 mergeable
@@ -49,8 +67,21 @@ microbenchmarks
 microbenchmarking
 multibyte
 multicall
+noatime
+nocache
+nocreat
+noctty
+noerror
+nofollow
+nolinks
+nonblock
 nonportable
 nonprinting
+notrunc
+noxfer
+ofile
+oflag
+oflags
 peekable
 performant
 precompiled
@@ -68,11 +99,15 @@ seedable
 semver
 semiprime
 semiprimes
+setfacl
 shortcode
 shortcodes
+siginfo
+sigusr
 subcommand
 subexpression
 submodule
+sync
 symlink
 symlinks
 syscall
@@ -80,12 +115,15 @@ syscalls
 tokenize
 toolchain
 truthy
+ucase
 unbuffered
+udeps
 unescape
 unintuitive
 unprefixed
 unportable
 unsync
+urand
 whitespace
 wordlist
 wordlists
diff --git a/.vscode/cspell.dictionaries/people.wordlist.txt b/.vscode/cspell.dictionaries/people.wordlist.txt
index d7665585b..405733836 100644
--- a/.vscode/cspell.dictionaries/people.wordlist.txt
+++ b/.vscode/cspell.dictionaries/people.wordlist.txt
@@ -151,6 +151,9 @@ Sylvestre Ledru
 T Jameson Little
     Jameson
     Little
+Thomas Queiroz
+    Thomas
+    Queiroz
 Tobias Bohumir Schottdorf
     Tobias
     Bohumir
diff --git a/.vscode/cspell.dictionaries/shell.wordlist.txt b/.vscode/cspell.dictionaries/shell.wordlist.txt
index d8f297d21..4ed281efb 100644
--- a/.vscode/cspell.dictionaries/shell.wordlist.txt
+++ b/.vscode/cspell.dictionaries/shell.wordlist.txt
@@ -8,6 +8,7 @@ csh
 globstar
 inotify
 localtime
+mksh
 mountinfo
 mountpoint
 mtab
@@ -63,6 +64,7 @@ abspath
 addprefix
 addsuffix
 endef
+findstring
 firstword
 ifeq
 ifneq
@@ -89,5 +91,10 @@ markdownlint
 rerast
 rollup
 sed
+selinuxenabled
+sestatus
 wslpath
 xargs
+
+# * directories
+sbin
diff --git a/.vscode/cspell.dictionaries/workspace.wordlist.txt b/.vscode/cspell.dictionaries/workspace.wordlist.txt
index 7242199a5..d37a59465 100644
--- a/.vscode/cspell.dictionaries/workspace.wordlist.txt
+++ b/.vscode/cspell.dictionaries/workspace.wordlist.txt
@@ -9,12 +9,14 @@ aho-corasick
 backtrace
 blake2b_simd
 bstr
+bytecount
 byteorder
 chacha
 chrono
 conv
 corasick
 crossterm
+exacl
 filetime
 formatteriteminfo
 fsext
@@ -66,8 +68,10 @@ structs
 substr
 splitn
 trunc
+uninit
 
 # * uutils
+basenc
 chcon
 chgrp
 chmod
@@ -105,11 +109,18 @@ whoami
 
 # * vars/errno
 errno
+EACCES
+EBADF
+EBUSY
 EEXIST
+EINVAL
+ENODATA
 ENOENT
 ENOSYS
-EPERM
+ENOTEMPTY
 EOPNOTSUPP
+EPERM
+EROFS
 
 # * vars/fcntl
 F_GETFL
@@ -118,7 +129,9 @@ fcntl
 vmsplice
 
 # * vars/libc
+COMFOLLOW
 FILENO
+FTSENT
 HOSTSIZE
 IDSIZE
 IFBLK
@@ -151,12 +164,14 @@ SIGTERM
 SYS_fdatasync
 SYS_syncfs
 USERSIZE
+accpath
 addrinfo
 addrlen
 blocksize
 canonname
 chroot
 dlsym
+execvp
 fdatasync
 freeaddrinfo
 getaddrinfo
@@ -174,15 +189,18 @@ inode
 inodes
 isatty
 lchown
+pathlen
 setgid
 setgroups
 settime
 setuid
 socktype
 statfs
+statp
 statvfs
 strcmp
 strerror
+strlen
 syncfs
 umask
 waitpid
@@ -260,6 +278,7 @@ ULONG
 ULONGLONG
 UNLEN
 WCHAR
+WSADATA
 errhandlingapi
 fileapi
 handleapi
@@ -274,6 +293,13 @@ winerror
 winnt
 winsock
 
+# * vars/selinux
+freecon
+getfilecon
+lgetfilecon
+lsetfilecon
+setfilecon
+
 # * vars/uucore
 optflag
 optflagmulti
@@ -298,3 +324,6 @@ uucore_procs
 uumain
 uutil
 uutils
+
+# * function names
+getcwd
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 7a73a41bf..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 05334055f..4a40fd883 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,12 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 
+[[package]]
+name = "ahash"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -17,6 +23,12 @@ dependencies = [
  "memchr 2.4.0",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -73,6 +85,29 @@ dependencies = [
  "compare",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "clap",
+ "env_logger 0.8.4",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote 1.0.9",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "which",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.5.2"
@@ -90,9 +125,21 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitvec"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
 
 [[package]]
 name = "blake2b_simd"
@@ -132,6 +179,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 
+[[package]]
+name = "byte-unit"
+version = "4.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063197e6eb4b775b64160dedde7a0986bb2836cce140e9492e9e96f28e18bcd8"
+dependencies = [
+ "utf8-width",
+]
+
+[[package]]
+name = "bytecount"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -140,9 +202,18 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+
+[[package]]
+name = "cexpr"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89"
+dependencies = [
+ "nom",
+]
 
 [[package]]
 name = "cfg-if"
@@ -169,6 +240,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "clang-sys"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clap"
 version = "2.33.3"
@@ -180,7 +262,7 @@ dependencies = [
  "bitflags",
  "strsim",
  "term_size",
- "textwrap",
+ "textwrap 0.11.0",
  "unicode-width",
  "vec_map",
 ]
@@ -217,14 +299,14 @@ dependencies = [
 
 [[package]]
 name = "coreutils"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "chrono",
  "clap",
  "conv",
  "filetime",
- "glob 0.3.0",
+ "glob",
  "lazy_static",
  "libc",
  "nix 0.20.0",
@@ -232,9 +314,10 @@ dependencies = [
  "rand 0.7.3",
  "regex",
  "rlimit",
+ "selinux",
  "sha1",
  "tempfile",
- "textwrap",
+ "textwrap 0.14.2",
  "time",
  "unindent",
  "unix_socket",
@@ -243,7 +326,9 @@ dependencies = [
  "uu_base32",
  "uu_base64",
  "uu_basename",
+ "uu_basenc",
  "uu_cat",
+ "uu_chcon",
  "uu_chgrp",
  "uu_chmod",
  "uu_chown",
@@ -254,6 +339,7 @@ dependencies = [
  "uu_csplit",
  "uu_cut",
  "uu_date",
+ "uu_dd",
  "uu_df",
  "uu_dircolors",
  "uu_dirname",
@@ -304,6 +390,7 @@ dependencies = [
  "uu_relpath",
  "uu_rm",
  "uu_rmdir",
+ "uu_runcon",
  "uu_seq",
  "uu_shred",
  "uu_shuf",
@@ -454,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
@@ -521,6 +608,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "ctrlc"
+version = "3.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "232295399409a8b7ae41276757b5a1cc21032848d42bff2352261f958b3ca29a"
+dependencies = [
+ "nix 0.20.0",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "custom_derive"
 version = "0.1.7"
@@ -529,9 +626,40 @@ checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9"
 
 [[package]]
 name = "data-encoding"
-version = "2.1.2"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97"
+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
+
+[[package]]
+name = "data-encoding-macro"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+dependencies = [
+ "data-encoding",
+ "data-encoding-macro-internal",
+]
+
+[[package]]
+name = "data-encoding-macro-internal"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+dependencies = [
+ "data-encoding",
+ "syn",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.9",
+ "syn",
+]
 
 [[package]]
 name = "diff"
@@ -541,13 +669,22 @@ checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
 [[package]]
 name = "digest"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a"
+checksum = "ecae1c064e29fcabb6c2e9939e53dc7da72ed90234ae36ebfe03a478742efbd1"
 dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "dlv-list"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
+dependencies = [
+ "rand 0.8.4",
+]
+
 [[package]]
 name = "dns-lookup"
 version = "1.0.5"
@@ -582,6 +719,34 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "exacl"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "769bbd173781e84865b957cf83449f0d2869f4c9d2f191cbbffffb3d9751ba2b"
+dependencies = [
+ "bitflags",
+ "log",
+ "nix 0.21.0",
+ "num_enum",
+ "scopeguard",
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -596,13 +761,13 @@ checksum = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5"
 
 [[package]]
 name = "filetime"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
+checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.2.9",
+ "redox_syscall",
  "winapi 0.3.9",
 ]
 
@@ -618,12 +783,34 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
+[[package]]
+name = "fts-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31ec9f1580e270ee49a1fae7b102f54514142d9be2d4aa363c361363d65cac9"
+dependencies = [
+ "bindgen",
+ "libc",
+]
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "gcd"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c7cd301bf2ab11ae4e5bdfd79c221d97a25e46c089144a62ee9d09cb32d2b92"
+
 [[package]]
 name = "generic-array"
 version = "0.8.4"
@@ -665,12 +852,6 @@ dependencies = [
  "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "glob"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-
 [[package]]
 name = "glob"
 version = "0.3.0"
@@ -696,6 +877,15 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
 
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -731,6 +921,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "if_rust_version"
 version = "1.0.0"
@@ -748,9 +944,9 @@ dependencies = [
 
 [[package]]
 name = "ioctl-sys"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e2c4b26352496eaaa8ca7cfa9bd99e93419d3f7983dc6e99c2a35fe9e33504a"
+checksum = "1c429fffa658f288669529fc26565f728489a2e39bc7b24a428aaaf51355182e"
 
 [[package]]
 name = "itertools"
@@ -787,18 +983,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
-name = "libc"
-version = "0.2.85"
+name = "lazycell"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
-name = "locale"
-version = "0.2.2"
+name = "libc"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdbe492a9c0238da900a1165c42fc5067161ce292678a6fe80921f30fe307fd"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
+
+[[package]]
+name = "libloading"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
 dependencies = [
- "libc",
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -861,6 +1064,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
 
+[[package]]
+name = "memmap2"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.6.4"
@@ -894,15 +1106,14 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.13.1"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b"
+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "libc",
- "void",
 ]
 
 [[package]]
@@ -917,12 +1128,37 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3728fec49d363a50a8828a190b379a446cc5cf085c06259bbbeb34447e4ec7"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
+[[package]]
+name = "nom"
+version = "6.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
+dependencies = [
+ "bitvec",
+ "funty",
+ "memchr 2.4.0",
+ "version_check",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.3.6"
@@ -934,9 +1170,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512"
+checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -972,6 +1208,28 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f"
+dependencies = [
+ "derivative",
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote 1.0.9",
+ "syn",
+]
+
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -1013,20 +1271,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "ouroboros"
-version = "0.9.5"
+name = "ordered-multimap"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeff60e3e37407a80ead3e9458145b456e978c4068cddbfea6afb48572962ca"
+checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
 dependencies = [
+ "dlv-list",
+ "hashbrown",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84236d64f1718c387232287cf036eb6632a5ecff226f4ff9dccb8c2b79ba0bde"
+dependencies = [
+ "aliasable",
  "ouroboros_macro",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "ouroboros_macro"
-version = "0.9.5"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03f2cb802b5bdfdf52f1ffa0b54ce105e4d346e91990dd571f86c91321ad49e2"
+checksum = "f463857a6eb96c0136b1d56e56c718350cef30412ec065b48294799a088bca68"
 dependencies = [
  "Inflector",
  "proc-macro-error",
@@ -1064,7 +1333,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.9",
+ "redox_syscall",
  "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
@@ -1088,6 +1357,12 @@ dependencies = [
  "proc-macro-hack",
 ]
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.19"
@@ -1122,6 +1397,16 @@ dependencies = [
  "output_vt100",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+dependencies = [
+ "thiserror",
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1154,9 +1439,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
 dependencies = [
  "unicode-xid 0.2.2",
 ]
@@ -1179,7 +1464,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
 dependencies = [
- "env_logger",
+ "env_logger 0.7.1",
  "log",
  "rand 0.7.3",
  "rand_core 0.5.1",
@@ -1200,6 +1485,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
+
 [[package]]
 name = "rand"
 version = "0.5.6"
@@ -1346,15 +1637,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
  "bitflags",
 ]
@@ -1365,9 +1650,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
 dependencies = [
- "redox_syscall 0.2.9",
+ "redox_syscall",
 ]
 
+[[package]]
+name = "reference-counted-singleton"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef445213a92fdddc4bc69d9111156d20ffd50704a86ad82b372aab701a0d3a9a"
+
 [[package]]
 name = "regex"
 version = "1.5.4"
@@ -1418,9 +1709,19 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.13.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ordered-multimap",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "same-file"
@@ -1437,6 +1738,52 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "selinux"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cf704a543fe60d898f3253f1cc37655d0f0e9cdb68ef6230557e0e031b80608"
+dependencies = [
+ "bitflags",
+ "libc",
+ "once_cell",
+ "reference-counted-singleton",
+ "selinux-sys",
+ "thiserror",
+]
+
+[[package]]
+name = "selinux-sys"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d842d177120716580c4c6cb56dfe3c5f3a3e3dcec635091f1b2034b6c0be4c6"
+dependencies = [
+ "bindgen",
+ "cc",
+ "dunce",
+ "walkdir",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.130"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.9",
+ "syn",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -1468,6 +1815,12 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.9"
@@ -1513,6 +1866,12 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
+[[package]]
+name = "smawk"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
+
 [[package]]
 name = "socket2"
 version = "0.3.19"
@@ -1538,15 +1897,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "strum"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
+checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
 
 [[package]]
 name = "strum_macros"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
+checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1556,15 +1915,21 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote 1.0.9",
  "unicode-xid 0.2.2",
 ]
 
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
 [[package]]
 name = "tempfile"
 version = "3.2.0"
@@ -1574,7 +1939,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.4",
- "redox_syscall 0.2.9",
+ "redox_syscall",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -1598,6 +1963,25 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
+dependencies = [
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "termion"
 version = "1.5.6"
@@ -1606,7 +1990,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
 dependencies = [
  "libc",
  "numtoa",
- "redox_syscall 0.2.9",
+ "redox_syscall",
  "redox_termios",
 ]
 
@@ -1633,6 +2017,18 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+dependencies = [
+ "smawk",
+ "terminal_size",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.26"
@@ -1663,12 +2059,30 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "typenum"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f"
+dependencies = [
+ "regex",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.8.0"
@@ -1719,9 +2133,21 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8-width"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b"
+
 [[package]]
 name = "uu_arch"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "platform-info",
@@ -1731,7 +2157,7 @@ dependencies = [
 
 [[package]]
 name = "uu_base32"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -1740,7 +2166,7 @@ dependencies = [
 
 [[package]]
 name = "uu_base64"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uu_base32",
@@ -1750,16 +2176,26 @@ dependencies = [
 
 [[package]]
 name = "uu_basename"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
  "uucore_procs",
 ]
 
+[[package]]
+name = "uu_basenc"
+version = "0.0.8"
+dependencies = [
+ "clap",
+ "uu_base32",
+ "uucore",
+ "uucore_procs",
+]
+
 [[package]]
 name = "uu_cat"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "clap",
@@ -1768,21 +2204,34 @@ dependencies = [
  "unix_socket",
  "uucore",
  "uucore_procs",
+ "winapi-util",
+]
+
+[[package]]
+name = "uu_chcon"
+version = "0.0.8"
+dependencies = [
+ "clap",
+ "fts-sys",
+ "libc",
+ "selinux",
+ "thiserror",
+ "uucore",
+ "uucore_procs",
 ]
 
 [[package]]
 name = "uu_chgrp"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
  "uucore_procs",
- "walkdir",
 ]
 
 [[package]]
 name = "uu_chmod"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1793,18 +2242,16 @@ dependencies = [
 
 [[package]]
 name = "uu_chown"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
- "glob 0.3.0",
  "uucore",
  "uucore_procs",
- "walkdir",
 ]
 
 [[package]]
 name = "uu_chroot"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -1813,7 +2260,7 @@ dependencies = [
 
 [[package]]
 name = "uu_cksum"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1823,7 +2270,7 @@ dependencies = [
 
 [[package]]
 name = "uu_comm"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1833,13 +2280,15 @@ dependencies = [
 
 [[package]]
 name = "uu_cp"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "exacl",
  "filetime",
  "ioctl-sys",
  "libc",
  "quick-error 1.2.3",
+ "selinux",
  "uucore",
  "uucore_procs",
  "walkdir",
@@ -1849,10 +2298,9 @@ dependencies = [
 
 [[package]]
 name = "uu_csplit"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
- "glob 0.2.11",
  "regex",
  "thiserror",
  "uucore",
@@ -1861,7 +2309,7 @@ dependencies = [
 
 [[package]]
 name = "uu_cut"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "bstr",
@@ -1873,7 +2321,7 @@ dependencies = [
 
 [[package]]
 name = "uu_date"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "chrono",
  "clap",
@@ -1883,9 +2331,23 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "uu_dd"
+version = "0.0.8"
+dependencies = [
+ "byte-unit",
+ "clap",
+ "gcd",
+ "libc",
+ "signal-hook",
+ "tempfile",
+ "uucore",
+ "uucore_procs",
+]
+
 [[package]]
 name = "uu_df"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "number_prefix",
@@ -1895,17 +2357,17 @@ dependencies = [
 
 [[package]]
 name = "uu_dircolors"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
- "glob 0.3.0",
+ "glob",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_dirname"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1915,7 +2377,7 @@ dependencies = [
 
 [[package]]
 name = "uu_du"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "chrono",
  "clap",
@@ -1926,7 +2388,7 @@ dependencies = [
 
 [[package]]
 name = "uu_echo"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -1935,7 +2397,7 @@ dependencies = [
 
 [[package]]
 name = "uu_env"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1946,7 +2408,7 @@ dependencies = [
 
 [[package]]
 name = "uu_expand"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "unicode-width",
@@ -1956,7 +2418,7 @@ dependencies = [
 
 [[package]]
 name = "uu_expr"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -1969,7 +2431,7 @@ dependencies = [
 
 [[package]]
 name = "uu_factor"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "coz",
@@ -1984,7 +2446,7 @@ dependencies = [
 
 [[package]]
 name = "uu_false"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -1993,7 +2455,7 @@ dependencies = [
 
 [[package]]
 name = "uu_fmt"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2004,7 +2466,7 @@ dependencies = [
 
 [[package]]
 name = "uu_fold"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2013,7 +2475,7 @@ dependencies = [
 
 [[package]]
 name = "uu_groups"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2022,7 +2484,7 @@ dependencies = [
 
 [[package]]
 name = "uu_hashsum"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "blake2b_simd",
  "clap",
@@ -2030,6 +2492,7 @@ dependencies = [
  "hex",
  "libc",
  "md5",
+ "memchr 2.4.0",
  "regex",
  "regex-syntax",
  "sha1",
@@ -2041,16 +2504,17 @@ dependencies = [
 
 [[package]]
 name = "uu_head"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "memchr 2.4.0",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_hostid"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2060,7 +2524,7 @@ dependencies = [
 
 [[package]]
 name = "uu_hostname"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "hostname",
@@ -2072,16 +2536,17 @@ dependencies = [
 
 [[package]]
 name = "uu_id"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "selinux",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_install"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "file_diff",
@@ -2094,7 +2559,7 @@ dependencies = [
 
 [[package]]
 name = "uu_join"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2103,7 +2568,7 @@ dependencies = [
 
 [[package]]
 name = "uu_kill"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2113,7 +2578,7 @@ dependencies = [
 
 [[package]]
 name = "uu_link"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2123,7 +2588,7 @@ dependencies = [
 
 [[package]]
 name = "uu_ln"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2133,7 +2598,7 @@ dependencies = [
 
 [[package]]
 name = "uu_logname"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2143,17 +2608,17 @@ dependencies = [
 
 [[package]]
 name = "uu_ls"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "chrono",
  "clap",
  "globset",
  "lazy_static",
- "locale",
  "lscolors",
  "number_prefix",
  "once_cell",
+ "selinux",
  "term_grid",
  "termsize",
  "unicode-width",
@@ -2163,7 +2628,7 @@ dependencies = [
 
 [[package]]
 name = "uu_mkdir"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2173,7 +2638,7 @@ dependencies = [
 
 [[package]]
 name = "uu_mkfifo"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2183,7 +2648,7 @@ dependencies = [
 
 [[package]]
 name = "uu_mknod"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2193,7 +2658,7 @@ dependencies = [
 
 [[package]]
 name = "uu_mktemp"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "rand 0.5.6",
@@ -2204,13 +2669,13 @@ dependencies = [
 
 [[package]]
 name = "uu_more"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "clap",
  "crossterm",
- "nix 0.13.1",
- "redox_syscall 0.1.57",
+ "nix 0.19.1",
+ "redox_syscall",
  "redox_termios",
  "unicode-segmentation",
  "unicode-width",
@@ -2220,7 +2685,7 @@ dependencies = [
 
 [[package]]
 name = "uu_mv"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "fs_extra",
@@ -2230,18 +2695,18 @@ dependencies = [
 
 [[package]]
 name = "uu_nice"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "nix 0.13.1",
+ "nix 0.20.0",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_nl"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "aho-corasick",
  "clap",
@@ -2255,7 +2720,7 @@ dependencies = [
 
 [[package]]
 name = "uu_nohup"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "clap",
@@ -2266,7 +2731,7 @@ dependencies = [
 
 [[package]]
 name = "uu_nproc"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2277,7 +2742,7 @@ dependencies = [
 
 [[package]]
 name = "uu_numfmt"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2286,7 +2751,7 @@ dependencies = [
 
 [[package]]
 name = "uu_od"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "byteorder",
  "clap",
@@ -2298,7 +2763,7 @@ dependencies = [
 
 [[package]]
 name = "uu_paste"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2307,7 +2772,7 @@ dependencies = [
 
 [[package]]
 name = "uu_pathchk"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2317,7 +2782,7 @@ dependencies = [
 
 [[package]]
 name = "uu_pinky"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2326,7 +2791,7 @@ dependencies = [
 
 [[package]]
 name = "uu_pr"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "chrono",
  "clap",
@@ -2334,14 +2799,13 @@ dependencies = [
  "itertools 0.10.1",
  "quick-error 2.0.1",
  "regex",
- "time",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_printenv"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2350,7 +2814,7 @@ dependencies = [
 
 [[package]]
 name = "uu_printf"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "itertools 0.8.2",
@@ -2360,7 +2824,7 @@ dependencies = [
 
 [[package]]
 name = "uu_ptx"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "aho-corasick",
  "clap",
@@ -2374,7 +2838,7 @@ dependencies = [
 
 [[package]]
 name = "uu_pwd"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2383,7 +2847,7 @@ dependencies = [
 
 [[package]]
 name = "uu_readlink"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2393,7 +2857,7 @@ dependencies = [
 
 [[package]]
 name = "uu_realpath"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2402,7 +2866,7 @@ dependencies = [
 
 [[package]]
 name = "uu_relpath"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2411,7 +2875,7 @@ dependencies = [
 
 [[package]]
 name = "uu_rm"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "remove_dir_all",
@@ -2423,16 +2887,30 @@ dependencies = [
 
 [[package]]
 name = "uu_rmdir"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "libc",
+ "uucore",
+ "uucore_procs",
+]
+
+[[package]]
+name = "uu_runcon"
+version = "0.0.8"
+dependencies = [
+ "clap",
+ "fts-sys",
+ "libc",
+ "selinux",
+ "thiserror",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_seq"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "num-bigint",
@@ -2443,20 +2921,18 @@ dependencies = [
 
 [[package]]
 name = "uu_shred"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
- "filetime",
  "libc",
- "rand 0.5.6",
- "time",
+ "rand 0.7.3",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_shuf"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "rand 0.5.6",
@@ -2466,7 +2942,7 @@ dependencies = [
 
 [[package]]
 name = "uu_sleep"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2475,11 +2951,12 @@ dependencies = [
 
 [[package]]
 name = "uu_sort"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "binary-heap-plus",
  "clap",
  "compare",
+ "ctrlc",
  "fnv",
  "itertools 0.10.1",
  "memchr 2.4.0",
@@ -2494,7 +2971,7 @@ dependencies = [
 
 [[package]]
 name = "uu_split"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2503,7 +2980,7 @@ dependencies = [
 
 [[package]]
 name = "uu_stat"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2512,7 +2989,7 @@ dependencies = [
 
 [[package]]
 name = "uu_stdbuf"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "tempfile",
@@ -2523,7 +3000,7 @@ dependencies = [
 
 [[package]]
 name = "uu_stdbuf_libstdbuf"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "cpp",
  "cpp_build",
@@ -2534,7 +3011,7 @@ dependencies = [
 
 [[package]]
 name = "uu_sum"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2543,7 +3020,7 @@ dependencies = [
 
 [[package]]
 name = "uu_sync"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2554,20 +3031,24 @@ dependencies = [
 
 [[package]]
 name = "uu_tac"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "memchr 2.4.0",
+ "memmap2",
+ "regex",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_tail"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "redox_syscall 0.1.57",
+ "nix 0.20.0",
+ "redox_syscall",
  "uucore",
  "uucore_procs",
  "winapi 0.3.9",
@@ -2575,7 +3056,7 @@ dependencies = [
 
 [[package]]
 name = "uu_tee"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2586,18 +3067,18 @@ dependencies = [
 
 [[package]]
 name = "uu_test"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
- "redox_syscall 0.1.57",
+ "redox_syscall",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_timeout"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "libc",
@@ -2608,7 +3089,7 @@ dependencies = [
 
 [[package]]
 name = "uu_touch"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "filetime",
@@ -2619,7 +3100,7 @@ dependencies = [
 
 [[package]]
 name = "uu_tr"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "bit-set",
  "clap",
@@ -2630,7 +3111,7 @@ dependencies = [
 
 [[package]]
 name = "uu_true"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2639,7 +3120,7 @@ dependencies = [
 
 [[package]]
 name = "uu_truncate"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2648,7 +3129,7 @@ dependencies = [
 
 [[package]]
 name = "uu_tsort"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2657,7 +3138,7 @@ dependencies = [
 
 [[package]]
 name = "uu_tty"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "atty",
  "clap",
@@ -2668,7 +3149,7 @@ dependencies = [
 
 [[package]]
 name = "uu_uname"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "platform-info",
@@ -2678,7 +3159,7 @@ dependencies = [
 
 [[package]]
 name = "uu_unexpand"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "unicode-width",
@@ -2688,7 +3169,7 @@ dependencies = [
 
 [[package]]
 name = "uu_uniq"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "strum",
@@ -2699,17 +3180,16 @@ dependencies = [
 
 [[package]]
 name = "uu_unlink"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
- "libc",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_uptime"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "chrono",
  "clap",
@@ -2719,7 +3199,7 @@ dependencies = [
 
 [[package]]
 name = "uu_users"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2728,19 +3208,21 @@ dependencies = [
 
 [[package]]
 name = "uu_wc"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
+ "bytecount",
  "clap",
  "libc",
  "nix 0.20.0",
- "thiserror",
+ "unicode-width",
+ "utf-8",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uu_who"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
  "uucore",
@@ -2749,9 +3231,10 @@ dependencies = [
 
 [[package]]
 name = "uu_whoami"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "libc",
  "uucore",
  "uucore_procs",
  "winapi 0.3.9",
@@ -2759,42 +3242,52 @@ dependencies = [
 
 [[package]]
 name = "uu_yes"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "clap",
+ "nix 0.20.0",
  "uucore",
  "uucore_procs",
 ]
 
 [[package]]
 name = "uucore"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "clap",
  "data-encoding",
+ "data-encoding-macro",
  "dns-lookup",
  "dunce",
  "getopts",
  "lazy_static",
  "libc",
- "nix 0.13.1",
- "platform-info",
+ "nix 0.20.0",
+ "once_cell",
  "termion",
  "thiserror",
  "time",
+ "walkdir",
  "wild",
  "winapi 0.3.9",
+ "z85",
 ]
 
 [[package]]
 name = "uucore_procs"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "proc-macro2",
  "quote 1.0.9",
  "syn",
 ]
 
+[[package]]
+name = "uuid"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+
 [[package]]
 name = "vec_map"
 version = "0.8.2"
@@ -2807,12 +3300,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@@ -2836,13 +3323,22 @@ version = "0.10.2+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
+[[package]]
+name = "which"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "wild"
 version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020"
 dependencies = [
- "glob 0.3.0",
+ "glob",
 ]
 
 [[package]]
@@ -2888,6 +3384,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
 [[package]]
 name = "xattr"
 version = "0.2.2"
@@ -2896,3 +3398,9 @@ checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
 dependencies = [
  "libc",
 ]
+
+[[package]]
+name = "z85"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ac8b56e4f9906a4ef5412875e9ce448364023335cec645fd457ecf51d4f2781"
diff --git a/Cargo.toml b/Cargo.toml
index 46931b205..9ecea79c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,11 @@
 # coreutils (uutils)
 # * see the repository LICENSE, README, and CONTRIBUTING files for more information
 
+# spell-checker:ignore (libs) libselinux
+
 [package]
 name = "coreutils"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust"
@@ -33,6 +35,7 @@ feat_common_core = [
     "base32",
     "base64",
     "basename",
+    "basenc",
     "cat",
     "cksum",
     "comm",
@@ -43,6 +46,7 @@ feat_common_core = [
     "df",
     "dircolors",
     "dirname",
+    "dd",
     "du",
     "echo",
     "env",
@@ -91,8 +95,10 @@ feat_common_core = [
     "true",
     "truncate",
     "tsort",
+    "touch",
     "unexpand",
     "uniq",
+    "unlink",
     "wc",
     "yes",
 ]
@@ -138,6 +144,16 @@ feat_os_unix_musl = [
     #
     "feat_require_unix",
 ]
+# "feat_selinux" == set of utilities providing support for SELinux Security Context if enabled with `--features feat_selinux`.
+# NOTE:
+# The selinux(-sys) crate requires `libselinux` headers and shared library to be accessible in the C toolchain at compile time.
+# Running a uutils compiled with `feat_selinux` requires an SELinux enabled Kernel at run time.
+feat_selinux = ["cp/selinux", "id/selinux", "ls/selinux", "selinux", "feat_require_selinux"]
+# "feat_acl" == set of utilities providing support for acl (access control lists) if enabled with `--features feat_acl`.
+# NOTE:
+# On linux, the posix-acl/acl-sys crate requires `libacl` headers and shared library to be accessible in the C toolchain at compile time.
+# On FreeBSD and macOS this is not required.
+feat_acl = ["cp/feat_acl"]
 ## feature sets with requirements (restricting cross-platform availability)
 #
 # ** NOTE: these `feat_require_...` sets should be minimized as much as possible to encourage cross-platform availability of utilities
@@ -167,7 +183,6 @@ feat_require_unix = [
     "timeout",
     "tty",
     "uname",
-    "unlink",
 ]
 # "feat_require_unix_utmpx" == set of utilities requiring unix utmp/utmpx support
 # * ref: <https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?>
@@ -177,6 +192,11 @@ feat_require_unix_utmpx = [
     "users",
     "who",
 ]
+# "feat_require_selinux" == set of utilities depending on SELinux.
+feat_require_selinux = [
+    "chcon",
+    "runcon",
+]
 ## (alternate/newer/smaller platforms) feature sets
 # "feat_os_unix_fuchsia" == set of utilities which can be built/run on the "Fuchsia" OS (refs: <https://fuchsia.dev>; <https://en.wikipedia.org/wiki/Google_Fuchsia>)
 feat_os_unix_fuchsia = [
@@ -204,9 +224,8 @@ feat_os_unix_fuchsia = [
 feat_os_unix_redox = [
     "feat_common_core",
     #
-    "uname",
     "chmod",
-    "install",
+    "uname",
 ]
 # "feat_os_windows_legacy" == slightly restricted set of utilities which can be built/run on early windows platforms (eg, "WinXP")
 feat_os_windows_legacy = [
@@ -227,106 +246,111 @@ test = [ "uu_test" ]
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 lazy_static = { version="1.3" }
-textwrap = { version="=0.11.0", features=["term_size"] } # !maint: [2020-05-10; rivy] unstable crate using undocumented features; pinned currently, will review
-uucore = { version=">=0.0.9", package="uucore", path="src/uucore" }
+textwrap = { version="0.14", features=["terminal_size"] }
+uucore = { version=">=0.0.10", package="uucore", path="src/uucore" }
+selinux = { version="0.2.3", optional = true }
 # * uutils
-uu_test  = { optional=true, version="0.0.7", package="uu_test", path="src/uu/test" }
+uu_test  = { optional=true, version="0.0.8", package="uu_test", path="src/uu/test" }
 #
-arch     = { optional=true, version="0.0.7", package="uu_arch", path="src/uu/arch" }
-base32   = { optional=true, version="0.0.7", package="uu_base32", path="src/uu/base32" }
-base64   = { optional=true, version="0.0.7", package="uu_base64", path="src/uu/base64" }
-basename = { optional=true, version="0.0.7", package="uu_basename", path="src/uu/basename" }
-cat      = { optional=true, version="0.0.7", package="uu_cat", path="src/uu/cat" }
-chgrp    = { optional=true, version="0.0.7", package="uu_chgrp", path="src/uu/chgrp" }
-chmod    = { optional=true, version="0.0.7", package="uu_chmod", path="src/uu/chmod" }
-chown    = { optional=true, version="0.0.7", package="uu_chown", path="src/uu/chown" }
-chroot   = { optional=true, version="0.0.7", package="uu_chroot", path="src/uu/chroot" }
-cksum    = { optional=true, version="0.0.7", package="uu_cksum", path="src/uu/cksum" }
-comm     = { optional=true, version="0.0.7", package="uu_comm", path="src/uu/comm" }
-cp       = { optional=true, version="0.0.7", package="uu_cp", path="src/uu/cp" }
-csplit   = { optional=true, version="0.0.7", package="uu_csplit", path="src/uu/csplit" }
-cut      = { optional=true, version="0.0.7", package="uu_cut", path="src/uu/cut" }
-date     = { optional=true, version="0.0.7", package="uu_date", path="src/uu/date" }
-df       = { optional=true, version="0.0.7", package="uu_df", path="src/uu/df" }
-dircolors= { optional=true, version="0.0.7", package="uu_dircolors", path="src/uu/dircolors" }
-dirname  = { optional=true, version="0.0.7", package="uu_dirname", path="src/uu/dirname" }
-du       = { optional=true, version="0.0.7", package="uu_du", path="src/uu/du" }
-echo     = { optional=true, version="0.0.7", package="uu_echo", path="src/uu/echo" }
-env      = { optional=true, version="0.0.7", package="uu_env", path="src/uu/env" }
-expand   = { optional=true, version="0.0.7", package="uu_expand", path="src/uu/expand" }
-expr     = { optional=true, version="0.0.7", package="uu_expr", path="src/uu/expr" }
-factor   = { optional=true, version="0.0.7", package="uu_factor", path="src/uu/factor" }
-false    = { optional=true, version="0.0.7", package="uu_false", path="src/uu/false" }
-fmt      = { optional=true, version="0.0.7", package="uu_fmt", path="src/uu/fmt" }
-fold     = { optional=true, version="0.0.7", package="uu_fold", path="src/uu/fold" }
-groups   = { optional=true, version="0.0.7", package="uu_groups", path="src/uu/groups" }
-hashsum  = { optional=true, version="0.0.7", package="uu_hashsum", path="src/uu/hashsum" }
-head     = { optional=true, version="0.0.7", package="uu_head", path="src/uu/head" }
-hostid   = { optional=true, version="0.0.7", package="uu_hostid", path="src/uu/hostid" }
-hostname = { optional=true, version="0.0.7", package="uu_hostname", path="src/uu/hostname" }
-id       = { optional=true, version="0.0.7", package="uu_id", path="src/uu/id" }
-install  = { optional=true, version="0.0.7", package="uu_install", path="src/uu/install" }
-join     = { optional=true, version="0.0.7", package="uu_join", path="src/uu/join" }
-kill     = { optional=true, version="0.0.7", package="uu_kill", path="src/uu/kill" }
-link     = { optional=true, version="0.0.7", package="uu_link", path="src/uu/link" }
-ln       = { optional=true, version="0.0.7", package="uu_ln", path="src/uu/ln" }
-ls       = { optional=true, version="0.0.7", package="uu_ls", path="src/uu/ls" }
-logname  = { optional=true, version="0.0.7", package="uu_logname", path="src/uu/logname" }
-mkdir    = { optional=true, version="0.0.7", package="uu_mkdir", path="src/uu/mkdir" }
-mkfifo   = { optional=true, version="0.0.7", package="uu_mkfifo", path="src/uu/mkfifo" }
-mknod    = { optional=true, version="0.0.7", package="uu_mknod", path="src/uu/mknod" }
-mktemp   = { optional=true, version="0.0.7", package="uu_mktemp", path="src/uu/mktemp" }
-more     = { optional=true, version="0.0.7", package="uu_more", path="src/uu/more" }
-mv       = { optional=true, version="0.0.7", package="uu_mv", path="src/uu/mv" }
-nice     = { optional=true, version="0.0.7", package="uu_nice", path="src/uu/nice" }
-nl       = { optional=true, version="0.0.7", package="uu_nl", path="src/uu/nl" }
-nohup    = { optional=true, version="0.0.7", package="uu_nohup", path="src/uu/nohup" }
-nproc    = { optional=true, version="0.0.7", package="uu_nproc", path="src/uu/nproc" }
-numfmt   = { optional=true, version="0.0.7", package="uu_numfmt", path="src/uu/numfmt" }
-od       = { optional=true, version="0.0.7", package="uu_od", path="src/uu/od" }
-paste    = { optional=true, version="0.0.7", package="uu_paste", path="src/uu/paste" }
-pathchk  = { optional=true, version="0.0.7", package="uu_pathchk", path="src/uu/pathchk" }
-pinky    = { optional=true, version="0.0.7", package="uu_pinky", path="src/uu/pinky" }
-pr       = { optional=true, version="0.0.7", package="uu_pr", path="src/uu/pr" }
-printenv = { optional=true, version="0.0.7", package="uu_printenv", path="src/uu/printenv" }
-printf   = { optional=true, version="0.0.7", package="uu_printf", path="src/uu/printf" }
-ptx      = { optional=true, version="0.0.7", package="uu_ptx", path="src/uu/ptx" }
-pwd      = { optional=true, version="0.0.7", package="uu_pwd", path="src/uu/pwd" }
-readlink = { optional=true, version="0.0.7", package="uu_readlink", path="src/uu/readlink" }
-realpath = { optional=true, version="0.0.7", package="uu_realpath", path="src/uu/realpath" }
-relpath  = { optional=true, version="0.0.7", package="uu_relpath", path="src/uu/relpath" }
-rm       = { optional=true, version="0.0.7", package="uu_rm", path="src/uu/rm" }
-rmdir    = { optional=true, version="0.0.7", package="uu_rmdir", path="src/uu/rmdir" }
-seq      = { optional=true, version="0.0.7", package="uu_seq", path="src/uu/seq" }
-shred    = { optional=true, version="0.0.7", package="uu_shred", path="src/uu/shred" }
-shuf     = { optional=true, version="0.0.7", package="uu_shuf", path="src/uu/shuf" }
-sleep    = { optional=true, version="0.0.7", package="uu_sleep", path="src/uu/sleep" }
-sort     = { optional=true, version="0.0.7", package="uu_sort", path="src/uu/sort" }
-split    = { optional=true, version="0.0.7", package="uu_split", path="src/uu/split" }
-stat     = { optional=true, version="0.0.7", package="uu_stat", path="src/uu/stat" }
-stdbuf   = { optional=true, version="0.0.7", package="uu_stdbuf", path="src/uu/stdbuf" }
-sum      = { optional=true, version="0.0.7", package="uu_sum", path="src/uu/sum" }
-sync     = { optional=true, version="0.0.7", package="uu_sync", path="src/uu/sync" }
-tac      = { optional=true, version="0.0.7", package="uu_tac", path="src/uu/tac" }
-tail     = { optional=true, version="0.0.7", package="uu_tail", path="src/uu/tail" }
-tee      = { optional=true, version="0.0.7", package="uu_tee", path="src/uu/tee" }
-timeout  = { optional=true, version="0.0.7", package="uu_timeout", path="src/uu/timeout" }
-touch    = { optional=true, version="0.0.7", package="uu_touch", path="src/uu/touch" }
-tr       = { optional=true, version="0.0.7", package="uu_tr", path="src/uu/tr" }
-true     = { optional=true, version="0.0.7", package="uu_true", path="src/uu/true" }
-truncate = { optional=true, version="0.0.7", package="uu_truncate", path="src/uu/truncate" }
-tsort    = { optional=true, version="0.0.7", package="uu_tsort", path="src/uu/tsort" }
-tty      = { optional=true, version="0.0.7", package="uu_tty", path="src/uu/tty" }
-uname    = { optional=true, version="0.0.7", package="uu_uname", path="src/uu/uname" }
-unexpand = { optional=true, version="0.0.7", package="uu_unexpand", path="src/uu/unexpand" }
-uniq     = { optional=true, version="0.0.7", package="uu_uniq", path="src/uu/uniq" }
-unlink   = { optional=true, version="0.0.7", package="uu_unlink", path="src/uu/unlink" }
-uptime   = { optional=true, version="0.0.7", package="uu_uptime", path="src/uu/uptime" }
-users    = { optional=true, version="0.0.7", package="uu_users", path="src/uu/users" }
-wc       = { optional=true, version="0.0.7", package="uu_wc", path="src/uu/wc" }
-who      = { optional=true, version="0.0.7", package="uu_who", path="src/uu/who" }
-whoami   = { optional=true, version="0.0.7", package="uu_whoami", path="src/uu/whoami" }
-yes      = { optional=true, version="0.0.7", package="uu_yes", path="src/uu/yes" }
+arch     = { optional=true, version="0.0.8", package="uu_arch", path="src/uu/arch" }
+base32   = { optional=true, version="0.0.8", package="uu_base32", path="src/uu/base32" }
+base64   = { optional=true, version="0.0.8", package="uu_base64", path="src/uu/base64" }
+basename = { optional=true, version="0.0.8", package="uu_basename", path="src/uu/basename" }
+basenc   = { optional=true, version="0.0.8", package="uu_basenc", path="src/uu/basenc" }
+cat      = { optional=true, version="0.0.8", package="uu_cat", path="src/uu/cat" }
+chcon    = { optional=true, version="0.0.8", package="uu_chcon", path="src/uu/chcon" }
+chgrp    = { optional=true, version="0.0.8", package="uu_chgrp", path="src/uu/chgrp" }
+chmod    = { optional=true, version="0.0.8", package="uu_chmod", path="src/uu/chmod" }
+chown    = { optional=true, version="0.0.8", package="uu_chown", path="src/uu/chown" }
+chroot   = { optional=true, version="0.0.8", package="uu_chroot", path="src/uu/chroot" }
+cksum    = { optional=true, version="0.0.8", package="uu_cksum", path="src/uu/cksum" }
+comm     = { optional=true, version="0.0.8", package="uu_comm", path="src/uu/comm" }
+cp       = { optional=true, version="0.0.8", package="uu_cp", path="src/uu/cp" }
+csplit   = { optional=true, version="0.0.8", package="uu_csplit", path="src/uu/csplit" }
+cut      = { optional=true, version="0.0.8", package="uu_cut", path="src/uu/cut" }
+date     = { optional=true, version="0.0.8", package="uu_date", path="src/uu/date" }
+dd       = { optional=true, version="0.0.8", package="uu_dd", path="src/uu/dd" }
+df       = { optional=true, version="0.0.8", package="uu_df", path="src/uu/df" }
+dircolors= { optional=true, version="0.0.8", package="uu_dircolors", path="src/uu/dircolors" }
+dirname  = { optional=true, version="0.0.8", package="uu_dirname", path="src/uu/dirname" }
+du       = { optional=true, version="0.0.8", package="uu_du", path="src/uu/du" }
+echo     = { optional=true, version="0.0.8", package="uu_echo", path="src/uu/echo" }
+env      = { optional=true, version="0.0.8", package="uu_env", path="src/uu/env" }
+expand   = { optional=true, version="0.0.8", package="uu_expand", path="src/uu/expand" }
+expr     = { optional=true, version="0.0.8", package="uu_expr", path="src/uu/expr" }
+factor   = { optional=true, version="0.0.8", package="uu_factor", path="src/uu/factor" }
+false    = { optional=true, version="0.0.8", package="uu_false", path="src/uu/false" }
+fmt      = { optional=true, version="0.0.8", package="uu_fmt", path="src/uu/fmt" }
+fold     = { optional=true, version="0.0.8", package="uu_fold", path="src/uu/fold" }
+groups   = { optional=true, version="0.0.8", package="uu_groups", path="src/uu/groups" }
+hashsum  = { optional=true, version="0.0.8", package="uu_hashsum", path="src/uu/hashsum" }
+head     = { optional=true, version="0.0.8", package="uu_head", path="src/uu/head" }
+hostid   = { optional=true, version="0.0.8", package="uu_hostid", path="src/uu/hostid" }
+hostname = { optional=true, version="0.0.8", package="uu_hostname", path="src/uu/hostname" }
+id       = { optional=true, version="0.0.8", package="uu_id", path="src/uu/id" }
+install  = { optional=true, version="0.0.8", package="uu_install", path="src/uu/install" }
+join     = { optional=true, version="0.0.8", package="uu_join", path="src/uu/join" }
+kill     = { optional=true, version="0.0.8", package="uu_kill", path="src/uu/kill" }
+link     = { optional=true, version="0.0.8", package="uu_link", path="src/uu/link" }
+ln       = { optional=true, version="0.0.8", package="uu_ln", path="src/uu/ln" }
+ls       = { optional=true, version="0.0.8", package="uu_ls", path="src/uu/ls" }
+logname  = { optional=true, version="0.0.8", package="uu_logname", path="src/uu/logname" }
+mkdir    = { optional=true, version="0.0.8", package="uu_mkdir", path="src/uu/mkdir" }
+mkfifo   = { optional=true, version="0.0.8", package="uu_mkfifo", path="src/uu/mkfifo" }
+mknod    = { optional=true, version="0.0.8", package="uu_mknod", path="src/uu/mknod" }
+mktemp   = { optional=true, version="0.0.8", package="uu_mktemp", path="src/uu/mktemp" }
+more     = { optional=true, version="0.0.8", package="uu_more", path="src/uu/more" }
+mv       = { optional=true, version="0.0.8", package="uu_mv", path="src/uu/mv" }
+nice     = { optional=true, version="0.0.8", package="uu_nice", path="src/uu/nice" }
+nl       = { optional=true, version="0.0.8", package="uu_nl", path="src/uu/nl" }
+nohup    = { optional=true, version="0.0.8", package="uu_nohup", path="src/uu/nohup" }
+nproc    = { optional=true, version="0.0.8", package="uu_nproc", path="src/uu/nproc" }
+numfmt   = { optional=true, version="0.0.8", package="uu_numfmt", path="src/uu/numfmt" }
+od       = { optional=true, version="0.0.8", package="uu_od", path="src/uu/od" }
+paste    = { optional=true, version="0.0.8", package="uu_paste", path="src/uu/paste" }
+pathchk  = { optional=true, version="0.0.8", package="uu_pathchk", path="src/uu/pathchk" }
+pinky    = { optional=true, version="0.0.8", package="uu_pinky", path="src/uu/pinky" }
+pr       = { optional=true, version="0.0.8", package="uu_pr", path="src/uu/pr" }
+printenv = { optional=true, version="0.0.8", package="uu_printenv", path="src/uu/printenv" }
+printf   = { optional=true, version="0.0.8", package="uu_printf", path="src/uu/printf" }
+ptx      = { optional=true, version="0.0.8", package="uu_ptx", path="src/uu/ptx" }
+pwd      = { optional=true, version="0.0.8", package="uu_pwd", path="src/uu/pwd" }
+readlink = { optional=true, version="0.0.8", package="uu_readlink", path="src/uu/readlink" }
+realpath = { optional=true, version="0.0.8", package="uu_realpath", path="src/uu/realpath" }
+relpath  = { optional=true, version="0.0.8", package="uu_relpath", path="src/uu/relpath" }
+rm       = { optional=true, version="0.0.8", package="uu_rm", path="src/uu/rm" }
+rmdir    = { optional=true, version="0.0.8", package="uu_rmdir", path="src/uu/rmdir" }
+runcon   = { optional=true, version="0.0.8", package="uu_runcon", path="src/uu/runcon" }
+seq      = { optional=true, version="0.0.8", package="uu_seq", path="src/uu/seq" }
+shred    = { optional=true, version="0.0.8", package="uu_shred", path="src/uu/shred" }
+shuf     = { optional=true, version="0.0.8", package="uu_shuf", path="src/uu/shuf" }
+sleep    = { optional=true, version="0.0.8", package="uu_sleep", path="src/uu/sleep" }
+sort     = { optional=true, version="0.0.8", package="uu_sort", path="src/uu/sort" }
+split    = { optional=true, version="0.0.8", package="uu_split", path="src/uu/split" }
+stat     = { optional=true, version="0.0.8", package="uu_stat", path="src/uu/stat" }
+stdbuf   = { optional=true, version="0.0.8", package="uu_stdbuf", path="src/uu/stdbuf" }
+sum      = { optional=true, version="0.0.8", package="uu_sum", path="src/uu/sum" }
+sync     = { optional=true, version="0.0.8", package="uu_sync", path="src/uu/sync" }
+tac      = { optional=true, version="0.0.8", package="uu_tac", path="src/uu/tac" }
+tail     = { optional=true, version="0.0.8", package="uu_tail", path="src/uu/tail" }
+tee      = { optional=true, version="0.0.8", package="uu_tee", path="src/uu/tee" }
+timeout  = { optional=true, version="0.0.8", package="uu_timeout", path="src/uu/timeout" }
+touch    = { optional=true, version="0.0.8", package="uu_touch", path="src/uu/touch" }
+tr       = { optional=true, version="0.0.8", package="uu_tr", path="src/uu/tr" }
+true     = { optional=true, version="0.0.8", package="uu_true", path="src/uu/true" }
+truncate = { optional=true, version="0.0.8", package="uu_truncate", path="src/uu/truncate" }
+tsort    = { optional=true, version="0.0.8", package="uu_tsort", path="src/uu/tsort" }
+tty      = { optional=true, version="0.0.8", package="uu_tty", path="src/uu/tty" }
+uname    = { optional=true, version="0.0.8", package="uu_uname", path="src/uu/uname" }
+unexpand = { optional=true, version="0.0.8", package="uu_unexpand", path="src/uu/unexpand" }
+uniq     = { optional=true, version="0.0.8", package="uu_uniq", path="src/uu/uniq" }
+unlink   = { optional=true, version="0.0.8", package="uu_unlink", path="src/uu/unlink" }
+uptime   = { optional=true, version="0.0.8", package="uu_uptime", path="src/uu/uptime" }
+users    = { optional=true, version="0.0.8", package="uu_users", path="src/uu/users" }
+wc       = { optional=true, version="0.0.8", package="uu_wc", path="src/uu/wc" }
+who      = { optional=true, version="0.0.8", package="uu_who", path="src/uu/who" }
+whoami   = { optional=true, version="0.0.8", package="uu_whoami", path="src/uu/whoami" }
+yes      = { optional=true, version="0.0.8", package="uu_yes", path="src/uu/yes" }
 
 # this breaks clippy linting with: "tests/by-util/test_factor_benches.rs: No such file or directory (os error 2)"
 # factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" }
@@ -342,7 +366,6 @@ conv = "0.3"
 filetime = "0.2"
 glob = "0.3.0"
 libc = "0.2"
-nix = "0.20.0"
 pretty_assertions = "0.7.2"
 rand = "0.7"
 regex = "1.0"
@@ -350,12 +373,16 @@ sha1 = { version="0.6", features=["std"] }
 tempfile = "3.2.0"
 time = "0.1"
 unindent = "0.1"
-uucore = { version=">=0.0.9", package="uucore", path="src/uucore", features=["entries", "process"] }
+uucore = { version=">=0.0.10", package="uucore", path="src/uucore", features=["entries", "process"] }
 walkdir = "2.2"
 atty = "0.2"
 
-[target.'cfg(unix)'.dev-dependencies]
+[target.'cfg(target_os = "linux")'.dev-dependencies]
 rlimit = "0.4.0"
+
+[target.'cfg(unix)'.dev-dependencies]
+nix = "0.20.0"
+
 rust-users = { version="0.10", package="users" }
 unix_socket = "0.5.0"
 
diff --git a/DEVELOPER_INSTRUCTIONS.md b/DEVELOPER_INSTRUCTIONS.md
index e0a5cf001..027d4dca1 100644
--- a/DEVELOPER_INSTRUCTIONS.md
+++ b/DEVELOPER_INSTRUCTIONS.md
@@ -1,3 +1,29 @@
+Documentation
+-------------
+
+The source of the documentation is available on:
+
+https://uutils.github.io/coreutils-docs/coreutils/
+
+The documentation is updated everyday on this repository:
+
+https://github.com/uutils/coreutils-docs
+
+Running GNU tests
+-----------------
+
+<!-- spell-checker:ignore gnulib -->
+
+- Check out https://github.com/coreutils/coreutils next to your fork as gnu
+- Check out https://github.com/coreutils/gnulib next to your fork as gnulib
+- Rename the checkout of your fork to uutils
+
+At the end you should have uutils, gnu and gnulib checked out next to each other.
+
+- Run `cd uutils && ./util/build-gnu.sh && cd ..` to get everything ready (this may take a while)
+- Finally, you can run `tests with bash uutils/util/run-gnu-test.sh <test>`. Instead of `<test>` insert the test you want to run, e.g. `tests/misc/wc-proc`.
+
+
 Code Coverage Report Generation
 ---------------------------------
 
diff --git a/GNUmakefile b/GNUmakefile
index 996c568f3..367568ca8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -46,6 +46,15 @@ BUSYBOX_ROOT := $(BASEDIR)/tmp
 BUSYBOX_VER  := 1.32.1
 BUSYBOX_SRC  := $(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER)
 
+ifeq ($(SELINUX_ENABLED),)
+    SELINUX_ENABLED := 0
+    ifneq ($(OS),Windows_NT)
+        ifeq ($(shell /sbin/selinuxenabled 2>/dev/null ; echo $$?),0)
+            SELINUX_ENABLED := 1
+        endif
+    endif
+endif
+
 # Possible programs
 PROGS       := \
 	base32 \
@@ -147,10 +156,18 @@ UNIX_PROGS := \
 	users \
 	who
 
+SELINUX_PROGS := \
+	chcon \
+	runcon
+
 ifneq ($(OS),Windows_NT)
 	PROGS    := $(PROGS) $(UNIX_PROGS)
 endif
 
+ifeq ($(SELINUX_ENABLED),1)
+    PROGS := $(PROGS) $(SELINUX_PROGS)
+endif
+
 UTILS ?= $(PROGS)
 
 # Programs with usable tests
@@ -159,6 +176,7 @@ TEST_PROGS  := \
 	base64 \
 	basename \
 	cat \
+	chcon \
 	chgrp \
 	chmod \
 	chown \
@@ -199,6 +217,7 @@ TEST_PROGS  := \
 	realpath \
 	rm \
 	rmdir \
+	runcon \
 	seq \
 	sort \
 	split \
@@ -228,6 +247,9 @@ TEST_SPEC_FEATURE :=
 ifneq ($(SPEC),)
 TEST_NO_FAIL_FAST :=--no-fail-fast
 TEST_SPEC_FEATURE := test_unimplemented
+else ifeq ($(SELINUX_ENABLED),1)
+TEST_NO_FAIL_FAST :=
+TEST_SPEC_FEATURE := feat_selinux
 endif
 
 define TEST_BUSYBOX
diff --git a/README.md b/README.md
index 083320ac0..7e420bb33 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ to compile anywhere, and this is as good a way as any to try and learn it.
 ### Rust Version
 
 uutils follows Rust's release channels and is tested against stable, beta and nightly.
-The current oldest supported version of the Rust compiler is `1.43.1`.
+The current oldest supported version of the Rust compiler is `1.47`.
 
 On both Windows and Redox, only the nightly version is tested currently.
 
@@ -365,23 +365,25 @@ To contribute to uutils, please see [CONTRIBUTING](CONTRIBUTING.md).
 
 | Done      | Semi-Done | To Do  |
 |-----------|-----------|--------|
-| arch      | cp        | chcon  |
-| base32    | date      | dd     |
-| base64    | df        | runcon |
-| basename  | expr      | stty   |
+| arch      | cp        | stty   |
+| base32    | date      |        |
+| base64    | dd        |        |
+| basename  | df        |        |
+| basenc    | expr      |        |
 | cat       | install   |        |
-| chgrp     | join      |        |
-| chmod     | ls        |        |
-| chown     | more      |        |
-| chroot    | numfmt    |        |
-| cksum     | od (`--strings` and 128-bit data types missing) | |
-| comm      | pr        |        |
-| csplit    | printf    |        |
-| cut       | sort      |        |
-| dircolors | split     |        |
-| dirname   | tac       |        |
-| du        | tail      |        |
-| echo      | test      |        |
+| chcon     | join      |        |
+| chgrp     | ls        |        |
+| chmod     | more      |        |
+| chown     | numfmt    |        |
+| chroot    | od (`--strings` and 128-bit data types missing) | |
+| cksum     | pr        |        |
+| comm      | printf    |        |
+| csplit    | sort      |        |
+| cut       | split     |        |
+| dircolors | tac       |        |
+| dirname   | tail      |        |
+| du        | test      |        |
+| echo      |           |        |
 | env       |           |        |
 | expand    |           |        |
 | factor    |           |        |
@@ -424,6 +426,7 @@ To contribute to uutils, please see [CONTRIBUTING](CONTRIBUTING.md).
 | relpath   |           |        |
 | rm        |           |        |
 | rmdir     |           |        |
+| runcon    |           |        |
 | seq       |           |        |
 | shred     |           |        |
 | shuf      |           |        |
diff --git a/build.rs b/build.rs
index e9fe129eb..261eb5d9a 100644
--- a/build.rs
+++ b/build.rs
@@ -28,8 +28,8 @@ pub fn main() {
         if val == "1" && key.starts_with(env_feature_prefix) {
             let krate = key[env_feature_prefix.len()..].to_lowercase();
             match krate.as_ref() {
-                "default" | "macos" | "unix" | "windows" => continue, // common/standard feature names
-                "nightly" | "test_unimplemented" => continue,         // crate-local custom features
+                "default" | "macos" | "unix" | "windows" | "selinux" => continue, // common/standard feature names
+                "nightly" | "test_unimplemented" => continue, // crate-local custom features
                 "test" => continue, // over-ridden with 'uu_test' to avoid collision with rust core crate 'test'
                 s if s.starts_with(feature_prefix) => continue, // crate feature sets
                 _ => {}             // util feature name
@@ -46,6 +46,8 @@ pub fn main() {
         "type UtilityMap<T> = HashMap<&'static str, (fn(T) -> i32, fn() -> App<'static, 'static>)>;\n\
          \n\
          fn util_map<T: uucore::Args>() -> UtilityMap<T> {\n\
+         \t#[allow(unused_mut)]\n\
+         \t#[allow(clippy::let_and_return)]\n\
          \tlet mut map = UtilityMap::new();\n\
          "
         .as_bytes(),
diff --git a/clippy.toml b/clippy.toml
index 0a0a69a41..dbabdab50 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.43.1"
+msrv = "1.47.0"
diff --git a/src/bin/coreutils.rs b/src/bin/coreutils.rs
index 3e8df57f7..1de1b6354 100644
--- a/src/bin/coreutils.rs
+++ b/src/bin/coreutils.rs
@@ -10,10 +10,12 @@ use clap::Arg;
 use clap::Shell;
 use std::cmp;
 use std::collections::hash_map::HashMap;
+use std::ffi::OsStr;
 use std::ffi::OsString;
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::process;
+use uucore::display::Quotable;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -70,18 +72,27 @@ fn main() {
         Some(OsString::from(*util))
     } else {
         // unmatched binary name => regard as multi-binary container and advance argument list
+        uucore::set_utility_is_second_arg();
         args.next()
     };
 
     // 0th argument equals util name?
     if let Some(util_os) = util_name {
-        let util = util_os.as_os_str().to_string_lossy();
+        fn not_found(util: &OsStr) -> ! {
+            println!("{}: function/utility not found", util.maybe_quote());
+            process::exit(1);
+        }
+
+        let util = match util_os.to_str() {
+            Some(util) => util,
+            None => not_found(&util_os),
+        };
 
         if util == "completion" {
             gen_completions(args, utils);
         }
 
-        match utils.get(&util[..]) {
+        match utils.get(util) {
             Some(&(uumain, _)) => {
                 process::exit(uumain((vec![util_os].into_iter()).chain(args)));
             }
@@ -89,9 +100,12 @@ fn main() {
                 if util == "--help" || util == "-h" {
                     // see if they want help on a specific util
                     if let Some(util_os) = args.next() {
-                        let util = util_os.as_os_str().to_string_lossy();
+                        let util = match util_os.to_str() {
+                            Some(util) => util,
+                            None => not_found(&util_os),
+                        };
 
-                        match utils.get(&util[..]) {
+                        match utils.get(util) {
                             Some(&(uumain, _)) => {
                                 let code = uumain(
                                     (vec![util_os, OsString::from("--help")].into_iter())
@@ -100,17 +114,13 @@ fn main() {
                                 io::stdout().flush().expect("could not flush stdout");
                                 process::exit(code);
                             }
-                            None => {
-                                println!("{}: function/utility not found", util);
-                                process::exit(1);
-                            }
+                            None => not_found(&util_os),
                         }
                     }
                     usage(&utils, binary_as_util);
                     process::exit(0);
                 } else {
-                    println!("{}: function/utility not found", util);
-                    process::exit(1);
+                    not_found(&util_os);
                 }
             }
         }
diff --git a/src/uu/arch/Cargo.toml b/src/uu/arch/Cargo.toml
index aa51183d7..c7fc4f9f9 100644
--- a/src/uu/arch/Cargo.toml
+++ b/src/uu/arch/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_arch"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "arch ~ (uutils) display machine architecture"
@@ -17,8 +17,8 @@ path = "src/arch.rs"
 [dependencies]
 platform-info = "0.1"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "arch"
diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs
index 94ec97e98..d23a11cc8 100644
--- a/src/uu/arch/src/arch.rs
+++ b/src/uu/arch/src/arch.rs
@@ -6,9 +6,6 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use platform_info::*;
 
 use clap::{crate_version, App};
@@ -27,7 +24,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(SUMMARY)
diff --git a/src/uu/base32/Cargo.toml b/src/uu/base32/Cargo.toml
index 3f6f79a0b..d5fc40024 100644
--- a/src/uu/base32/Cargo.toml
+++ b/src/uu/base32/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_base32"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "base32 ~ (uutils) decode/encode input (base32-encoding)"
@@ -16,9 +16,13 @@ path = "src/base32.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features = ["encoding"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "base32"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/base32/src/base32.rs b/src/uu/base32/src/base32.rs
index 9a29717ac..f4b4b49de 100644
--- a/src/uu/base32/src/base32.rs
+++ b/src/uu/base32/src/base32.rs
@@ -5,13 +5,10 @@
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use std::io::{stdin, Read};
 
 use clap::App;
-use uucore::encoding::Format;
+use uucore::{encoding::Format, error::UResult};
 
 pub mod base_common;
 
@@ -24,27 +21,22 @@ static ABOUT: &str = "
  to attempt to recover from any other non-alphabet bytes in the
  encoded stream.
 ";
-static VERSION: &str = env!("CARGO_PKG_VERSION");
 
-static BASE_CMD_PARSE_ERROR: i32 = 1;
-
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]", uucore::execution_phrase())
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let format = Format::Base32;
-    let usage = get_usage();
-    let name = executable!();
+    let usage = usage();
 
-    let config_result: Result<base_common::Config, String> =
-        base_common::parse_base_cmd_args(args, name, VERSION, ABOUT, &usage);
-    let config = config_result.unwrap_or_else(|s| crash!(BASE_CMD_PARSE_ERROR, "{}", s));
+    let config: base_common::Config = base_common::parse_base_cmd_args(args, ABOUT, &usage)?;
 
     // Create a reference to stdin so we can return a locked stdin from
     // parse_base_cmd_args
     let stdin_raw = stdin();
-    let mut input: Box<dyn Read> = base_common::get_input(&config, &stdin_raw);
+    let mut input: Box<dyn Read> = base_common::get_input(&config, &stdin_raw)?;
 
     base_common::handle_input(
         &mut input,
@@ -52,12 +44,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         config.wrap_cols,
         config.ignore_garbage,
         config.decode,
-        name,
-    );
-
-    0
+    )
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    base_common::base_app(executable!(), VERSION, ABOUT)
+    base_common::base_app(ABOUT)
 }
diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs
index 4fc8b495b..b07203507 100644
--- a/src/uu/base32/src/base_common.rs
+++ b/src/uu/base32/src/base_common.rs
@@ -9,14 +9,18 @@
 
 use std::io::{stdout, Read, Write};
 
+use uucore::display::Quotable;
 use uucore::encoding::{wrap_print, Data, Format};
+use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
 use uucore::InvalidEncodingHandling;
 
 use std::fs::File;
 use std::io::{BufReader, Stdin};
 use std::path::Path;
 
-use clap::{App, Arg};
+use clap::{crate_version, App, Arg};
+
+pub static BASE_CMD_PARSE_ERROR: i32 = 1;
 
 // Config.
 pub struct Config {
@@ -34,19 +38,25 @@ pub mod options {
 }
 
 impl Config {
-    fn from(options: clap::ArgMatches) -> Result<Config, String> {
+    pub fn from(options: &clap::ArgMatches) -> UResult<Config> {
         let file: Option<String> = match options.values_of(options::FILE) {
             Some(mut values) => {
                 let name = values.next().unwrap();
-                if values.len() != 0 {
-                    return Err(format!("extra operand '{}'", name));
+                if let Some(extra_op) = values.next() {
+                    return Err(UUsageError::new(
+                        BASE_CMD_PARSE_ERROR,
+                        format!("extra operand {}", extra_op.quote(),),
+                    ));
                 }
 
                 if name == "-" {
                     None
                 } else {
                     if !Path::exists(Path::new(name)) {
-                        return Err(format!("{}: No such file or directory", name));
+                        return Err(USimpleError::new(
+                            BASE_CMD_PARSE_ERROR,
+                            format!("{}: No such file or directory", name.maybe_quote()),
+                        ));
                     }
                     Some(name.to_owned())
                 }
@@ -57,8 +67,12 @@ impl Config {
         let cols = options
             .value_of(options::WRAP)
             .map(|num| {
-                num.parse::<usize>()
-                    .map_err(|e| format!("Invalid wrap size: '{}': {}", num, e))
+                num.parse::<usize>().map_err(|_| {
+                    USimpleError::new(
+                        BASE_CMD_PARSE_ERROR,
+                        format!("invalid wrap size: {}", num.quote()),
+                    )
+                })
             })
             .transpose()?;
 
@@ -71,23 +85,17 @@ impl Config {
     }
 }
 
-pub fn parse_base_cmd_args(
-    args: impl uucore::Args,
-    name: &str,
-    version: &str,
-    about: &str,
-    usage: &str,
-) -> Result<Config, String> {
-    let app = base_app(name, version, about).usage(usage);
+pub fn parse_base_cmd_args(args: impl uucore::Args, about: &str, usage: &str) -> UResult<Config> {
+    let app = base_app(about).usage(usage);
     let arg_list = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
-    Config::from(app.get_matches_from(arg_list))
+    Config::from(&app.get_matches_from(arg_list))
 }
 
-pub fn base_app<'a>(name: &str, version: &'a str, about: &'a str) -> App<'static, 'a> {
-    App::new(name)
-        .version(version)
+pub fn base_app<'a>(about: &'a str) -> App<'static, 'a> {
+    App::new(uucore::util_name())
+        .version(crate_version!())
         .about(about)
         // Format arguments.
         .arg(
@@ -116,14 +124,15 @@ pub fn base_app<'a>(name: &str, version: &'a str, about: &'a str) -> App<'static
         .arg(Arg::with_name(options::FILE).index(1).multiple(true))
 }
 
-pub fn get_input<'a>(config: &Config, stdin_ref: &'a Stdin) -> Box<dyn Read + 'a> {
+pub fn get_input<'a>(config: &Config, stdin_ref: &'a Stdin) -> UResult<Box<dyn Read + 'a>> {
     match &config.to_read {
         Some(name) => {
-            let file_buf = safe_unwrap!(File::open(Path::new(name)));
-            Box::new(BufReader::new(file_buf)) // as Box<dyn Read>
+            let file_buf =
+                File::open(Path::new(name)).map_err_context(|| name.maybe_quote().to_string())?;
+            Ok(Box::new(BufReader::new(file_buf))) // as Box<dyn Read>
         }
         None => {
-            Box::new(stdin_ref.lock()) // as Box<dyn Read>
+            Ok(Box::new(stdin_ref.lock())) // as Box<dyn Read>
         }
     }
 }
@@ -134,29 +143,35 @@ pub fn handle_input<R: Read>(
     line_wrap: Option<usize>,
     ignore_garbage: bool,
     decode: bool,
-    name: &str,
-) {
+) -> UResult<()> {
     let mut data = Data::new(input, format).ignore_garbage(ignore_garbage);
     if let Some(wrap) = line_wrap {
         data = data.line_wrap(wrap);
     }
 
     if !decode {
-        let encoded = data.encode();
-        wrap_print(&data, encoded);
+        match data.encode() {
+            Ok(s) => {
+                wrap_print(&data, s);
+                Ok(())
+            }
+            Err(_) => Err(USimpleError::new(
+                1,
+                "error: invalid input (length must be multiple of 4 characters)",
+            )),
+        }
     } else {
         match data.decode() {
             Ok(s) => {
+                // Silent the warning as we want to the error message
+                #[allow(clippy::question_mark)]
                 if stdout().write_all(&s).is_err() {
                     // on windows console, writing invalid utf8 returns an error
-                    eprintln!("{}: error: Cannot write non-utf8 data", name);
-                    exit!(1)
+                    return Err(USimpleError::new(1, "error: cannot write non-utf8 data"));
                 }
+                Ok(())
             }
-            Err(_) => {
-                eprintln!("{}: error: invalid input", name);
-                exit!(1)
-            }
+            Err(_) => Err(USimpleError::new(1, "error: invalid input")),
         }
     }
 }
diff --git a/src/uu/base64/Cargo.toml b/src/uu/base64/Cargo.toml
index ff5a9aa48..c8d71b85a 100644
--- a/src/uu/base64/Cargo.toml
+++ b/src/uu/base64/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_base64"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "base64 ~ (uutils) decode/encode input (base64-encoding)"
@@ -16,10 +16,14 @@ path = "src/base64.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features = ["encoding"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
-uu_base32 = { version=">=0.0.6", package="uu_base32", path="../base32"}
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"}
 
 [[bin]]
 name = "base64"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/base64/src/base64.rs b/src/uu/base64/src/base64.rs
index 71ed44e6e..c041d6d69 100644
--- a/src/uu/base64/src/base64.rs
+++ b/src/uu/base64/src/base64.rs
@@ -6,13 +6,10 @@
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use uu_base32::base_common;
 pub use uu_base32::uu_app;
 
-use uucore::encoding::Format;
+use uucore::{encoding::Format, error::UResult};
 
 use std::io::{stdin, Read};
 
@@ -25,26 +22,22 @@ static ABOUT: &str = "
  to attempt to recover from any other non-alphabet bytes in the
  encoded stream.
 ";
-static VERSION: &str = env!("CARGO_PKG_VERSION");
 
-static BASE_CMD_PARSE_ERROR: i32 = 1;
-
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]", uucore::execution_phrase())
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let format = Format::Base64;
-    let usage = get_usage();
-    let name = executable!();
-    let config_result: Result<base_common::Config, String> =
-        base_common::parse_base_cmd_args(args, name, VERSION, ABOUT, &usage);
-    let config = config_result.unwrap_or_else(|s| crash!(BASE_CMD_PARSE_ERROR, "{}", s));
+    let usage = usage();
+
+    let config: base_common::Config = base_common::parse_base_cmd_args(args, ABOUT, &usage)?;
 
     // Create a reference to stdin so we can return a locked stdin from
     // parse_base_cmd_args
     let stdin_raw = stdin();
-    let mut input: Box<dyn Read> = base_common::get_input(&config, &stdin_raw);
+    let mut input: Box<dyn Read> = base_common::get_input(&config, &stdin_raw)?;
 
     base_common::handle_input(
         &mut input,
@@ -52,8 +45,5 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         config.wrap_cols,
         config.ignore_garbage,
         config.decode,
-        name,
-    );
-
-    0
+    )
 }
diff --git a/src/uu/basename/Cargo.toml b/src/uu/basename/Cargo.toml
index b5270eba9..b75105790 100644
--- a/src/uu/basename/Cargo.toml
+++ b/src/uu/basename/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_basename"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "basename ~ (uutils) display PATHNAME with leading directory components removed"
@@ -16,9 +16,13 @@ path = "src/basename.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "basename"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs
index 5450ee3f2..f7f4a3d08 100644
--- a/src/uu/basename/src/basename.rs
+++ b/src/uu/basename/src/basename.rs
@@ -17,11 +17,11 @@ use uucore::InvalidEncodingHandling;
 static SUMMARY: &str = "Print NAME with any leading directory components removed
 If specified, also remove a trailing SUFFIX";
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} NAME [SUFFIX]
     {0} OPTION... NAME...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
@@ -36,7 +36,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
-    let usage = get_usage();
+    let usage = usage();
     //
     // Argument parsing
     //
@@ -47,7 +47,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         crash!(
             1,
             "{1}\nTry '{0} --help' for more information.",
-            executable!(),
+            uucore::execution_phrase(),
             "missing operand"
         );
     }
@@ -61,7 +61,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         crash!(
             1,
             "extra operand '{1}'\nTry '{0} --help' for more information.",
-            executable!(),
+            uucore::execution_phrase(),
             matches.values_of(options::NAME).unwrap().nth(2).unwrap()
         );
     }
@@ -93,7 +93,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
         .arg(
@@ -119,27 +119,27 @@ pub fn uu_app() -> App<'static, 'static> {
 }
 
 fn basename(fullname: &str, suffix: &str) -> String {
-    // Remove all platform-specific path separators from the end
+    // Remove all platform-specific path separators from the end.
     let path = fullname.trim_end_matches(is_separator);
 
+    // If the path contained *only* suffix characters (for example, if
+    // `fullname` were "///" and `suffix` were "/"), then `path` would
+    // be left with the empty string. In that case, we set `path` to be
+    // the original `fullname` to avoid returning the empty path.
+    let path = if path.is_empty() { fullname } else { path };
+
     // Convert to path buffer and get last path component
     let pb = PathBuf::from(path);
     match pb.components().last() {
-        Some(c) => strip_suffix(c.as_os_str().to_str().unwrap(), suffix),
+        Some(c) => {
+            let name = c.as_os_str().to_str().unwrap();
+            if name == suffix {
+                name.to_string()
+            } else {
+                name.strip_suffix(suffix).unwrap_or(name).to_string()
+            }
+        }
+
         None => "".to_owned(),
     }
 }
-
-// can be replaced with strip_suffix once MSRV is 1.45
-#[allow(clippy::manual_strip)]
-fn strip_suffix(name: &str, suffix: &str) -> String {
-    if name == suffix {
-        return name.to_owned();
-    }
-
-    if name.ends_with(suffix) {
-        return name[..name.len() - suffix.len()].to_owned();
-    }
-
-    name.to_owned()
-}
diff --git a/src/uu/basenc/Cargo.toml b/src/uu/basenc/Cargo.toml
new file mode 100644
index 000000000..165d3d3a0
--- /dev/null
+++ b/src/uu/basenc/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "uu_basenc"
+version = "0.0.8"
+authors = ["uutils developers"]
+license = "MIT"
+description = "basenc ~ (uutils) decode/encode input"
+
+homepage = "https://github.com/uutils/coreutils"
+repository = "https://github.com/uutils/coreutils/tree/master/src/uu/basenc"
+keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
+categories = ["command-line-utilities"]
+edition = "2018"
+
+[lib]
+path = "src/basenc.rs"
+
+[dependencies]
+clap = { version = "2.33", features = ["wrap_help"] }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features = ["encoding"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+uu_base32 = { version=">=0.0.8", package="uu_base32", path="../base32"}
+
+[[bin]]
+name = "basenc"
+path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/basenc/src/basenc.rs b/src/uu/basenc/src/basenc.rs
new file mode 100644
index 000000000..e4b24c351
--- /dev/null
+++ b/src/uu/basenc/src/basenc.rs
@@ -0,0 +1,86 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Jordy Dickinson <jordy.dickinson@gmail.com>
+// (c) Jian Zeng <anonymousknight96@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE file
+// that was distributed with this source code.
+
+//spell-checker:ignore (args) lsbf msbf
+
+use clap::{App, Arg};
+use uu_base32::base_common::{self, Config, BASE_CMD_PARSE_ERROR};
+
+use uucore::{
+    encoding::Format,
+    error::{UResult, UUsageError},
+    InvalidEncodingHandling,
+};
+
+use std::io::{stdin, Read};
+
+static ABOUT: &str = "
+ With no FILE, or when FILE is -, read standard input.
+
+ When decoding, the input may contain newlines in addition to the bytes of
+ the formal alphabet. Use --ignore-garbage to attempt to recover
+ from any other non-alphabet bytes in the encoded stream.
+";
+
+const ENCODINGS: &[(&str, Format)] = &[
+    ("base64", Format::Base64),
+    ("base64url", Format::Base64Url),
+    ("base32", Format::Base32),
+    ("base32hex", Format::Base32Hex),
+    ("base16", Format::Base16),
+    ("base2lsbf", Format::Base2Lsbf),
+    ("base2msbf", Format::Base2Msbf),
+    ("z85", Format::Z85),
+    // common abbreviations. TODO: once we have clap 3.0 we can use `AppSettings::InferLongArgs` to get all abbreviations automatically
+    ("base2l", Format::Base2Lsbf),
+    ("base2m", Format::Base2Msbf),
+];
+
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]", uucore::execution_phrase())
+}
+
+pub fn uu_app() -> App<'static, 'static> {
+    let mut app = base_common::base_app(ABOUT);
+    for encoding in ENCODINGS {
+        app = app.arg(Arg::with_name(encoding.0).long(encoding.0));
+    }
+    app
+}
+
+fn parse_cmd_args(args: impl uucore::Args) -> UResult<(Config, Format)> {
+    let usage = usage();
+    let matches = uu_app().usage(&usage[..]).get_matches_from(
+        args.collect_str(InvalidEncodingHandling::ConvertLossy)
+            .accept_any(),
+    );
+    let format = ENCODINGS
+        .iter()
+        .find(|encoding| matches.is_present(encoding.0))
+        .ok_or_else(|| UUsageError::new(BASE_CMD_PARSE_ERROR, "missing encoding type"))?
+        .1;
+    let config = Config::from(&matches)?;
+    Ok((config, format))
+}
+
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let (config, format) = parse_cmd_args(args)?;
+    // Create a reference to stdin so we can return a locked stdin from
+    // parse_base_cmd_args
+    let stdin_raw = stdin();
+    let mut input: Box<dyn Read> = base_common::get_input(&config, &stdin_raw)?;
+
+    base_common::handle_input(
+        &mut input,
+        format,
+        config.wrap_cols,
+        config.ignore_garbage,
+        config.decode,
+    )
+}
diff --git a/src/uu/basenc/src/main.rs b/src/uu/basenc/src/main.rs
new file mode 100644
index 000000000..9a9a5f4c6
--- /dev/null
+++ b/src/uu/basenc/src/main.rs
@@ -0,0 +1 @@
+uucore_procs::main!(uu_basenc);
diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml
index b0721cee0..b6b0165ef 100644
--- a/src/uu/cat/Cargo.toml
+++ b/src/uu/cat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_cat"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "cat ~ (uutils) concatenate and display input"
@@ -18,14 +18,15 @@ path = "src/cat.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 thiserror = "1.0"
 atty = "0.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs", "pipes"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(unix)'.dependencies]
 unix_socket = "0.5.0"
+nix = "0.20.0"
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-nix = "0.20"
+[target.'cfg(windows)'.dependencies]
+winapi-util = "0.1.5"
 
 [[bin]]
 name = "cat"
diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs
index 35a5308ed..af84890db 100644
--- a/src/uu/cat/src/cat.rs
+++ b/src/uu/cat/src/cat.rs
@@ -12,20 +12,21 @@
 
 #[cfg(unix)]
 extern crate unix_socket;
-#[macro_use]
-extern crate uucore;
 
 // last synced with: cat (GNU coreutils) 8.13
 use clap::{crate_version, App, Arg};
 use std::fs::{metadata, File};
 use std::io::{self, Read, Write};
 use thiserror::Error;
+use uucore::display::Quotable;
+use uucore::error::UResult;
+
+#[cfg(unix)]
+use std::os::unix::io::AsRawFd;
 
 /// Linux splice support
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod splice;
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use std::os::unix::io::{AsRawFd, RawFd};
 
 /// Unix domain socket support
 #[cfg(unix)]
@@ -58,6 +59,8 @@ enum CatError {
     },
     #[error("Is a directory")]
     IsDirectory,
+    #[error("input file is output file")]
+    OutputIsInput,
 }
 
 type CatResult<T> = Result<T, CatError>;
@@ -122,12 +125,26 @@ struct OutputState {
 
     /// Whether the output cursor is at the beginning of a new line
     at_line_start: bool,
+
+    /// Whether we skipped a \r, which still needs to be printed
+    skipped_carriage_return: bool,
+
+    /// Whether we have already printed a blank line
+    one_blank_kept: bool,
 }
 
+#[cfg(unix)]
+trait FdReadable: Read + AsRawFd {}
+#[cfg(not(unix))]
+trait FdReadable: Read {}
+
+#[cfg(unix)]
+impl<T> FdReadable for T where T: Read + AsRawFd {}
+#[cfg(not(unix))]
+impl<T> FdReadable for T where T: Read {}
+
 /// Represents an open file handle, stream, or other device
-struct InputHandle<R: Read> {
-    #[cfg(any(target_os = "linux", target_os = "android"))]
-    file_descriptor: RawFd,
+struct InputHandle<R: FdReadable> {
     reader: R,
     is_interactive: bool,
 }
@@ -164,7 +181,8 @@ mod options {
     pub static SHOW_NONPRINTING: &str = "show-nonprinting";
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
@@ -217,17 +235,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         show_tabs,
         squeeze_blank,
     };
-    let success = cat_files(files, &options).is_ok();
-
-    if success {
-        0
-    } else {
-        1
-    }
+    cat_files(files, &options)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(SYNTAX)
@@ -289,7 +301,7 @@ pub fn uu_app() -> App<'static, 'static> {
         )
 }
 
-fn cat_handle<R: Read>(
+fn cat_handle<R: FdReadable>(
     handle: &mut InputHandle<R>,
     options: &OutputOptions,
     state: &mut OutputState,
@@ -301,12 +313,16 @@ fn cat_handle<R: Read>(
     }
 }
 
-fn cat_path(path: &str, options: &OutputOptions, state: &mut OutputState) -> CatResult<()> {
+fn cat_path(
+    path: &str,
+    options: &OutputOptions,
+    state: &mut OutputState,
+    #[cfg(unix)] out_info: &nix::sys::stat::FileStat,
+    #[cfg(windows)] out_info: &winapi_util::file::Information,
+) -> CatResult<()> {
     if path == "-" {
         let stdin = io::stdin();
         let mut handle = InputHandle {
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            file_descriptor: stdin.as_raw_fd(),
             reader: stdin,
             is_interactive: atty::is(atty::Stream::Stdin),
         };
@@ -319,8 +335,6 @@ fn cat_path(path: &str, options: &OutputOptions, state: &mut OutputState) -> Cat
             let socket = UnixStream::connect(path)?;
             socket.shutdown(Shutdown::Write)?;
             let mut handle = InputHandle {
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                file_descriptor: socket.as_raw_fd(),
                 reader: socket,
                 is_interactive: false,
             };
@@ -328,9 +342,11 @@ fn cat_path(path: &str, options: &OutputOptions, state: &mut OutputState) -> Cat
         }
         _ => {
             let file = File::open(path)?;
+            #[cfg(any(windows, unix))]
+            if same_file(out_info, &file) {
+                return Err(CatError::OutputIsInput);
+            }
             let mut handle = InputHandle {
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                file_descriptor: file.as_raw_fd(),
                 reader: file,
                 is_interactive: false,
             };
@@ -339,23 +355,52 @@ fn cat_path(path: &str, options: &OutputOptions, state: &mut OutputState) -> Cat
     }
 }
 
-fn cat_files(files: Vec<String>, options: &OutputOptions) -> Result<(), u32> {
-    let mut error_count = 0;
+#[cfg(unix)]
+fn same_file(a_info: &nix::sys::stat::FileStat, b: &File) -> bool {
+    let b_info = nix::sys::stat::fstat(b.as_raw_fd()).unwrap();
+    b_info.st_size != 0 && b_info.st_dev == a_info.st_dev && b_info.st_ino == a_info.st_ino
+}
+
+#[cfg(windows)]
+fn same_file(a_info: &winapi_util::file::Information, b: &File) -> bool {
+    let b_info = winapi_util::file::information(b).unwrap();
+    b_info.file_size() != 0
+        && b_info.volume_serial_number() == a_info.volume_serial_number()
+        && b_info.file_index() == a_info.file_index()
+}
+
+fn cat_files(files: Vec<String>, options: &OutputOptions) -> UResult<()> {
+    #[cfg(windows)]
+    let out_info = winapi_util::file::information(&std::io::stdout()).unwrap();
+    #[cfg(unix)]
+    let out_info = nix::sys::stat::fstat(std::io::stdout().as_raw_fd()).unwrap();
+
     let mut state = OutputState {
         line_number: 1,
         at_line_start: true,
+        skipped_carriage_return: false,
+        one_blank_kept: false,
     };
+    let mut error_messages: Vec<String> = Vec::new();
 
     for path in &files {
-        if let Err(err) = cat_path(path, options, &mut state) {
-            show_error!("{}: {}", path, err);
-            error_count += 1;
+        if let Err(err) = cat_path(path, options, &mut state, &out_info) {
+            error_messages.push(format!("{}: {}", path.maybe_quote(), err));
         }
     }
-    if error_count == 0 {
+    if state.skipped_carriage_return {
+        print!("\r");
+    }
+    if error_messages.is_empty() {
         Ok(())
     } else {
-        Err(error_count)
+        // each next line is expected to display "cat: …"
+        let line_joiner = format!("\n{}: ", uucore::util_name());
+
+        Err(uucore::error::USimpleError::new(
+            error_messages.len() as i32,
+            error_messages.join(&line_joiner),
+        ))
     }
 }
 
@@ -390,14 +435,14 @@ fn get_input_type(path: &str) -> CatResult<InputType> {
 
 /// Writes handle to stdout with no configuration. This allows a
 /// simple memory copy.
-fn write_fast<R: Read>(handle: &mut InputHandle<R>) -> CatResult<()> {
+fn write_fast<R: FdReadable>(handle: &mut InputHandle<R>) -> CatResult<()> {
     let stdout = io::stdout();
     let mut stdout_lock = stdout.lock();
     #[cfg(any(target_os = "linux", target_os = "android"))]
     {
         // If we're on Linux or Android, try to use the splice() system call
         // for faster writing. If it works, we're done.
-        if !splice::write_fast_using_splice(handle, stdout_lock.as_raw_fd())? {
+        if !splice::write_fast_using_splice(handle, &stdout_lock)? {
             return Ok(());
         }
     }
@@ -415,7 +460,7 @@ fn write_fast<R: Read>(handle: &mut InputHandle<R>) -> CatResult<()> {
 
 /// Outputs file contents to stdout in a line-by-line fashion,
 /// propagating any errors that might occur.
-fn write_lines<R: Read>(
+fn write_lines<R: FdReadable>(
     handle: &mut InputHandle<R>,
     options: &OutputOptions,
     state: &mut OutputState,
@@ -423,7 +468,6 @@ fn write_lines<R: Read>(
     let mut in_buf = [0; 1024 * 31];
     let stdout = io::stdout();
     let mut writer = stdout.lock();
-    let mut one_blank_kept = false;
 
     while let Ok(n) = handle.reader.read(&mut in_buf) {
         if n == 0 {
@@ -434,8 +478,13 @@ fn write_lines<R: Read>(
         while pos < n {
             // skip empty line_number enumerating them if needed
             if in_buf[pos] == b'\n' {
-                if !state.at_line_start || !options.squeeze_blank || !one_blank_kept {
-                    one_blank_kept = true;
+                // \r followed by \n is printed as ^M when show_ends is enabled, so that \r\n prints as ^M$
+                if state.skipped_carriage_return && options.show_ends {
+                    writer.write_all(b"^M")?;
+                    state.skipped_carriage_return = false;
+                }
+                if !state.at_line_start || !options.squeeze_blank || !state.one_blank_kept {
+                    state.one_blank_kept = true;
                     if state.at_line_start && options.number == NumberingMode::All {
                         write!(&mut writer, "{0:6}\t", state.line_number)?;
                         state.line_number += 1;
@@ -449,7 +498,12 @@ fn write_lines<R: Read>(
                 pos += 1;
                 continue;
             }
-            one_blank_kept = false;
+            if state.skipped_carriage_return {
+                writer.write_all(b"\r")?;
+                state.skipped_carriage_return = false;
+                state.at_line_start = false;
+            }
+            state.one_blank_kept = false;
             if state.at_line_start && options.number != NumberingMode::None {
                 write!(&mut writer, "{0:6}\t", state.line_number)?;
                 state.line_number += 1;
@@ -464,17 +518,22 @@ fn write_lines<R: Read>(
                 write_to_end(&in_buf[pos..], &mut writer)
             };
             // end of buffer?
-            if offset == 0 {
+            if offset + pos == in_buf.len() {
                 state.at_line_start = false;
                 break;
             }
-            // print suitable end of line
-            writer.write_all(options.end_of_line().as_bytes())?;
-            if handle.is_interactive {
-                writer.flush()?;
+            if in_buf[pos + offset] == b'\r' {
+                state.skipped_carriage_return = true;
+            } else {
+                assert_eq!(in_buf[pos + offset], b'\n');
+                // print suitable end of line
+                writer.write_all(options.end_of_line().as_bytes())?;
+                if handle.is_interactive {
+                    writer.flush()?;
+                }
+                state.at_line_start = true;
             }
-            state.at_line_start = true;
-            pos += offset;
+            pos += offset + 1;
         }
     }
 
@@ -482,17 +541,19 @@ fn write_lines<R: Read>(
 }
 
 // write***_to_end methods
-// Write all symbols till end of line or end of buffer is reached
-// Return the (number of written symbols + 1) or 0 if the end of buffer is reached
+// Write all symbols till \n or \r or end of buffer is reached
+// We need to stop at \r because it may be written as ^M depending on the byte after and settings;
+// however, write_nonprint_to_end doesn't need to stop at \r because it will always write \r as ^M.
+// Return the number of written symbols
 fn write_to_end<W: Write>(in_buf: &[u8], writer: &mut W) -> usize {
-    match in_buf.iter().position(|c| *c == b'\n') {
+    match in_buf.iter().position(|c| *c == b'\n' || *c == b'\r') {
         Some(p) => {
             writer.write_all(&in_buf[..p]).unwrap();
-            p + 1
+            p
         }
         None => {
             writer.write_all(in_buf).unwrap();
-            0
+            in_buf.len()
         }
     }
 }
@@ -500,20 +561,25 @@ fn write_to_end<W: Write>(in_buf: &[u8], writer: &mut W) -> usize {
 fn write_tab_to_end<W: Write>(mut in_buf: &[u8], writer: &mut W) -> usize {
     let mut count = 0;
     loop {
-        match in_buf.iter().position(|c| *c == b'\n' || *c == b'\t') {
+        match in_buf
+            .iter()
+            .position(|c| *c == b'\n' || *c == b'\t' || *c == b'\r')
+        {
             Some(p) => {
                 writer.write_all(&in_buf[..p]).unwrap();
                 if in_buf[p] == b'\n' {
-                    return count + p + 1;
-                } else {
+                    return count + p;
+                } else if in_buf[p] == b'\t' {
                     writer.write_all(b"^I").unwrap();
                     in_buf = &in_buf[p + 1..];
                     count += p + 1;
+                } else {
+                    return count + p;
                 }
             }
             None => {
                 writer.write_all(in_buf).unwrap();
-                return 0;
+                return in_buf.len();
             }
         };
     }
@@ -522,7 +588,7 @@ fn write_tab_to_end<W: Write>(mut in_buf: &[u8], writer: &mut W) -> usize {
 fn write_nonprint_to_end<W: Write>(in_buf: &[u8], writer: &mut W, tab: &[u8]) -> usize {
     let mut count = 0;
 
-    for byte in in_buf.iter().map(|c| *c) {
+    for byte in in_buf.iter().copied() {
         if byte == b'\n' {
             break;
         }
@@ -538,11 +604,7 @@ fn write_nonprint_to_end<W: Write>(in_buf: &[u8], writer: &mut W, tab: &[u8]) ->
         .unwrap();
         count += 1;
     }
-    if count != in_buf.len() {
-        count + 1
-    } else {
-        0
-    }
+    count
 }
 
 #[cfg(test)]
diff --git a/src/uu/cat/src/splice.rs b/src/uu/cat/src/splice.rs
index 0b46fc662..26802c7e6 100644
--- a/src/uu/cat/src/splice.rs
+++ b/src/uu/cat/src/splice.rs
@@ -1,10 +1,11 @@
-use super::{CatResult, InputHandle};
+use super::{CatResult, FdReadable, InputHandle};
 
-use nix::fcntl::{splice, SpliceFFlags};
-use nix::unistd::{self, pipe};
-use std::io::Read;
-use std::os::unix::io::RawFd;
+use nix::unistd;
+use std::os::unix::io::{AsRawFd, RawFd};
 
+use uucore::pipes::{pipe, splice, splice_exact};
+
+const SPLICE_SIZE: usize = 1024 * 128;
 const BUF_SIZE: usize = 1024 * 16;
 
 /// This function is called from `write_fast()` on Linux and Android. The
@@ -15,38 +16,25 @@ const BUF_SIZE: usize = 1024 * 16;
 /// The `bool` in the result value indicates if we need to fall back to normal
 /// copying or not. False means we don't have to.
 #[inline]
-pub(super) fn write_fast_using_splice<R: Read>(
+pub(super) fn write_fast_using_splice<R: FdReadable>(
     handle: &mut InputHandle<R>,
-    write_fd: RawFd,
+    write_fd: &impl AsRawFd,
 ) -> CatResult<bool> {
-    let (pipe_rd, pipe_wr) = match pipe() {
-        Ok(r) => r,
-        Err(_) => {
-            // It is very rare that creating a pipe fails, but it can happen.
-            return Ok(true);
-        }
-    };
+    let (pipe_rd, pipe_wr) = pipe()?;
 
     loop {
-        match splice(
-            handle.file_descriptor,
-            None,
-            pipe_wr,
-            None,
-            BUF_SIZE,
-            SpliceFFlags::empty(),
-        ) {
+        match splice(&handle.reader, &pipe_wr, SPLICE_SIZE) {
             Ok(n) => {
                 if n == 0 {
                     return Ok(false);
                 }
-                if splice_exact(pipe_rd, write_fd, n).is_err() {
+                if splice_exact(&pipe_rd, write_fd, n).is_err() {
                     // If the first splice manages to copy to the intermediate
                     // pipe, but the second splice to stdout fails for some reason
                     // we can recover by copying the data that we have from the
                     // intermediate pipe to stdout using normal read/write. Then
                     // we tell the caller to fall back.
-                    copy_exact(pipe_rd, write_fd, n)?;
+                    copy_exact(pipe_rd.as_raw_fd(), write_fd.as_raw_fd(), n)?;
                     return Ok(true);
                 }
             }
@@ -57,35 +45,23 @@ pub(super) fn write_fast_using_splice<R: Read>(
     }
 }
 
-/// Splice wrapper which handles short writes.
-#[inline]
-fn splice_exact(read_fd: RawFd, write_fd: RawFd, num_bytes: usize) -> nix::Result<()> {
-    let mut left = num_bytes;
-    loop {
-        let written = splice(read_fd, None, write_fd, None, left, SpliceFFlags::empty())?;
-        left -= written;
-        if left == 0 {
-            break;
-        }
-    }
-    Ok(())
-}
-
-/// Caller must ensure that `num_bytes <= BUF_SIZE`, otherwise this function
-/// will panic. The way we use this function in `write_fast_using_splice`
-/// above is safe because `splice` is set to write at most `BUF_SIZE` to the
-/// pipe.
-#[inline]
+/// Move exactly `num_bytes` bytes from `read_fd` to `write_fd`.
+///
+/// Panics if not enough bytes can be read.
 fn copy_exact(read_fd: RawFd, write_fd: RawFd, num_bytes: usize) -> nix::Result<()> {
     let mut left = num_bytes;
     let mut buf = [0; BUF_SIZE];
-    loop {
-        let read = unistd::read(read_fd, &mut buf[..left])?;
-        let written = unistd::write(write_fd, &buf[..read])?;
-        left -= written;
-        if left == 0 {
-            break;
+    while left > 0 {
+        let read = unistd::read(read_fd, &mut buf)?;
+        assert_ne!(read, 0, "unexpected end of pipe");
+        let mut written = 0;
+        while written < read {
+            match unistd::write(write_fd, &buf[written..read])? {
+                0 => panic!(),
+                n => written += n,
+            }
         }
+        left -= read;
     }
     Ok(())
 }
diff --git a/src/uu/chcon/Cargo.toml b/src/uu/chcon/Cargo.toml
new file mode 100644
index 000000000..a359f142f
--- /dev/null
+++ b/src/uu/chcon/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "uu_chcon"
+version = "0.0.8"
+authors = ["uutils developers"]
+license = "MIT"
+description = "chcon ~ (uutils) change file security context"
+homepage = "https://github.com/uutils/coreutils"
+repository = "https://github.com/uutils/coreutils/tree/master/src/uu/chcon"
+keywords = ["coreutils", "uutils", "cli", "utility"]
+categories = ["command-line-utilities"]
+edition = "2018"
+
+[lib]
+path = "src/chcon.rs"
+
+[dependencies]
+clap         = { version = "2.33", features = ["wrap_help"] }
+uucore       = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore_procs = { version = ">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+selinux      = { version = "0.2"   }
+fts-sys      = { version = "0.2"   }
+thiserror    = { version = "1.0"   }
+libc         = { version = "0.2"   }
+
+[[bin]]
+name = "chcon"
+path = "src/main.rs"
diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs
new file mode 100644
index 000000000..9664f69f5
--- /dev/null
+++ b/src/uu/chcon/src/chcon.rs
@@ -0,0 +1,745 @@
+// spell-checker:ignore (vars) RFILE
+
+#![allow(clippy::upper_case_acronyms)]
+
+use uucore::{display::Quotable, show_error, show_usage_error, show_warning};
+
+use clap::{App, Arg};
+use selinux::{OpaqueSecurityContext, SecurityContext};
+
+use std::borrow::Cow;
+use std::ffi::{CStr, CString, OsStr, OsString};
+use std::os::raw::c_int;
+use std::path::{Path, PathBuf};
+use std::{fs, io};
+
+mod errors;
+mod fts;
+
+use errors::*;
+
+static VERSION: &str = env!("CARGO_PKG_VERSION");
+static ABOUT: &str = "Change the SELinux security context of each FILE to CONTEXT. \n\
+                      With --reference, change the security context of each FILE to that of RFILE.";
+
+pub mod options {
+    pub static VERBOSE: &str = "verbose";
+
+    pub static REFERENCE: &str = "reference";
+
+    pub static USER: &str = "user";
+    pub static ROLE: &str = "role";
+    pub static TYPE: &str = "type";
+    pub static RANGE: &str = "range";
+
+    pub static RECURSIVE: &str = "recursive";
+
+    pub mod sym_links {
+        pub static FOLLOW_ARG_DIR_SYM_LINK: &str = "follow-arg-dir-sym-link";
+        pub static FOLLOW_DIR_SYM_LINKS: &str = "follow-dir-sym-links";
+        pub static NO_FOLLOW_SYM_LINKS: &str = "no-follow-sym-links";
+    }
+
+    pub mod dereference {
+        pub static DEREFERENCE: &str = "dereference";
+        pub static NO_DEREFERENCE: &str = "no-dereference";
+    }
+
+    pub mod preserve_root {
+        pub static PRESERVE_ROOT: &str = "preserve-root";
+        pub static NO_PRESERVE_ROOT: &str = "no-preserve-root";
+    }
+}
+
+fn get_usage() -> String {
+    format!(
+        "{0} [OPTION]... CONTEXT FILE... \n    \
+         {0} [OPTION]... [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE... \n    \
+         {0} [OPTION]... --reference=RFILE FILE...",
+        uucore::execution_phrase()
+    )
+}
+
+pub fn uumain(args: impl uucore::Args) -> i32 {
+    let usage = get_usage();
+
+    let config = uu_app().usage(usage.as_ref());
+
+    let options = match parse_command_line(config, args) {
+        Ok(r) => r,
+        Err(r) => {
+            if let Error::CommandLine(r) = &r {
+                match r.kind {
+                    clap::ErrorKind::HelpDisplayed | clap::ErrorKind::VersionDisplayed => {
+                        println!("{}", r);
+                        return libc::EXIT_SUCCESS;
+                    }
+                    _ => {}
+                }
+            }
+
+            show_usage_error!("{}.\n", r);
+            return libc::EXIT_FAILURE;
+        }
+    };
+
+    let context = match &options.mode {
+        CommandLineMode::ReferenceBased { reference } => {
+            let result = match SecurityContext::of_path(reference, true, false) {
+                Ok(Some(context)) => Ok(context),
+
+                Ok(None) => {
+                    let err = io::Error::from_raw_os_error(libc::ENODATA);
+                    Err(Error::from_io1("Getting security context", reference, err))
+                }
+
+                Err(r) => Err(Error::from_selinux("Getting security context", r)),
+            };
+
+            match result {
+                Err(r) => {
+                    show_error!("{}.", report_full_error(&r));
+                    return libc::EXIT_FAILURE;
+                }
+
+                Ok(file_context) => SELinuxSecurityContext::File(file_context),
+            }
+        }
+
+        CommandLineMode::ContextBased { context } => {
+            let c_context = match os_str_to_c_string(context) {
+                Ok(context) => context,
+
+                Err(_r) => {
+                    show_error!("Invalid security context {}.", context.quote());
+                    return libc::EXIT_FAILURE;
+                }
+            };
+
+            if SecurityContext::from_c_str(&c_context, false).check() == Some(false) {
+                show_error!("Invalid security context {}.", context.quote());
+                return libc::EXIT_FAILURE;
+            }
+
+            SELinuxSecurityContext::String(Some(c_context))
+        }
+
+        CommandLineMode::Custom { .. } => SELinuxSecurityContext::String(None),
+    };
+
+    let root_dev_ino = if options.preserve_root && options.recursive_mode.is_recursive() {
+        match get_root_dev_ino() {
+            Ok(r) => Some(r),
+
+            Err(r) => {
+                show_error!("{}.", report_full_error(&r));
+                return libc::EXIT_FAILURE;
+            }
+        }
+    } else {
+        None
+    };
+
+    let results = process_files(&options, &context, root_dev_ino);
+    if results.is_empty() {
+        return libc::EXIT_SUCCESS;
+    }
+
+    for result in &results {
+        show_error!("{}.", report_full_error(result));
+    }
+    libc::EXIT_FAILURE
+}
+
+pub fn uu_app() -> App<'static, 'static> {
+    App::new(uucore::util_name())
+        .version(VERSION)
+        .about(ABOUT)
+        .arg(
+            Arg::with_name(options::dereference::DEREFERENCE)
+                .long(options::dereference::DEREFERENCE)
+                .conflicts_with(options::dereference::NO_DEREFERENCE)
+                .help(
+                    "Affect the referent of each symbolic link (this is the default), \
+                     rather than the symbolic link itself.",
+                ),
+        )
+        .arg(
+            Arg::with_name(options::dereference::NO_DEREFERENCE)
+                .short("h")
+                .long(options::dereference::NO_DEREFERENCE)
+                .help("Affect symbolic links instead of any referenced file."),
+        )
+        .arg(
+            Arg::with_name(options::preserve_root::PRESERVE_ROOT)
+                .long(options::preserve_root::PRESERVE_ROOT)
+                .conflicts_with(options::preserve_root::NO_PRESERVE_ROOT)
+                .help("Fail to operate recursively on '/'."),
+        )
+        .arg(
+            Arg::with_name(options::preserve_root::NO_PRESERVE_ROOT)
+                .long(options::preserve_root::NO_PRESERVE_ROOT)
+                .help("Do not treat '/' specially (the default)."),
+        )
+        .arg(
+            Arg::with_name(options::REFERENCE)
+                .long(options::REFERENCE)
+                .takes_value(true)
+                .value_name("RFILE")
+                .conflicts_with_all(&[options::USER, options::ROLE, options::TYPE, options::RANGE])
+                .help(
+                    "Use security context of RFILE, rather than specifying \
+                     a CONTEXT value.",
+                ),
+        )
+        .arg(
+            Arg::with_name(options::USER)
+                .short("u")
+                .long(options::USER)
+                .takes_value(true)
+                .value_name("USER")
+                .help("Set user USER in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::ROLE)
+                .short("r")
+                .long(options::ROLE)
+                .takes_value(true)
+                .value_name("ROLE")
+                .help("Set role ROLE in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::TYPE)
+                .short("t")
+                .long(options::TYPE)
+                .takes_value(true)
+                .value_name("TYPE")
+                .help("Set type TYPE in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::RANGE)
+                .short("l")
+                .long(options::RANGE)
+                .takes_value(true)
+                .value_name("RANGE")
+                .help("Set range RANGE in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::RECURSIVE)
+                .short("R")
+                .long(options::RECURSIVE)
+                .help("Operate on files and directories recursively."),
+        )
+        .arg(
+            Arg::with_name(options::sym_links::FOLLOW_ARG_DIR_SYM_LINK)
+                .short("H")
+                .requires(options::RECURSIVE)
+                .overrides_with_all(&[
+                    options::sym_links::FOLLOW_DIR_SYM_LINKS,
+                    options::sym_links::NO_FOLLOW_SYM_LINKS,
+                ])
+                .help(
+                    "If a command line argument is a symbolic link to a directory, \
+                     traverse it. Only valid when -R is specified.",
+                ),
+        )
+        .arg(
+            Arg::with_name(options::sym_links::FOLLOW_DIR_SYM_LINKS)
+                .short("L")
+                .requires(options::RECURSIVE)
+                .overrides_with_all(&[
+                    options::sym_links::FOLLOW_ARG_DIR_SYM_LINK,
+                    options::sym_links::NO_FOLLOW_SYM_LINKS,
+                ])
+                .help(
+                    "Traverse every symbolic link to a directory encountered. \
+                     Only valid when -R is specified.",
+                ),
+        )
+        .arg(
+            Arg::with_name(options::sym_links::NO_FOLLOW_SYM_LINKS)
+                .short("P")
+                .requires(options::RECURSIVE)
+                .overrides_with_all(&[
+                    options::sym_links::FOLLOW_ARG_DIR_SYM_LINK,
+                    options::sym_links::FOLLOW_DIR_SYM_LINKS,
+                ])
+                .help(
+                    "Do not traverse any symbolic links (default). \
+                     Only valid when -R is specified.",
+                ),
+        )
+        .arg(
+            Arg::with_name(options::VERBOSE)
+                .short("v")
+                .long(options::VERBOSE)
+                .help("Output a diagnostic for every file processed."),
+        )
+        .arg(Arg::with_name("FILE").multiple(true).min_values(1))
+}
+
+#[derive(Debug)]
+struct Options {
+    verbose: bool,
+    preserve_root: bool,
+    recursive_mode: RecursiveMode,
+    affect_symlink_referent: bool,
+    mode: CommandLineMode,
+    files: Vec<PathBuf>,
+}
+
+fn parse_command_line(config: clap::App, args: impl uucore::Args) -> Result<Options> {
+    let matches = config.get_matches_from_safe(args)?;
+
+    let verbose = matches.is_present(options::VERBOSE);
+
+    let (recursive_mode, affect_symlink_referent) = if matches.is_present(options::RECURSIVE) {
+        if matches.is_present(options::sym_links::FOLLOW_DIR_SYM_LINKS) {
+            if matches.is_present(options::dereference::NO_DEREFERENCE) {
+                return Err(Error::ArgumentsMismatch(format!(
+                    "'--{}' with '--{}' require '-P'",
+                    options::RECURSIVE,
+                    options::dereference::NO_DEREFERENCE
+                )));
+            }
+
+            (RecursiveMode::RecursiveAndFollowAllDirSymLinks, true)
+        } else if matches.is_present(options::sym_links::FOLLOW_ARG_DIR_SYM_LINK) {
+            if matches.is_present(options::dereference::NO_DEREFERENCE) {
+                return Err(Error::ArgumentsMismatch(format!(
+                    "'--{}' with '--{}' require '-P'",
+                    options::RECURSIVE,
+                    options::dereference::NO_DEREFERENCE
+                )));
+            }
+
+            (RecursiveMode::RecursiveAndFollowArgDirSymLinks, true)
+        } else {
+            if matches.is_present(options::dereference::DEREFERENCE) {
+                return Err(Error::ArgumentsMismatch(format!(
+                    "'--{}' with '--{}' require either '-H' or '-L'",
+                    options::RECURSIVE,
+                    options::dereference::DEREFERENCE
+                )));
+            }
+
+            (RecursiveMode::RecursiveButDoNotFollowSymLinks, false)
+        }
+    } else {
+        let no_dereference = matches.is_present(options::dereference::NO_DEREFERENCE);
+        (RecursiveMode::NotRecursive, !no_dereference)
+    };
+
+    // By default, do not preserve root.
+    let preserve_root = matches.is_present(options::preserve_root::PRESERVE_ROOT);
+
+    let mut files = matches.values_of_os("FILE").unwrap_or_default();
+
+    let mode = if let Some(path) = matches.value_of_os(options::REFERENCE) {
+        CommandLineMode::ReferenceBased {
+            reference: PathBuf::from(path),
+        }
+    } else if matches.is_present(options::USER)
+        || matches.is_present(options::ROLE)
+        || matches.is_present(options::TYPE)
+        || matches.is_present(options::RANGE)
+    {
+        CommandLineMode::Custom {
+            user: matches.value_of_os(options::USER).map(Into::into),
+            role: matches.value_of_os(options::ROLE).map(Into::into),
+            the_type: matches.value_of_os(options::TYPE).map(Into::into),
+            range: matches.value_of_os(options::RANGE).map(Into::into),
+        }
+    } else if let Some(context) = files.next() {
+        CommandLineMode::ContextBased {
+            context: context.into(),
+        }
+    } else {
+        return Err(Error::MissingContext);
+    };
+
+    let files: Vec<_> = files.map(PathBuf::from).collect();
+    if files.is_empty() {
+        return Err(Error::MissingFiles);
+    }
+
+    Ok(Options {
+        verbose,
+        preserve_root,
+        recursive_mode,
+        affect_symlink_referent,
+        mode,
+        files,
+    })
+}
+
+#[derive(Debug, Copy, Clone)]
+enum RecursiveMode {
+    NotRecursive,
+    /// Do not traverse any symbolic links.
+    RecursiveButDoNotFollowSymLinks,
+    /// Traverse every symbolic link to a directory encountered.
+    RecursiveAndFollowAllDirSymLinks,
+    /// If a command line argument is a symbolic link to a directory, traverse it.
+    RecursiveAndFollowArgDirSymLinks,
+}
+
+impl RecursiveMode {
+    fn is_recursive(self) -> bool {
+        match self {
+            RecursiveMode::NotRecursive => false,
+
+            RecursiveMode::RecursiveButDoNotFollowSymLinks
+            | RecursiveMode::RecursiveAndFollowAllDirSymLinks
+            | RecursiveMode::RecursiveAndFollowArgDirSymLinks => true,
+        }
+    }
+
+    fn fts_open_options(self) -> c_int {
+        match self {
+            RecursiveMode::NotRecursive | RecursiveMode::RecursiveButDoNotFollowSymLinks => {
+                fts_sys::FTS_PHYSICAL
+            }
+
+            RecursiveMode::RecursiveAndFollowAllDirSymLinks => fts_sys::FTS_LOGICAL,
+
+            RecursiveMode::RecursiveAndFollowArgDirSymLinks => {
+                fts_sys::FTS_PHYSICAL | fts_sys::FTS_COMFOLLOW
+            }
+        }
+    }
+}
+
+#[derive(Debug)]
+enum CommandLineMode {
+    ReferenceBased {
+        reference: PathBuf,
+    },
+    ContextBased {
+        context: OsString,
+    },
+    Custom {
+        user: Option<OsString>,
+        role: Option<OsString>,
+        the_type: Option<OsString>,
+        range: Option<OsString>,
+    },
+}
+
+fn process_files(
+    options: &Options,
+    context: &SELinuxSecurityContext,
+    root_dev_ino: Option<(libc::ino_t, libc::dev_t)>,
+) -> Vec<Error> {
+    let fts_options = options.recursive_mode.fts_open_options();
+    let mut fts = match fts::FTS::new(options.files.iter(), fts_options) {
+        Ok(fts) => fts,
+        Err(err) => return vec![err],
+    };
+
+    let mut errors = Vec::default();
+    loop {
+        match fts.read_next_entry() {
+            Ok(true) => {
+                if let Err(err) = process_file(options, context, &mut fts, root_dev_ino) {
+                    errors.push(err);
+                }
+            }
+
+            Ok(false) => break,
+
+            Err(err) => {
+                errors.push(err);
+                break;
+            }
+        }
+    }
+    errors
+}
+
+fn process_file(
+    options: &Options,
+    context: &SELinuxSecurityContext,
+    fts: &mut fts::FTS,
+    root_dev_ino: Option<(libc::ino_t, libc::dev_t)>,
+) -> Result<()> {
+    let mut entry = fts.last_entry_ref().unwrap();
+
+    let file_full_name = entry.path().map(PathBuf::from).ok_or_else(|| {
+        Error::from_io("File name validation", io::ErrorKind::InvalidInput.into())
+    })?;
+
+    let fts_access_path = entry.access_path().ok_or_else(|| {
+        let err = io::ErrorKind::InvalidInput.into();
+        Error::from_io1("File name validation", &file_full_name, err)
+    })?;
+
+    let err = |s, k: io::ErrorKind| Error::from_io1(s, &file_full_name, k.into());
+
+    let fts_err = |s| {
+        let r = io::Error::from_raw_os_error(entry.errno());
+        Err(Error::from_io1(s, &file_full_name, r))
+    };
+
+    // SAFETY: If `entry.fts_statp` is not null, then is is assumed to be valid.
+    let file_dev_ino = if let Some(stat) = entry.stat() {
+        (stat.st_ino, stat.st_dev)
+    } else {
+        return Err(err("Getting meta data", io::ErrorKind::InvalidInput));
+    };
+
+    let mut result = Ok(());
+
+    match entry.flags() {
+        fts_sys::FTS_D => {
+            if options.recursive_mode.is_recursive() {
+                if root_dev_ino_check(root_dev_ino, file_dev_ino) {
+                    // This happens e.g., with "chcon -R --preserve-root ... /"
+                    // and with "chcon -RH --preserve-root ... symlink-to-root".
+                    root_dev_ino_warn(&file_full_name);
+
+                    // Tell fts not to traverse into this hierarchy.
+                    let _ignored = fts.set(fts_sys::FTS_SKIP);
+
+                    // Ensure that we do not process "/" on the second visit.
+                    let _ignored = fts.read_next_entry();
+
+                    return Err(err("Modifying root path", io::ErrorKind::PermissionDenied));
+                }
+
+                return Ok(());
+            }
+        }
+
+        fts_sys::FTS_DP => {
+            if !options.recursive_mode.is_recursive() {
+                return Ok(());
+            }
+        }
+
+        fts_sys::FTS_NS => {
+            // For a top-level file or directory, this FTS_NS (stat failed) indicator is determined
+            // at the time of the initial fts_open call. With programs like chmod, chown, and chgrp,
+            // that modify permissions, it is possible that the file in question is accessible when
+            // control reaches this point. So, if this is the first time we've seen the FTS_NS for
+            // this file, tell fts_read to stat it "again".
+            if entry.level() == 0 && entry.number() == 0 {
+                entry.set_number(1);
+                let _ignored = fts.set(fts_sys::FTS_AGAIN);
+                return Ok(());
+            }
+
+            result = fts_err("Accessing");
+        }
+
+        fts_sys::FTS_ERR => result = fts_err("Accessing"),
+
+        fts_sys::FTS_DNR => result = fts_err("Reading directory"),
+
+        fts_sys::FTS_DC => {
+            if cycle_warning_required(options.recursive_mode.fts_open_options(), &entry) {
+                emit_cycle_warning(&file_full_name);
+                return Err(err("Reading cyclic directory", io::ErrorKind::InvalidData));
+            }
+        }
+
+        _ => {}
+    }
+
+    if entry.flags() == fts_sys::FTS_DP
+        && result.is_ok()
+        && root_dev_ino_check(root_dev_ino, file_dev_ino)
+    {
+        root_dev_ino_warn(&file_full_name);
+        result = Err(err("Modifying root path", io::ErrorKind::PermissionDenied));
+    }
+
+    if result.is_ok() {
+        if options.verbose {
+            println!(
+                "{}: Changing security context of: {}",
+                uucore::util_name(),
+                file_full_name.quote()
+            );
+        }
+
+        result = change_file_context(options, context, fts_access_path);
+    }
+
+    if !options.recursive_mode.is_recursive() {
+        let _ignored = fts.set(fts_sys::FTS_SKIP);
+    }
+    result
+}
+
+fn change_file_context(
+    options: &Options,
+    context: &SELinuxSecurityContext,
+    path: &Path,
+) -> Result<()> {
+    match &options.mode {
+        CommandLineMode::Custom {
+            user,
+            role,
+            the_type,
+            range,
+        } => {
+            let err0 = || -> Result<()> {
+                // If the file doesn't have a context, and we're not setting all of the context
+                // components, there isn't really an obvious default. Thus, we just give up.
+                let op = "Applying partial security context to unlabeled file";
+                let err = io::ErrorKind::InvalidInput.into();
+                Err(Error::from_io1(op, path, err))
+            };
+
+            let file_context =
+                match SecurityContext::of_path(path, options.affect_symlink_referent, false) {
+                    Ok(Some(context)) => context,
+
+                    Ok(None) => return err0(),
+                    Err(r) => return Err(Error::from_selinux("Getting security context", r)),
+                };
+
+            let c_file_context = match file_context.to_c_string() {
+                Ok(Some(context)) => context,
+
+                Ok(None) => return err0(),
+                Err(r) => return Err(Error::from_selinux("Getting security context", r)),
+            };
+
+            let se_context =
+                OpaqueSecurityContext::from_c_str(c_file_context.as_ref()).map_err(|_r| {
+                    let err = io::ErrorKind::InvalidInput.into();
+                    Error::from_io1("Creating security context", path, err)
+                })?;
+
+            type SetValueProc = fn(&OpaqueSecurityContext, &CStr) -> selinux::errors::Result<()>;
+
+            let list: &[(&Option<OsString>, SetValueProc)] = &[
+                (user, OpaqueSecurityContext::set_user),
+                (role, OpaqueSecurityContext::set_role),
+                (the_type, OpaqueSecurityContext::set_type),
+                (range, OpaqueSecurityContext::set_range),
+            ];
+
+            for (new_value, set_value_proc) in list {
+                if let Some(new_value) = new_value {
+                    let c_new_value = os_str_to_c_string(new_value).map_err(|_r| {
+                        let err = io::ErrorKind::InvalidInput.into();
+                        Error::from_io1("Creating security context", path, err)
+                    })?;
+
+                    set_value_proc(&se_context, &c_new_value)
+                        .map_err(|r| Error::from_selinux("Setting security context user", r))?;
+                }
+            }
+
+            let context_string = se_context
+                .to_c_string()
+                .map_err(|r| Error::from_selinux("Getting security context", r))?;
+
+            if c_file_context.as_ref().to_bytes() == context_string.as_ref().to_bytes() {
+                Ok(()) // Nothing to change.
+            } else {
+                SecurityContext::from_c_str(&context_string, false)
+                    .set_for_path(path, options.affect_symlink_referent, false)
+                    .map_err(|r| Error::from_selinux("Setting security context", r))
+            }
+        }
+
+        CommandLineMode::ReferenceBased { .. } | CommandLineMode::ContextBased { .. } => {
+            if let Some(c_context) = context.to_c_string()? {
+                SecurityContext::from_c_str(c_context.as_ref(), false)
+                    .set_for_path(path, options.affect_symlink_referent, false)
+                    .map_err(|r| Error::from_selinux("Setting security context", r))
+            } else {
+                let err = io::ErrorKind::InvalidInput.into();
+                Err(Error::from_io1("Setting security context", path, err))
+            }
+        }
+    }
+}
+
+#[cfg(unix)]
+pub(crate) fn os_str_to_c_string(s: &OsStr) -> Result<CString> {
+    use std::os::unix::ffi::OsStrExt;
+
+    CString::new(s.as_bytes())
+        .map_err(|_r| Error::from_io("CString::new()", io::ErrorKind::InvalidInput.into()))
+}
+
+/// Call `lstat()` to get the device and inode numbers for `/`.
+#[cfg(unix)]
+fn get_root_dev_ino() -> Result<(libc::ino_t, libc::dev_t)> {
+    use std::os::unix::fs::MetadataExt;
+
+    fs::symlink_metadata("/")
+        .map(|md| (md.ino(), md.dev()))
+        .map_err(|r| Error::from_io1("std::fs::symlink_metadata", "/", r))
+}
+
+fn root_dev_ino_check(
+    root_dev_ino: Option<(libc::ino_t, libc::dev_t)>,
+    dir_dev_ino: (libc::ino_t, libc::dev_t),
+) -> bool {
+    root_dev_ino.map_or(false, |root_dev_ino| root_dev_ino == dir_dev_ino)
+}
+
+fn root_dev_ino_warn(dir_name: &Path) {
+    if dir_name.as_os_str() == "/" {
+        show_warning!(
+            "It is dangerous to operate recursively on '/'. \
+             Use --{} to override this failsafe.",
+            options::preserve_root::NO_PRESERVE_ROOT,
+        );
+    } else {
+        show_warning!(
+            "It is dangerous to operate recursively on {} (same as '/'). \
+             Use --{} to override this failsafe.",
+            dir_name.quote(),
+            options::preserve_root::NO_PRESERVE_ROOT,
+        );
+    }
+}
+
+// When fts_read returns FTS_DC to indicate a directory cycle, it may or may not indicate
+// a real problem.
+// When a program like chgrp performs a recursive traversal that requires traversing symbolic links,
+// it is *not* a problem.
+// However, when invoked with "-P -R", it deserves a warning.
+// The fts_options parameter records the options that control this aspect of fts's behavior,
+// so test that.
+fn cycle_warning_required(fts_options: c_int, entry: &fts::EntryRef) -> bool {
+    // When dereferencing no symlinks, or when dereferencing only those listed on the command line
+    // and we're not processing a command-line argument, then a cycle is a serious problem.
+    ((fts_options & fts_sys::FTS_PHYSICAL) != 0)
+        && (((fts_options & fts_sys::FTS_COMFOLLOW) == 0) || entry.level() != 0)
+}
+
+fn emit_cycle_warning(file_name: &Path) {
+    show_warning!(
+        "Circular directory structure.\n\
+This almost certainly means that you have a corrupted file system.\n\
+NOTIFY YOUR SYSTEM MANAGER.\n\
+The following directory is part of the cycle {}.",
+        file_name.quote()
+    )
+}
+
+#[derive(Debug)]
+enum SELinuxSecurityContext<'t> {
+    File(SecurityContext<'t>),
+    String(Option<CString>),
+}
+
+impl<'t> SELinuxSecurityContext<'t> {
+    fn to_c_string(&self) -> Result<Option<Cow<CStr>>> {
+        match self {
+            Self::File(context) => context
+                .to_c_string()
+                .map_err(|r| Error::from_selinux("SELinuxSecurityContext::to_c_string()", r)),
+
+            Self::String(context) => Ok(context.as_deref().map(Cow::Borrowed)),
+        }
+    }
+}
diff --git a/src/uu/chcon/src/errors.rs b/src/uu/chcon/src/errors.rs
new file mode 100644
index 000000000..2d8f72e67
--- /dev/null
+++ b/src/uu/chcon/src/errors.rs
@@ -0,0 +1,73 @@
+use std::ffi::OsString;
+use std::fmt::Write;
+use std::io;
+
+use uucore::display::Quotable;
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
+
+#[derive(thiserror::Error, Debug)]
+pub(crate) enum Error {
+    #[error("No context is specified")]
+    MissingContext,
+
+    #[error("No files are specified")]
+    MissingFiles,
+
+    #[error("{0}")]
+    ArgumentsMismatch(String),
+
+    #[error(transparent)]
+    CommandLine(#[from] clap::Error),
+
+    #[error("{operation} failed")]
+    SELinux {
+        operation: &'static str,
+        source: selinux::errors::Error,
+    },
+
+    #[error("{operation} failed")]
+    Io {
+        operation: &'static str,
+        source: io::Error,
+    },
+
+    #[error("{operation} failed on {}", .operand1.quote())]
+    Io1 {
+        operation: &'static str,
+        operand1: OsString,
+        source: io::Error,
+    },
+}
+
+impl Error {
+    pub(crate) fn from_io(operation: &'static str, source: io::Error) -> Self {
+        Self::Io { operation, source }
+    }
+
+    pub(crate) fn from_io1(
+        operation: &'static str,
+        operand1: impl Into<OsString>,
+        source: io::Error,
+    ) -> Self {
+        Self::Io1 {
+            operation,
+            operand1: operand1.into(),
+            source,
+        }
+    }
+
+    pub(crate) fn from_selinux(operation: &'static str, source: selinux::errors::Error) -> Self {
+        Self::SELinux { operation, source }
+    }
+}
+
+pub(crate) fn report_full_error(mut err: &dyn std::error::Error) -> String {
+    let mut desc = String::with_capacity(256);
+    write!(&mut desc, "{}", err).unwrap();
+    while let Some(source) = err.source() {
+        err = source;
+        write!(&mut desc, ". {}", err).unwrap();
+    }
+    desc
+}
diff --git a/src/uu/chcon/src/fts.rs b/src/uu/chcon/src/fts.rs
new file mode 100644
index 000000000..89dd6184d
--- /dev/null
+++ b/src/uu/chcon/src/fts.rs
@@ -0,0 +1,193 @@
+use std::ffi::{CStr, CString, OsStr};
+use std::marker::PhantomData;
+use std::os::raw::{c_int, c_long, c_short};
+use std::path::Path;
+use std::ptr::NonNull;
+use std::{io, iter, ptr, slice};
+
+use crate::errors::{Error, Result};
+use crate::os_str_to_c_string;
+
+#[derive(Debug)]
+pub(crate) struct FTS {
+    fts: ptr::NonNull<fts_sys::FTS>,
+
+    entry: Option<ptr::NonNull<fts_sys::FTSENT>>,
+    _phantom_data: PhantomData<fts_sys::FTSENT>,
+}
+
+impl FTS {
+    pub(crate) fn new<I>(paths: I, options: c_int) -> Result<Self>
+    where
+        I: IntoIterator,
+        I::Item: AsRef<OsStr>,
+    {
+        let files_paths: Vec<CString> = paths
+            .into_iter()
+            .map(|s| os_str_to_c_string(s.as_ref()))
+            .collect::<Result<_>>()?;
+
+        if files_paths.is_empty() {
+            return Err(Error::from_io(
+                "FTS::new()",
+                io::ErrorKind::InvalidInput.into(),
+            ));
+        }
+
+        let path_argv: Vec<_> = files_paths
+            .iter()
+            .map(CString::as_ref)
+            .map(CStr::as_ptr)
+            .chain(iter::once(ptr::null()))
+            .collect();
+
+        // SAFETY: We assume calling fts_open() is safe:
+        // - `path_argv` is an array holding at least one path, and null-terminated.
+        // - `compar` is None.
+        let fts = unsafe { fts_sys::fts_open(path_argv.as_ptr().cast(), options, None) };
+
+        let fts = ptr::NonNull::new(fts)
+            .ok_or_else(|| Error::from_io("fts_open()", io::Error::last_os_error()))?;
+
+        Ok(Self {
+            fts,
+            entry: None,
+            _phantom_data: PhantomData,
+        })
+    }
+
+    pub(crate) fn last_entry_ref(&mut self) -> Option<EntryRef> {
+        self.entry.map(move |entry| EntryRef::new(self, entry))
+    }
+
+    pub(crate) fn read_next_entry(&mut self) -> Result<bool> {
+        // SAFETY: We assume calling fts_read() is safe with a non-null `fts`
+        // pointer assumed to be valid.
+        let new_entry = unsafe { fts_sys::fts_read(self.fts.as_ptr()) };
+
+        self.entry = NonNull::new(new_entry);
+        if self.entry.is_none() {
+            let r = io::Error::last_os_error();
+            if let Some(0) = r.raw_os_error() {
+                Ok(false)
+            } else {
+                Err(Error::from_io("fts_read()", r))
+            }
+        } else {
+            Ok(true)
+        }
+    }
+
+    pub(crate) fn set(&mut self, instr: c_int) -> Result<()> {
+        let fts = self.fts.as_ptr();
+        let entry = self
+            .entry
+            .ok_or_else(|| Error::from_io("FTS::set()", io::ErrorKind::UnexpectedEof.into()))?;
+
+        // SAFETY: We assume calling fts_set() is safe with non-null `fts`
+        // and `entry` pointers assumed to be valid.
+        if unsafe { fts_sys::fts_set(fts, entry.as_ptr(), instr) } == -1 {
+            Err(Error::from_io("fts_set()", io::Error::last_os_error()))
+        } else {
+            Ok(())
+        }
+    }
+}
+
+impl Drop for FTS {
+    fn drop(&mut self) {
+        // SAFETY: We assume calling fts_close() is safe with a non-null `fts`
+        // pointer assumed to be valid.
+        unsafe { fts_sys::fts_close(self.fts.as_ptr()) };
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct EntryRef<'fts> {
+    pub(crate) pointer: ptr::NonNull<fts_sys::FTSENT>,
+
+    _fts: PhantomData<&'fts FTS>,
+    _phantom_data: PhantomData<fts_sys::FTSENT>,
+}
+
+impl<'fts> EntryRef<'fts> {
+    fn new(_fts: &'fts FTS, entry: ptr::NonNull<fts_sys::FTSENT>) -> Self {
+        Self {
+            pointer: entry,
+            _fts: PhantomData,
+            _phantom_data: PhantomData,
+        }
+    }
+
+    fn as_ref(&self) -> &fts_sys::FTSENT {
+        // SAFETY: `self.pointer` is a non-null pointer that is assumed to be valid.
+        unsafe { self.pointer.as_ref() }
+    }
+
+    fn as_mut(&mut self) -> &mut fts_sys::FTSENT {
+        // SAFETY: `self.pointer` is a non-null pointer that is assumed to be valid.
+        unsafe { self.pointer.as_mut() }
+    }
+
+    pub(crate) fn flags(&self) -> c_int {
+        c_int::from(self.as_ref().fts_info)
+    }
+
+    pub(crate) fn errno(&self) -> c_int {
+        self.as_ref().fts_errno
+    }
+
+    pub(crate) fn level(&self) -> c_short {
+        self.as_ref().fts_level
+    }
+
+    pub(crate) fn number(&self) -> c_long {
+        self.as_ref().fts_number
+    }
+
+    pub(crate) fn set_number(&mut self, new_number: c_long) {
+        self.as_mut().fts_number = new_number;
+    }
+
+    pub(crate) fn path(&self) -> Option<&Path> {
+        let entry = self.as_ref();
+        if entry.fts_pathlen == 0 {
+            return None;
+        }
+
+        NonNull::new(entry.fts_path)
+            .map(|path_ptr| {
+                let path_size = usize::from(entry.fts_pathlen).saturating_add(1);
+
+                // SAFETY: `entry.fts_path` is a non-null pointer that is assumed to be valid.
+                unsafe { slice::from_raw_parts(path_ptr.as_ptr().cast(), path_size) }
+            })
+            .and_then(|bytes| CStr::from_bytes_with_nul(bytes).ok())
+            .map(c_str_to_os_str)
+            .map(Path::new)
+    }
+
+    pub(crate) fn access_path(&self) -> Option<&Path> {
+        ptr::NonNull::new(self.as_ref().fts_accpath)
+            .map(|path_ptr| {
+                // SAFETY: `entry.fts_accpath` is a non-null pointer that is assumed to be valid.
+                unsafe { CStr::from_ptr(path_ptr.as_ptr()) }
+            })
+            .map(c_str_to_os_str)
+            .map(Path::new)
+    }
+
+    pub(crate) fn stat(&self) -> Option<&libc::stat> {
+        ptr::NonNull::new(self.as_ref().fts_statp).map(|stat_ptr| {
+            // SAFETY: `entry.fts_statp` is a non-null pointer that is assumed to be valid.
+            unsafe { stat_ptr.as_ref() }
+        })
+    }
+}
+
+#[cfg(unix)]
+fn c_str_to_os_str(s: &CStr) -> &OsStr {
+    use std::os::unix::ffi::OsStrExt;
+
+    OsStr::from_bytes(s.to_bytes())
+}
diff --git a/src/uu/chcon/src/main.rs b/src/uu/chcon/src/main.rs
new file mode 100644
index 000000000..e23b34c5b
--- /dev/null
+++ b/src/uu/chcon/src/main.rs
@@ -0,0 +1 @@
+uucore_procs::main!(uu_chcon);
diff --git a/src/uu/chgrp/Cargo.toml b/src/uu/chgrp/Cargo.toml
index 5a2591f56..acc03472c 100644
--- a/src/uu/chgrp/Cargo.toml
+++ b/src/uu/chgrp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_chgrp"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "chgrp ~ (uutils) change the group ownership of FILE"
@@ -16,9 +16,8 @@ path = "src/chgrp.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
-walkdir = "2.2"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "chgrp"
diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs
index 489be59eb..c70e5e5c7 100644
--- a/src/uu/chgrp/src/chgrp.rs
+++ b/src/uu/chgrp/src/chgrp.rs
@@ -5,200 +5,67 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) COMFOLLOW Chgrper RFILE RFILE's derefer dgid nonblank nonprint nonprinting
+// spell-checker:ignore (ToDO) COMFOLLOW Chowner RFILE RFILE's derefer dgid nonblank nonprint nonprinting
 
-#[macro_use]
-extern crate uucore;
+use uucore::display::Quotable;
 pub use uucore::entries;
-use uucore::fs::resolve_relative_path;
-use uucore::libc::gid_t;
-use uucore::perms::{wrap_chgrp, Verbosity};
+use uucore::error::{FromIo, UResult, USimpleError};
+use uucore::perms::{chown_base, options, IfFrom};
 
-use clap::{App, Arg};
-
-extern crate walkdir;
-use walkdir::WalkDir;
+use clap::{App, Arg, ArgMatches};
 
 use std::fs;
-use std::fs::Metadata;
 use std::os::unix::fs::MetadataExt;
 
-use std::path::Path;
-use uucore::InvalidEncodingHandling;
-
 static ABOUT: &str = "Change the group of each FILE to GROUP.";
 static VERSION: &str = env!("CARGO_PKG_VERSION");
 
-pub mod options {
-    pub mod verbosity {
-        pub static CHANGES: &str = "changes";
-        pub static QUIET: &str = "quiet";
-        pub static SILENT: &str = "silent";
-        pub static VERBOSE: &str = "verbose";
-    }
-    pub mod preserve_root {
-        pub static PRESERVE: &str = "preserve-root";
-        pub static NO_PRESERVE: &str = "no-preserve-root";
-    }
-    pub mod dereference {
-        pub static DEREFERENCE: &str = "dereference";
-        pub static NO_DEREFERENCE: &str = "no-dereference";
-    }
-    pub static RECURSIVE: &str = "recursive";
-    pub mod traverse {
-        pub static TRAVERSE: &str = "H";
-        pub static NO_TRAVERSE: &str = "P";
-        pub static EVERY: &str = "L";
-    }
-    pub static REFERENCE: &str = "reference";
-    pub static ARG_GROUP: &str = "GROUP";
-    pub static ARG_FILES: &str = "FILE";
-}
-
-const FTS_COMFOLLOW: u8 = 1;
-const FTS_PHYSICAL: u8 = 1 << 1;
-const FTS_LOGICAL: u8 = 1 << 2;
-
 fn get_usage() -> String {
     format!(
         "{0} [OPTION]... GROUP FILE...\n    {0} [OPTION]... --reference=RFILE FILE...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let args = args
-        .collect_str(InvalidEncodingHandling::ConvertLossy)
-        .accept_any();
-
-    let usage = get_usage();
-
-    let mut app = uu_app().usage(&usage[..]);
-
-    // we change the positional args based on whether
-    // --reference was used.
-    let mut reference = false;
-    let mut help = false;
-    // stop processing options on --
-    for arg in args.iter().take_while(|s| *s != "--") {
-        if arg.starts_with("--reference=") || arg == "--reference" {
-            reference = true;
-        } else if arg == "--help" {
-            // we stop processing once we see --help,
-            // as it doesn't matter if we've seen reference or not
-            help = true;
-            break;
-        }
-    }
-
-    if help || !reference {
-        // add both positional arguments
-        app = app.arg(
-            Arg::with_name(options::ARG_GROUP)
-                .value_name(options::ARG_GROUP)
-                .required(true)
-                .takes_value(true)
-                .multiple(false),
-        )
-    }
-    app = app.arg(
-        Arg::with_name(options::ARG_FILES)
-            .value_name(options::ARG_FILES)
-            .multiple(true)
-            .takes_value(true)
-            .required(true)
-            .min_values(1),
-    );
-
-    let matches = app.get_matches_from(args);
-
-    /* Get the list of files */
-    let files: Vec<String> = matches
-        .values_of(options::ARG_FILES)
-        .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_default();
-
-    let preserve_root = matches.is_present(options::preserve_root::PRESERVE);
-
-    let mut derefer = if matches.is_present(options::dereference::DEREFERENCE) {
-        1
-    } else if matches.is_present(options::dereference::NO_DEREFERENCE) {
-        0
-    } else {
-        -1
-    };
-
-    let mut bit_flag = if matches.is_present(options::traverse::TRAVERSE) {
-        FTS_COMFOLLOW | FTS_PHYSICAL
-    } else if matches.is_present(options::traverse::EVERY) {
-        FTS_LOGICAL
-    } else {
-        FTS_PHYSICAL
-    };
-
-    let recursive = matches.is_present(options::RECURSIVE);
-    if recursive {
-        if bit_flag == FTS_PHYSICAL {
-            if derefer == 1 {
-                show_error!("-R --dereference requires -H or -L");
-                return 1;
-            }
-            derefer = 0;
-        }
-    } else {
-        bit_flag = FTS_PHYSICAL;
-    }
-
-    let verbosity = if matches.is_present(options::verbosity::CHANGES) {
-        Verbosity::Changes
-    } else if matches.is_present(options::verbosity::SILENT)
-        || matches.is_present(options::verbosity::QUIET)
-    {
-        Verbosity::Silent
-    } else if matches.is_present(options::verbosity::VERBOSE) {
-        Verbosity::Verbose
-    } else {
-        Verbosity::Normal
-    };
-
-    let dest_gid: u32;
-    if let Some(file) = matches.value_of(options::REFERENCE) {
-        match fs::metadata(&file) {
-            Ok(meta) => {
-                dest_gid = meta.gid();
-            }
-            Err(e) => {
-                show_error!("failed to get attributes of '{}': {}", file, e);
-                return 1;
-            }
-        }
+fn parse_gid_and_uid(matches: &ArgMatches) -> UResult<(Option<u32>, Option<u32>, IfFrom)> {
+    let dest_gid = if let Some(file) = matches.value_of(options::REFERENCE) {
+        fs::metadata(&file)
+            .map(|meta| Some(meta.gid()))
+            .map_err_context(|| format!("failed to get attributes of {}", file.quote()))?
     } else {
         let group = matches.value_of(options::ARG_GROUP).unwrap_or_default();
-        match entries::grp2gid(group) {
-            Ok(g) => {
-                dest_gid = g;
-            }
-            _ => {
-                show_error!("invalid group: {}", group);
-                return 1;
+        if group.is_empty() {
+            None
+        } else {
+            match entries::grp2gid(group) {
+                Ok(g) => Some(g),
+                _ => {
+                    return Err(USimpleError::new(
+                        1,
+                        format!("invalid group: {}", group.quote()),
+                    ))
+                }
             }
         }
-    }
-
-    let executor = Chgrper {
-        bit_flag,
-        dest_gid,
-        verbosity,
-        recursive,
-        dereference: derefer != 0,
-        preserve_root,
-        files,
     };
-    executor.exec()
+    Ok((dest_gid, None, IfFrom::All))
+}
+
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = get_usage();
+
+    chown_base(
+        uu_app().usage(&usage[..]),
+        args,
+        options::ARG_GROUP,
+        parse_gid_and_uid,
+        true,
+    )
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(VERSION)
         .about(ABOUT)
         .arg(
@@ -276,170 +143,3 @@ pub fn uu_app() -> App<'static, 'static> {
                 .help("traverse every symbolic link to a directory encountered"),
         )
 }
-
-struct Chgrper {
-    dest_gid: gid_t,
-    bit_flag: u8,
-    verbosity: Verbosity,
-    files: Vec<String>,
-    recursive: bool,
-    preserve_root: bool,
-    dereference: bool,
-}
-
-macro_rules! unwrap {
-    ($m:expr, $e:ident, $err:block) => {
-        match $m {
-            Ok(meta) => meta,
-            Err($e) => $err,
-        }
-    };
-}
-
-impl Chgrper {
-    fn exec(&self) -> i32 {
-        let mut ret = 0;
-        for f in &self.files {
-            ret |= self.traverse(f);
-        }
-        ret
-    }
-
-    #[cfg(windows)]
-    fn is_bind_root<P: AsRef<Path>>(&self, root: P) -> bool {
-        // TODO: is there an equivalent on Windows?
-        false
-    }
-
-    #[cfg(unix)]
-    fn is_bind_root<P: AsRef<Path>>(&self, path: P) -> bool {
-        if let (Ok(given), Ok(root)) = (fs::metadata(path), fs::metadata("/")) {
-            given.dev() == root.dev() && given.ino() == root.ino()
-        } else {
-            // FIXME: not totally sure if it's okay to just ignore an error here
-            false
-        }
-    }
-
-    fn traverse<P: AsRef<Path>>(&self, root: P) -> i32 {
-        let follow_arg = self.dereference || self.bit_flag != FTS_PHYSICAL;
-        let path = root.as_ref();
-        let meta = match self.obtain_meta(path, follow_arg) {
-            Some(m) => m,
-            _ => return 1,
-        };
-
-        // Prohibit only if:
-        // (--preserve-root and -R present) &&
-        // (
-        //     (argument is not symlink && resolved to be '/') ||
-        //     (argument is symlink && should follow argument && resolved to be '/')
-        // )
-        if self.recursive && self.preserve_root {
-            let may_exist = if follow_arg {
-                path.canonicalize().ok()
-            } else {
-                let real = resolve_relative_path(path);
-                if real.is_dir() {
-                    Some(real.canonicalize().expect("failed to get real path"))
-                } else {
-                    Some(real.into_owned())
-                }
-            };
-
-            if let Some(p) = may_exist {
-                if p.parent().is_none() || self.is_bind_root(p) {
-                    show_error!("it is dangerous to operate recursively on '/'");
-                    show_error!("use --no-preserve-root to override this failsafe");
-                    return 1;
-                }
-            }
-        }
-
-        let ret = match wrap_chgrp(
-            path,
-            &meta,
-            self.dest_gid,
-            follow_arg,
-            self.verbosity.clone(),
-        ) {
-            Ok(n) => {
-                show_error!("{}", n);
-                0
-            }
-            Err(e) => {
-                if self.verbosity != Verbosity::Silent {
-                    show_error!("{}", e);
-                }
-                1
-            }
-        };
-
-        if !self.recursive {
-            ret
-        } else {
-            ret | self.dive_into(&root)
-        }
-    }
-
-    fn dive_into<P: AsRef<Path>>(&self, root: P) -> i32 {
-        let mut ret = 0;
-        let root = root.as_ref();
-        let follow = self.dereference || self.bit_flag & FTS_LOGICAL != 0;
-        for entry in WalkDir::new(root).follow_links(follow).min_depth(1) {
-            let entry = unwrap!(entry, e, {
-                ret = 1;
-                show_error!("{}", e);
-                continue;
-            });
-            let path = entry.path();
-            let meta = match self.obtain_meta(path, follow) {
-                Some(m) => m,
-                _ => {
-                    ret = 1;
-                    continue;
-                }
-            };
-
-            ret = match wrap_chgrp(path, &meta, self.dest_gid, follow, self.verbosity.clone()) {
-                Ok(n) => {
-                    if !n.is_empty() {
-                        show_error!("{}", n);
-                    }
-                    0
-                }
-                Err(e) => {
-                    if self.verbosity != Verbosity::Silent {
-                        show_error!("{}", e);
-                    }
-                    1
-                }
-            }
-        }
-
-        ret
-    }
-
-    fn obtain_meta<P: AsRef<Path>>(&self, path: P, follow: bool) -> Option<Metadata> {
-        use self::Verbosity::*;
-        let path = path.as_ref();
-        let meta = if follow {
-            unwrap!(path.metadata(), e, {
-                match self.verbosity {
-                    Silent => (),
-                    _ => show_error!("cannot access '{}': {}", path.display(), e),
-                }
-                return None;
-            })
-        } else {
-            unwrap!(path.symlink_metadata(), e, {
-                match self.verbosity {
-                    Silent => (),
-                    _ => show_error!("cannot dereference '{}': {}", path.display(), e),
-                }
-                return None;
-            })
-        };
-        Some(meta)
-    }
-}
diff --git a/src/uu/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml
index df150e0ed..64961e6dd 100644
--- a/src/uu/chmod/Cargo.toml
+++ b/src/uu/chmod/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_chmod"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "chmod ~ (uutils) change mode of FILE"
@@ -17,8 +17,8 @@ path = "src/chmod.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs", "mode"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs", "mode"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 walkdir = "2.2"
 
 [[bin]]
diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs
index d89827c97..68c55b4cb 100644
--- a/src/uu/chmod/src/chmod.rs
+++ b/src/uu/chmod/src/chmod.rs
@@ -14,6 +14,7 @@ use clap::{crate_version, App, Arg};
 use std::fs;
 use std::os::unix::fs::{MetadataExt, PermissionsExt};
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::fs::display_permissions_unix;
 use uucore::libc::mode_t;
 #[cfg(not(windows))]
@@ -36,12 +37,12 @@ mod options {
     pub const FILE: &str = "FILE";
 }
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... MODE[,MODE]... FILE...
 or: {0} [OPTION]... OCTAL-MODE FILE...
 or: {0} [OPTION]... --reference=RFILE FILE...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
@@ -56,9 +57,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     // Before we can parse 'args' with clap (and previously getopts),
     // a possible MODE prefix '-' needs to be removed (e.g. "chmod -x FILE").
-    let mode_had_minus_prefix = strip_minus_from_mode(&mut args);
+    let mode_had_minus_prefix = mode::strip_minus_from_mode(&mut args);
 
-    let usage = get_usage();
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -75,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .value_of(options::REFERENCE)
         .and_then(|fref| match fs::metadata(fref) {
             Ok(meta) => Some(meta.mode()),
-            Err(err) => crash!(1, "cannot stat attributes of '{}': {}", fref, err),
+            Err(err) => crash!(1, "cannot stat attributes of {}: {}", fref.quote(), err),
         });
     let modes = matches.value_of(options::MODE).unwrap(); // should always be Some because required
     let cmode = if mode_had_minus_prefix {
@@ -98,6 +99,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         Some(cmode)
     };
 
+    if files.is_empty() {
+        crash!(1, "missing operand");
+    }
+
     let chmoder = Chmoder {
         changes,
         quiet,
@@ -116,7 +121,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -175,27 +180,6 @@ pub fn uu_app() -> App<'static, 'static> {
         )
 }
 
-// Iterate 'args' and delete the first occurrence
-// of a prefix '-' if it's associated with MODE
-// e.g. "chmod -v -xw -R FILE" -> "chmod -v xw -R FILE"
-pub fn strip_minus_from_mode(args: &mut Vec<String>) -> bool {
-    for arg in args {
-        if arg.starts_with('-') {
-            if let Some(second) = arg.chars().nth(1) {
-                match second {
-                    'r' | 'w' | 'x' | 'X' | 's' | 't' | 'u' | 'g' | 'o' | '0'..='7' => {
-                        // TODO: use strip_prefix() once minimum rust version reaches 1.45.0
-                        *arg = arg[1..arg.len()].to_string();
-                        return true;
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-    false
-}
-
 struct Chmoder {
     changes: bool,
     quiet: bool,
@@ -216,21 +200,24 @@ impl Chmoder {
             if !file.exists() {
                 if is_symlink(file) {
                     println!(
-                        "failed to change mode of '{}' from 0000 (---------) to 0000 (---------)",
-                        filename
+                        "failed to change mode of {} from 0000 (---------) to 0000 (---------)",
+                        filename.quote()
                     );
                     if !self.quiet {
-                        show_error!("cannot operate on dangling symlink '{}'", filename);
+                        show_error!("cannot operate on dangling symlink {}", filename.quote());
                     }
-                } else {
-                    show_error!("cannot access '{}': No such file or directory", filename);
+                } else if !self.quiet {
+                    show_error!(
+                        "cannot access {}: No such file or directory",
+                        filename.quote()
+                    );
                 }
                 return Err(1);
             }
             if self.recursive && self.preserve_root && filename == "/" {
                 show_error!(
-                    "it is dangerous to operate recursively on '{}'\nuse --no-preserve-root to override this failsafe",
-                    filename
+                    "it is dangerous to operate recursively on {}\nuse --no-preserve-root to override this failsafe",
+                    filename.quote()
                 );
                 return Err(1);
             }
@@ -253,23 +240,27 @@ impl Chmoder {
         // instead it just sets the readonly attribute on the file
         Err(0)
     }
-    #[cfg(any(unix, target_os = "redox"))]
+    #[cfg(unix)]
     fn chmod_file(&self, file: &Path) -> Result<(), i32> {
-        let mut fperm = match fs::metadata(file) {
+        use uucore::mode::get_umask;
+
+        let fperm = match fs::metadata(file) {
             Ok(meta) => meta.mode() & 0o7777,
             Err(err) => {
                 if is_symlink(file) {
                     if self.verbose {
                         println!(
-                            "neither symbolic link '{}' nor referent has been changed",
-                            file.display()
+                            "neither symbolic link {} nor referent has been changed",
+                            file.quote()
                         );
                     }
                     return Ok(());
                 } else if err.kind() == std::io::ErrorKind::PermissionDenied {
-                    show_error!("'{}': Permission denied", file.display());
+                    // These two filenames would normally be conditionally
+                    // quoted, but GNU's tests expect them to always be quoted
+                    show_error!("{}: Permission denied", file.quote());
                 } else {
-                    show_error!("'{}': {}", file.display(), err);
+                    show_error!("{}: {}", file.quote(), err);
                 }
                 return Err(1);
             }
@@ -278,18 +269,30 @@ impl Chmoder {
             Some(mode) => self.change_file(fperm, mode, file)?,
             None => {
                 let cmode_unwrapped = self.cmode.clone().unwrap();
+                let mut new_mode = fperm;
+                let mut naively_expected_new_mode = new_mode;
                 for mode in cmode_unwrapped.split(',') {
                     // cmode is guaranteed to be Some in this case
                     let arr: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
                     let result = if mode.contains(arr) {
-                        mode::parse_numeric(fperm, mode)
+                        mode::parse_numeric(new_mode, mode, file.is_dir()).map(|v| (v, v))
                     } else {
-                        mode::parse_symbolic(fperm, mode, file.is_dir())
+                        mode::parse_symbolic(new_mode, mode, get_umask(), file.is_dir()).map(|m| {
+                            // calculate the new mode as if umask was 0
+                            let naive_mode = mode::parse_symbolic(
+                                naively_expected_new_mode,
+                                mode,
+                                0,
+                                file.is_dir(),
+                            )
+                            .unwrap(); // we know that mode must be valid, so this cannot fail
+                            (m, naive_mode)
+                        })
                     };
                     match result {
-                        Ok(mode) => {
-                            self.change_file(fperm, mode, file)?;
-                            fperm = mode;
+                        Ok((mode, naive_mode)) => {
+                            new_mode = mode;
+                            naively_expected_new_mode = naive_mode;
                         }
                         Err(f) => {
                             if !self.quiet {
@@ -299,6 +302,17 @@ impl Chmoder {
                         }
                     }
                 }
+                self.change_file(fperm, new_mode, file)?;
+                // if a permission would have been removed if umask was 0, but it wasn't because umask was not 0, print an error and fail
+                if (new_mode & !naively_expected_new_mode) != 0 {
+                    show_error!(
+                        "{}: new permissions are {}, not {}",
+                        file.maybe_quote(),
+                        display_permissions_unix(new_mode as mode_t, false),
+                        display_permissions_unix(naively_expected_new_mode as mode_t, false)
+                    );
+                    return Err(1);
+                }
             }
         }
 
@@ -310,8 +324,8 @@ impl Chmoder {
         if fperm == mode {
             if self.verbose && !self.changes {
                 println!(
-                    "mode of '{}' retained as {:04o} ({})",
-                    file.display(),
+                    "mode of {} retained as {:04o} ({})",
+                    file.quote(),
                     fperm,
                     display_permissions_unix(fperm as mode_t, false),
                 );
@@ -322,9 +336,9 @@ impl Chmoder {
                 show_error!("{}", err);
             }
             if self.verbose {
-                show_error!(
-                    "failed to change mode of file '{}' from {:o} ({}) to {:o} ({})",
-                    file.display(),
+                println!(
+                    "failed to change mode of file {} from {:04o} ({}) to {:04o} ({})",
+                    file.quote(),
                     fperm,
                     display_permissions_unix(fperm as mode_t, false),
                     mode,
@@ -334,9 +348,9 @@ impl Chmoder {
             Err(1)
         } else {
             if self.verbose || self.changes {
-                show_error!(
-                    "mode of '{}' changed from {:o} ({}) to {:o} ({})",
-                    file.display(),
+                println!(
+                    "mode of {} changed from {:04o} ({}) to {:04o} ({})",
+                    file.quote(),
                     fperm,
                     display_permissions_unix(fperm as mode_t, false),
                     mode,
diff --git a/src/uu/chown/Cargo.toml b/src/uu/chown/Cargo.toml
index 828c214be..20381c660 100644
--- a/src/uu/chown/Cargo.toml
+++ b/src/uu/chown/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_chown"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "chown ~ (uutils) change the ownership of FILE"
@@ -16,10 +16,8 @@ path = "src/chown.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-glob = "0.3.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
-walkdir = "2.2"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "chown"
diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs
index 081d3a148..f24c4ec89 100644
--- a/src/uu/chown/src/chown.rs
+++ b/src/uu/chown/src/chown.rs
@@ -5,133 +5,31 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) COMFOLLOW Chowner Passwd RFILE RFILE's derefer dgid duid
+// spell-checker:ignore (ToDO) COMFOLLOW Passwd RFILE RFILE's derefer dgid duid groupname
 
-#[macro_use]
-extern crate uucore;
+use uucore::display::Quotable;
 pub use uucore::entries::{self, Group, Locate, Passwd};
-use uucore::fs::resolve_relative_path;
-use uucore::libc::{gid_t, uid_t};
-use uucore::perms::{wrap_chown, Verbosity};
+use uucore::perms::{chown_base, options, IfFrom};
 
-use uucore::error::{FromIo, UError, UResult, USimpleError};
+use uucore::error::{FromIo, UResult, USimpleError};
 
-use clap::{crate_version, App, Arg};
+use clap::{crate_version, App, Arg, ArgMatches};
 
-use walkdir::WalkDir;
-
-use std::fs::{self, Metadata};
+use std::fs;
 use std::os::unix::fs::MetadataExt;
 
-use std::convert::AsRef;
-use std::path::Path;
-use uucore::InvalidEncodingHandling;
-
 static ABOUT: &str = "change file owner and group";
 
-pub mod options {
-    pub mod verbosity {
-        pub static CHANGES: &str = "changes";
-        pub static QUIET: &str = "quiet";
-        pub static SILENT: &str = "silent";
-        pub static VERBOSE: &str = "verbose";
-    }
-    pub mod preserve_root {
-        pub static PRESERVE: &str = "preserve-root";
-        pub static NO_PRESERVE: &str = "no-preserve-root";
-    }
-    pub mod dereference {
-        pub static DEREFERENCE: &str = "dereference";
-        pub static NO_DEREFERENCE: &str = "no-dereference";
-    }
-    pub static FROM: &str = "from";
-    pub static RECURSIVE: &str = "recursive";
-    pub mod traverse {
-        pub static TRAVERSE: &str = "H";
-        pub static NO_TRAVERSE: &str = "P";
-        pub static EVERY: &str = "L";
-    }
-    pub static REFERENCE: &str = "reference";
-}
-
-static ARG_OWNER: &str = "owner";
-static ARG_FILES: &str = "files";
-
-const FTS_COMFOLLOW: u8 = 1;
-const FTS_PHYSICAL: u8 = 1 << 1;
-const FTS_LOGICAL: u8 = 1 << 2;
-
 fn get_usage() -> String {
     format!(
         "{0} [OPTION]... [OWNER][:[GROUP]] FILE...\n{0} [OPTION]... --reference=RFILE FILE...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
-#[uucore_procs::gen_uumain]
-pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let args = args
-        .collect_str(InvalidEncodingHandling::Ignore)
-        .accept_any();
-
-    let usage = get_usage();
-
-    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
-
-    /* First arg is the owner/group */
-    let owner = matches.value_of(ARG_OWNER).unwrap();
-
-    /* Then the list of files */
-    let files: Vec<String> = matches
-        .values_of(ARG_FILES)
-        .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_default();
-
-    let preserve_root = matches.is_present(options::preserve_root::PRESERVE);
-
-    let mut derefer = if matches.is_present(options::dereference::NO_DEREFERENCE) {
-        1
-    } else {
-        0
-    };
-
-    let mut bit_flag = if matches.is_present(options::traverse::TRAVERSE) {
-        FTS_COMFOLLOW | FTS_PHYSICAL
-    } else if matches.is_present(options::traverse::EVERY) {
-        FTS_LOGICAL
-    } else {
-        FTS_PHYSICAL
-    };
-
-    let recursive = matches.is_present(options::RECURSIVE);
-    if recursive {
-        if bit_flag == FTS_PHYSICAL {
-            if derefer == 1 {
-                return Err(USimpleError::new(
-                    1,
-                    "-R --dereference requires -H or -L".to_string(),
-                ));
-            }
-            derefer = 0;
-        }
-    } else {
-        bit_flag = FTS_PHYSICAL;
-    }
-
-    let verbosity = if matches.is_present(options::verbosity::CHANGES) {
-        Verbosity::Changes
-    } else if matches.is_present(options::verbosity::SILENT)
-        || matches.is_present(options::verbosity::QUIET)
-    {
-        Verbosity::Silent
-    } else if matches.is_present(options::verbosity::VERBOSE) {
-        Verbosity::Verbose
-    } else {
-        Verbosity::Normal
-    };
-
+fn parse_gid_uid_and_filter(matches: &ArgMatches) -> UResult<(Option<u32>, Option<u32>, IfFrom)> {
     let filter = if let Some(spec) = matches.value_of(options::FROM) {
-        match parse_spec(spec)? {
+        match parse_spec(spec, ':')? {
             (Some(uid), None) => IfFrom::User(uid),
             (None, Some(gid)) => IfFrom::Group(gid),
             (Some(uid), Some(gid)) => IfFrom::UserGroup(uid, gid),
@@ -145,30 +43,32 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let dest_gid: Option<u32>;
     if let Some(file) = matches.value_of(options::REFERENCE) {
         let meta = fs::metadata(&file)
-            .map_err_context(|| format!("failed to get attributes of '{}'", file))?;
+            .map_err_context(|| format!("failed to get attributes of {}", file.quote()))?;
         dest_gid = Some(meta.gid());
         dest_uid = Some(meta.uid());
     } else {
-        let (u, g) = parse_spec(owner)?;
+        let (u, g) = parse_spec(matches.value_of(options::ARG_OWNER).unwrap(), ':')?;
         dest_uid = u;
         dest_gid = g;
     }
-    let executor = Chowner {
-        bit_flag,
-        dest_uid,
-        dest_gid,
-        verbosity,
-        recursive,
-        dereference: derefer != 0,
-        filter,
-        preserve_root,
-        files,
-    };
-    executor.exec()
+    Ok((dest_gid, dest_uid, filter))
+}
+
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = get_usage();
+
+    chown_base(
+        uu_app().usage(&usage[..]),
+        args,
+        options::ARG_OWNER,
+        parse_gid_uid_and_filter,
+        false,
+    )
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -177,22 +77,31 @@ pub fn uu_app() -> App<'static, 'static> {
                 .long(options::verbosity::CHANGES)
                 .help("like verbose but report only when a change is made"),
         )
-        .arg(Arg::with_name(options::dereference::DEREFERENCE).long(options::dereference::DEREFERENCE).help(
-            "affect the referent of each symbolic link (this is the default), rather than the symbolic link itself",
-        ))
+        .arg(
+            Arg::with_name(options::dereference::DEREFERENCE)
+                .long(options::dereference::DEREFERENCE)
+                .help(
+                    "affect the referent of each symbolic link (this is the default), \
+                    rather than the symbolic link itself",
+                ),
+        )
         .arg(
             Arg::with_name(options::dereference::NO_DEREFERENCE)
                 .short("h")
                 .long(options::dereference::NO_DEREFERENCE)
                 .help(
-                    "affect symbolic links instead of any referenced file (useful only on systems that can change the ownership of a symlink)",
+                    "affect symbolic links instead of any referenced file \
+                    (useful only on systems that can change the ownership of a symlink)",
                 ),
         )
         .arg(
             Arg::with_name(options::FROM)
                 .long(options::FROM)
                 .help(
-                    "change the owner and/or group of each file only if its current owner and/or group match those specified here. Either may be omitted, in which case a match is not required for the omitted attribute",
+                    "change the owner and/or group of each file only if its \
+                    current owner and/or group match those specified here. \
+                    Either may be omitted, in which case a match is not required \
+                    for the omitted attribute",
                 )
                 .value_name("CURRENT_OWNER:CURRENT_GROUP"),
         )
@@ -224,7 +133,11 @@ pub fn uu_app() -> App<'static, 'static> {
                 .value_name("RFILE")
                 .min_values(1),
         )
-        .arg(Arg::with_name(options::verbosity::SILENT).short("f").long(options::verbosity::SILENT))
+        .arg(
+            Arg::with_name(options::verbosity::SILENT)
+                .short("f")
+                .long(options::verbosity::SILENT),
+        )
         .arg(
             Arg::with_name(options::traverse::TRAVERSE)
                 .short(options::traverse::TRAVERSE)
@@ -246,41 +159,55 @@ pub fn uu_app() -> App<'static, 'static> {
         .arg(
             Arg::with_name(options::verbosity::VERBOSE)
                 .long(options::verbosity::VERBOSE)
+                .short("v")
                 .help("output a diagnostic for every file processed"),
         )
-        .arg(
-            Arg::with_name(ARG_OWNER)
-                .multiple(false)
-                .takes_value(true)
-                .required(true),
-        )
-        .arg(
-            Arg::with_name(ARG_FILES)
-                .multiple(true)
-                .takes_value(true)
-                .required(true)
-                .min_values(1),
-        )
 }
 
-fn parse_spec(spec: &str) -> UResult<(Option<u32>, Option<u32>)> {
-    let args = spec.split_terminator(':').collect::<Vec<_>>();
-    let usr_only = args.len() == 1 && !args[0].is_empty();
-    let grp_only = args.len() == 2 && args[0].is_empty();
-    let usr_grp = args.len() == 2 && !args[0].is_empty() && !args[1].is_empty();
-    let uid = if usr_only || usr_grp {
-        Some(
-            Passwd::locate(args[0])
-                .map_err(|_| USimpleError::new(1, format!("invalid user: '{}'", spec)))?
-                .uid(),
-        )
+/// Parse the username and groupname
+///
+/// In theory, it should be username:groupname
+/// but ...
+/// it can user.name:groupname
+/// or username.groupname
+///
+/// # Arguments
+///
+/// * `spec` - The input from the user
+/// * `sep` - Should be ':' or '.'
+fn parse_spec(spec: &str, sep: char) -> UResult<(Option<u32>, Option<u32>)> {
+    assert!(['.', ':'].contains(&sep));
+    let mut args = spec.splitn(2, sep);
+    let user = args.next().unwrap_or("");
+    let group = args.next().unwrap_or("");
+
+    let uid = if !user.is_empty() {
+        Some(match Passwd::locate(user) {
+            Ok(u) => u.uid(), // We have been able to get the uid
+            Err(_) =>
+            // we have NOT been able to find the uid
+            // but we could be in the case where we have user.group
+            {
+                if spec.contains('.') && !spec.contains(':') && sep == ':' {
+                    // but the input contains a '.' but not a ':'
+                    // we might have something like username.groupname
+                    // So, try to parse it this way
+                    return parse_spec(spec, '.');
+                } else {
+                    return Err(USimpleError::new(
+                        1,
+                        format!("invalid user: {}", spec.quote()),
+                    ));
+                }
+            }
+        })
     } else {
         None
     };
-    let gid = if grp_only || usr_grp {
+    let gid = if !group.is_empty() {
         Some(
-            Group::locate(args[1])
-                .map_err(|_| USimpleError::new(1, format!("invalid group: '{}'", spec)))?
+            Group::locate(group)
+                .map_err(|_| USimpleError::new(1, format!("invalid group: {}", spec.quote())))?
                 .gid(),
         )
     } else {
@@ -289,206 +216,16 @@ fn parse_spec(spec: &str) -> UResult<(Option<u32>, Option<u32>)> {
     Ok((uid, gid))
 }
 
-enum IfFrom {
-    All,
-    User(u32),
-    Group(u32),
-    UserGroup(u32, u32),
-}
-
-struct Chowner {
-    dest_uid: Option<u32>,
-    dest_gid: Option<u32>,
-    bit_flag: u8,
-    verbosity: Verbosity,
-    filter: IfFrom,
-    files: Vec<String>,
-    recursive: bool,
-    preserve_root: bool,
-    dereference: bool,
-}
-
-macro_rules! unwrap {
-    ($m:expr, $e:ident, $err:block) => {
-        match $m {
-            Ok(meta) => meta,
-            Err($e) => $err,
-        }
-    };
-}
-
-impl Chowner {
-    fn exec(&self) -> UResult<()> {
-        let mut ret = 0;
-        for f in &self.files {
-            ret |= self.traverse(f);
-        }
-        if ret != 0 {
-            return Err(UError::from(ret));
-        }
-        Ok(())
-    }
-
-    fn traverse<P: AsRef<Path>>(&self, root: P) -> i32 {
-        let follow_arg = self.dereference || self.bit_flag != FTS_PHYSICAL;
-        let path = root.as_ref();
-        let meta = match self.obtain_meta(path, follow_arg) {
-            Some(m) => m,
-            _ => return 1,
-        };
-
-        // Prohibit only if:
-        // (--preserve-root and -R present) &&
-        // (
-        //     (argument is not symlink && resolved to be '/') ||
-        //     (argument is symlink && should follow argument && resolved to be '/')
-        // )
-        if self.recursive && self.preserve_root {
-            let may_exist = if follow_arg {
-                path.canonicalize().ok()
-            } else {
-                let real = resolve_relative_path(path);
-                if real.is_dir() {
-                    Some(real.canonicalize().expect("failed to get real path"))
-                } else {
-                    Some(real.into_owned())
-                }
-            };
-
-            if let Some(p) = may_exist {
-                if p.parent().is_none() {
-                    show_error!("it is dangerous to operate recursively on '/'");
-                    show_error!("use --no-preserve-root to override this failsafe");
-                    return 1;
-                }
-            }
-        }
-
-        let ret = if self.matched(meta.uid(), meta.gid()) {
-            match wrap_chown(
-                path,
-                &meta,
-                self.dest_uid,
-                self.dest_gid,
-                follow_arg,
-                self.verbosity.clone(),
-            ) {
-                Ok(n) => {
-                    if !n.is_empty() {
-                        show_error!("{}", n);
-                    }
-                    0
-                }
-                Err(e) => {
-                    if self.verbosity != Verbosity::Silent {
-                        show_error!("{}", e);
-                    }
-                    1
-                }
-            }
-        } else {
-            0
-        };
-
-        if !self.recursive {
-            ret
-        } else {
-            ret | self.dive_into(&root)
-        }
-    }
-
-    fn dive_into<P: AsRef<Path>>(&self, root: P) -> i32 {
-        let mut ret = 0;
-        let root = root.as_ref();
-        let follow = self.dereference || self.bit_flag & FTS_LOGICAL != 0;
-        for entry in WalkDir::new(root).follow_links(follow).min_depth(1) {
-            let entry = unwrap!(entry, e, {
-                ret = 1;
-                show_error!("{}", e);
-                continue;
-            });
-            let path = entry.path();
-            let meta = match self.obtain_meta(path, follow) {
-                Some(m) => m,
-                _ => {
-                    ret = 1;
-                    continue;
-                }
-            };
-
-            if !self.matched(meta.uid(), meta.gid()) {
-                continue;
-            }
-
-            ret = match wrap_chown(
-                path,
-                &meta,
-                self.dest_uid,
-                self.dest_gid,
-                follow,
-                self.verbosity.clone(),
-            ) {
-                Ok(n) => {
-                    if !n.is_empty() {
-                        show_error!("{}", n);
-                    }
-                    0
-                }
-                Err(e) => {
-                    if self.verbosity != Verbosity::Silent {
-                        show_error!("{}", e);
-                    }
-                    1
-                }
-            }
-        }
-        ret
-    }
-
-    fn obtain_meta<P: AsRef<Path>>(&self, path: P, follow: bool) -> Option<Metadata> {
-        use self::Verbosity::*;
-        let path = path.as_ref();
-        let meta = if follow {
-            unwrap!(path.metadata(), e, {
-                match self.verbosity {
-                    Silent => (),
-                    _ => show_error!("cannot access '{}': {}", path.display(), e),
-                }
-                return None;
-            })
-        } else {
-            unwrap!(path.symlink_metadata(), e, {
-                match self.verbosity {
-                    Silent => (),
-                    _ => show_error!("cannot dereference '{}': {}", path.display(), e),
-                }
-                return None;
-            })
-        };
-        Some(meta)
-    }
-
-    #[inline]
-    fn matched(&self, uid: uid_t, gid: gid_t) -> bool {
-        match self.filter {
-            IfFrom::All => true,
-            IfFrom::User(u) => u == uid,
-            IfFrom::Group(g) => g == gid,
-            IfFrom::UserGroup(u, g) => u == uid && g == gid,
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
 
     #[test]
     fn test_parse_spec() {
-        assert_eq!(parse_spec(":"), Ok((None, None)));
-        assert!(parse_spec("::")
-            .err()
-            .unwrap()
-            .starts_with("invalid group: "));
+        assert!(matches!(parse_spec(":", ':'), Ok((None, None))));
+        assert!(matches!(parse_spec(".", ':'), Ok((None, None))));
+        assert!(matches!(parse_spec(".", '.'), Ok((None, None))));
+        assert!(format!("{}", parse_spec("::", ':').err().unwrap()).starts_with("invalid group: "));
+        assert!(format!("{}", parse_spec("..", ':').err().unwrap()).starts_with("invalid group: "));
     }
 }
diff --git a/src/uu/chroot/Cargo.toml b/src/uu/chroot/Cargo.toml
index a808a717b..362e43b59 100644
--- a/src/uu/chroot/Cargo.toml
+++ b/src/uu/chroot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_chroot"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "chroot ~ (uutils) run COMMAND under a new root directory"
@@ -16,8 +16,8 @@ path = "src/chroot.rs"
 
 [dependencies]
 clap= "2.33"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "chroot"
diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs
index 2c0f8522c..55097c1bb 100644
--- a/src/uu/chroot/src/chroot.rs
+++ b/src/uu/chroot/src/chroot.rs
@@ -15,10 +15,10 @@ use std::ffi::CString;
 use std::io::Error;
 use std::path::Path;
 use std::process::Command;
+use uucore::display::Quotable;
 use uucore::libc::{self, chroot, setgid, setgroups, setuid};
 use uucore::{entries, InvalidEncodingHandling};
 
-static NAME: &str = "chroot";
 static ABOUT: &str = "Run COMMAND with root directory set to NEWROOT.";
 static SYNTAX: &str = "[OPTION]... NEWROOT [COMMAND [ARG]...]";
 
@@ -47,15 +47,15 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         None => crash!(
             1,
             "Missing operand: NEWROOT\nTry '{} --help' for more information.",
-            NAME
+            uucore::execution_phrase()
         ),
     };
 
     if !newroot.is_dir() {
         crash!(
             1,
-            "cannot change root directory to `{}`: no such directory",
-            newroot.display()
+            "cannot change root directory to {}: no such directory",
+            newroot.quote()
         );
     }
 
@@ -67,7 +67,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     // TODO: refactor the args and command matching
     // See: https://github.com/uutils/coreutils/pull/2365#discussion_r647849967
     let command: Vec<&str> = match commands.len() {
-        1 => {
+        0 => {
             let shell: &str = match user_shell {
                 Err(_) => default_shell,
                 Ok(ref s) => s.as_ref(),
@@ -77,12 +77,28 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         _ => commands,
     };
 
+    assert!(!command.is_empty());
+    let chroot_command = command[0];
+    let chroot_args = &command[1..];
+
+    // NOTE: Tests can only trigger code beyond this point if they're invoked with root permissions
     set_context(newroot, &matches);
 
-    let pstatus = Command::new(command[0])
-        .args(&command[1..])
+    let pstatus = Command::new(chroot_command)
+        .args(chroot_args)
         .status()
-        .unwrap_or_else(|e| crash!(1, "Cannot exec: {}", e));
+        .unwrap_or_else(|e| {
+            // TODO: Exit status:
+            // 125 if chroot itself fails
+            // 126 if command is found but cannot be invoked
+            // 127 if command cannot be found
+            crash!(
+                1,
+                "failed to run command {}: {}",
+                command[0].to_string().quote(),
+                e
+            )
+        });
 
     if pstatus.success() {
         0
@@ -92,7 +108,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .usage(SYNTAX)
@@ -150,7 +166,7 @@ fn set_context(root: &Path, options: &clap::ArgMatches) {
         Some(u) => {
             let s: Vec<&str> = u.split(':').collect();
             if s.len() != 2 || s.iter().any(|&spec| spec.is_empty()) {
-                crash!(1, "invalid userspec: `{}`", u)
+                crash!(1, "invalid userspec: {}", u.quote())
             };
             s
         }
@@ -171,7 +187,6 @@ fn set_context(root: &Path, options: &clap::ArgMatches) {
 }
 
 fn enter_chroot(root: &Path) {
-    let root_str = root.display();
     std::env::set_current_dir(root).unwrap();
     let err = unsafe {
         chroot(CString::new(".").unwrap().as_bytes_with_nul().as_ptr() as *const libc::c_char)
@@ -180,7 +195,7 @@ fn enter_chroot(root: &Path) {
         crash!(
             1,
             "cannot chroot to {}: {}",
-            root_str,
+            root.quote(),
             Error::last_os_error()
         )
     };
@@ -190,7 +205,7 @@ fn set_main_group(group: &str) {
     if !group.is_empty() {
         let group_id = match entries::grp2gid(group) {
             Ok(g) => g,
-            _ => crash!(1, "no such group: {}", group),
+            _ => crash!(1, "no such group: {}", group.maybe_quote()),
         };
         let err = unsafe { setgid(group_id) };
         if err != 0 {
@@ -235,7 +250,12 @@ fn set_user(user: &str) {
         let user_id = entries::usr2uid(user).unwrap();
         let err = unsafe { setuid(user_id as libc::uid_t) };
         if err != 0 {
-            crash!(1, "cannot set user to {}: {}", user, Error::last_os_error())
+            crash!(
+                1,
+                "cannot set user to {}: {}",
+                user.maybe_quote(),
+                Error::last_os_error()
+            )
         }
     }
 }
diff --git a/src/uu/cksum/Cargo.toml b/src/uu/cksum/Cargo.toml
index b92b680c8..b7f81d74b 100644
--- a/src/uu/cksum/Cargo.toml
+++ b/src/uu/cksum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_cksum"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "cksum ~ (uutils) display CRC and size of input"
@@ -17,9 +17,13 @@ path = "src/cksum.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "cksum"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs
index e88cc78b3..92853a3e8 100644
--- a/src/uu/cksum/src/cksum.rs
+++ b/src/uu/cksum/src/cksum.rs
@@ -14,6 +14,7 @@ use clap::{crate_version, App, Arg};
 use std::fs::File;
 use std::io::{self, stdin, BufReader, Read};
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 // NOTE: CRC_TABLE_LEN *must* be <= 256 as we cast 0..CRC_TABLE_LEN to u8
@@ -24,60 +25,15 @@ const NAME: &str = "cksum";
 const SYNTAX: &str = "[OPTIONS] [FILE]...";
 const SUMMARY: &str = "Print CRC and size for each file";
 
-// this is basically a hack to get "loops" to work on Rust 1.33.  Once we update to Rust 1.46 or
-// greater, we can just use while loops
-macro_rules! unroll {
-    (256, |$i:ident| $s:expr) => {{
-        unroll!(@ 32, 0 * 32, $i, $s);
-        unroll!(@ 32, 1 * 32, $i, $s);
-        unroll!(@ 32, 2 * 32, $i, $s);
-        unroll!(@ 32, 3 * 32, $i, $s);
-        unroll!(@ 32, 4 * 32, $i, $s);
-        unroll!(@ 32, 5 * 32, $i, $s);
-        unroll!(@ 32, 6 * 32, $i, $s);
-        unroll!(@ 32, 7 * 32, $i, $s);
-    }};
-    (8, |$i:ident| $s:expr) => {{
-        unroll!(@ 8, 0, $i, $s);
-    }};
-
-    (@ 32, $start:expr, $i:ident, $s:expr) => {{
-        unroll!(@ 8, $start + 0 * 8, $i, $s);
-        unroll!(@ 8, $start + 1 * 8, $i, $s);
-        unroll!(@ 8, $start + 2 * 8, $i, $s);
-        unroll!(@ 8, $start + 3 * 8, $i, $s);
-    }};
-    (@ 8, $start:expr, $i:ident, $s:expr) => {{
-        unroll!(@ 4, $start, $i, $s);
-        unroll!(@ 4, $start + 4, $i, $s);
-    }};
-    (@ 4, $start:expr, $i:ident, $s:expr) => {{
-        unroll!(@ 2, $start, $i, $s);
-        unroll!(@ 2, $start + 2, $i, $s);
-    }};
-    (@ 2, $start:expr, $i:ident, $s:expr) => {{
-        unroll!(@ 1, $start, $i, $s);
-        unroll!(@ 1, $start + 1, $i, $s);
-    }};
-    (@ 1, $start:expr, $i:ident, $s:expr) => {{
-        let $i = $start;
-        let _ = $s;
-    }};
-}
-
 const fn generate_crc_table() -> [u32; CRC_TABLE_LEN] {
     let mut table = [0; CRC_TABLE_LEN];
 
-    // NOTE: works on Rust 1.46
-    //let mut i = 0;
-    //while i < CRC_TABLE_LEN {
-    //    table[i] = crc_entry(i as u8) as u32;
-    //
-    //    i += 1;
-    //}
-    unroll!(256, |i| {
+    let mut i = 0;
+    while i < CRC_TABLE_LEN {
         table[i] = crc_entry(i as u8) as u32;
-    });
+
+        i += 1;
+    }
 
     table
 }
@@ -85,19 +41,8 @@ const fn generate_crc_table() -> [u32; CRC_TABLE_LEN] {
 const fn crc_entry(input: u8) -> u32 {
     let mut crc = (input as u32) << 24;
 
-    // NOTE: this does not work on Rust 1.33, but *does* on 1.46
-    //let mut i = 0;
-    //while i < 8 {
-    //    if crc & 0x8000_0000 != 0 {
-    //        crc <<= 1;
-    //        crc ^= 0x04c1_1db7;
-    //    } else {
-    //        crc <<= 1;
-    //    }
-    //
-    //    i += 1;
-    //}
-    unroll!(8, |_i| {
+    let mut i = 0;
+    while i < 8 {
         let if_condition = crc & 0x8000_0000;
         let if_body = (crc << 1) ^ 0x04c1_1db7;
         let else_body = crc << 1;
@@ -107,7 +52,8 @@ const fn crc_entry(input: u8) -> u32 {
         let condition_table = [else_body, if_body];
 
         crc = condition_table[(if_condition != 0) as usize];
-    });
+        i += 1;
+    }
 
     crc
 }
@@ -147,6 +93,8 @@ fn cksum(fname: &str) -> io::Result<(u32, usize)> {
                     "Is a directory",
                 ));
             };
+            // Silent the warning as we want to the error message
+            #[allow(clippy::question_mark)]
             if path.metadata().is_err() {
                 return Err(std::io::Error::new(
                     io::ErrorKind::NotFound,
@@ -191,7 +139,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         match cksum("-") {
             Ok((crc, size)) => println!("{} {}", crc, size),
             Err(err) => {
-                show_error!("{}", err);
+                show_error!("-: {}", err);
                 return 2;
             }
         }
@@ -203,7 +151,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         match cksum(fname.as_ref()) {
             Ok((crc, size)) => println!("{} {} {}", crc, size, fname),
             Err(err) => {
-                show_error!("'{}' {}", fname, err);
+                show_error!("{}: {}", fname.maybe_quote(), err);
                 exit_code = 2;
             }
         }
@@ -213,7 +161,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .about(SUMMARY)
diff --git a/src/uu/comm/Cargo.toml b/src/uu/comm/Cargo.toml
index 1deb094e2..abcbff57b 100644
--- a/src/uu/comm/Cargo.toml
+++ b/src/uu/comm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_comm"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "comm ~ (uutils) compare sorted inputs"
@@ -17,9 +17,13 @@ path = "src/comm.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "comm"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs
index aa10432a2..56af42fd9 100644
--- a/src/uu/comm/src/comm.rs
+++ b/src/uu/comm/src/comm.rs
@@ -7,9 +7,6 @@
 
 // spell-checker:ignore (ToDO) delim mkdelim
 
-#[macro_use]
-extern crate uucore;
-
 use std::cmp::Ordering;
 use std::fs::File;
 use std::io::{self, stdin, BufRead, BufReader, Stdin};
@@ -31,8 +28,8 @@ mod options {
     pub const FILE_2: &str = "FILE2";
 }
 
-fn get_usage() -> String {
-    format!("{} [OPTION]... FILE1 FILE2", executable!())
+fn usage() -> String {
+    format!("{} [OPTION]... FILE1 FILE2", uucore::execution_phrase())
 }
 
 fn mkdelim(col: usize, opts: &ArgMatches) -> String {
@@ -132,7 +129,7 @@ fn open_file(name: &str) -> io::Result<LineReader> {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -148,7 +145,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml
index b7b3809a7..891bf0244 100644
--- a/src/uu/cp/Cargo.toml
+++ b/src/uu/cp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_cp"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
     "Jordy Dickinson <jordy.dickinson@gmail.com>",
     "Joshua S. Miller <jsmiller@uchicago.edu>",
@@ -23,19 +23,29 @@ clap = { version = "2.33", features = ["wrap_help"] }
 filetime = "0.2"
 libc = "0.2.85"
 quick-error = "1.2.3"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+selinux = { version="0.2.3", optional=true }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 walkdir = "2.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-ioctl-sys = "0.5.2"
+ioctl-sys = "0.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version="0.3", features=["fileapi"] }
 
 [target.'cfg(unix)'.dependencies]
 xattr="0.2.1"
+exacl= { version = "0.6.0", optional=true }
 
 [[bin]]
 name = "cp"
 path = "src/main.rs"
+
+[features]
+feat_selinux = ["selinux"]
+feat_acl = ["exacl"]
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs
index 7c67649c2..518a2262c 100644
--- a/src/uu/cp/src/cp.rs
+++ b/src/uu/cp/src/cp.rs
@@ -18,6 +18,7 @@ extern crate quick_error;
 #[macro_use]
 extern crate uucore;
 
+use uucore::display::Quotable;
 #[cfg(windows)]
 use winapi::um::fileapi::CreateFileW;
 #[cfg(windows)]
@@ -48,7 +49,8 @@ use std::path::{Path, PathBuf, StripPrefixError};
 use std::str::FromStr;
 use std::string::ToString;
 use uucore::backup_control::{self, BackupMode};
-use uucore::fs::{canonicalize, CanonicalizeMode};
+use uucore::error::{set_exit_code, ExitCode, UError, UResult};
+use uucore::fs::{canonicalize, MissingHandling, ResolveMode};
 use walkdir::WalkDir;
 
 #[cfg(unix)]
@@ -67,6 +69,7 @@ quick_error! {
         IoErrContext(err: io::Error, path: String) {
             display("{}: {}", path, err)
             context(path: &'a str, err: io::Error) -> (err, path.to_owned())
+            context(context: String, err: io::Error) -> (err, context)
             cause(err)
         }
 
@@ -99,7 +102,13 @@ quick_error! {
         NotImplemented(opt: String) { display("Option '{}' not yet implemented.", opt) }
 
         /// Invalid arguments to backup
-        Backup(description: String) { display("{}\nTry 'cp --help' for more information.", description) }
+        Backup(description: String) { display("{}\nTry '{} --help' for more information.", description, uucore::execution_phrase()) }
+    }
+}
+
+impl UError for Error {
+    fn code(&self) -> i32 {
+        EXIT_ERR
     }
 }
 
@@ -180,12 +189,15 @@ pub enum CopyMode {
     AttrOnly,
 }
 
-#[derive(Clone, Eq, PartialEq)]
+// The ordering here determines the order in which attributes are (re-)applied.
+// In particular, Ownership must be changed first to avoid interfering with mode change.
+#[derive(Clone, Eq, PartialEq, Debug, PartialOrd, Ord)]
 pub enum Attribute {
     #[cfg(unix)]
-    Mode,
     Ownership,
+    Mode,
     Timestamps,
+    #[cfg(feature = "feat_selinux")]
     Context,
     Links,
     Xattr,
@@ -215,15 +227,14 @@ pub struct Options {
 
 static ABOUT: &str = "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.";
 static LONG_HELP: &str = "";
-static EXIT_OK: i32 = 0;
 static EXIT_ERR: i32 = 1;
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... [-T] SOURCE DEST
     {0} [OPTION]... SOURCE... DIRECTORY
     {0} [OPTION]... -t DIRECTORY SOURCE...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
@@ -231,8 +242,6 @@ fn get_usage() -> String {
 mod options {
     pub const ARCHIVE: &str = "archive";
     pub const ATTRIBUTES_ONLY: &str = "attributes-only";
-    pub const BACKUP: &str = "backup";
-    pub const BACKUP_NO_ARG: &str = "b";
     pub const CLI_SYMBOLIC_LINKS: &str = "cli-symbolic-links";
     pub const CONTEXT: &str = "context";
     pub const COPY_CONTENTS: &str = "copy-contents";
@@ -242,7 +251,7 @@ mod options {
     pub const LINK: &str = "link";
     pub const NO_CLOBBER: &str = "no-clobber";
     pub const NO_DEREFERENCE: &str = "no-dereference";
-    pub const NO_DEREFERENCE_PRESERVE_LINKS: &str = "no-dereference-preserve-linkgs";
+    pub const NO_DEREFERENCE_PRESERVE_LINKS: &str = "no-dereference-preserve-links";
     pub const NO_PRESERVE: &str = "no-preserve";
     pub const NO_TARGET_DIRECTORY: &str = "no-target-directory";
     pub const ONE_FILE_SYSTEM: &str = "one-file-system";
@@ -257,7 +266,6 @@ mod options {
     pub const REMOVE_DESTINATION: &str = "remove-destination";
     pub const SPARSE: &str = "sparse";
     pub const STRIP_TRAILING_SLASHES: &str = "strip-trailing-slashes";
-    pub const SUFFIX: &str = "suffix";
     pub const SYMBOLIC_LINK: &str = "symbolic-link";
     pub const TARGET_DIRECTORY: &str = "target-directory";
     pub const UPDATE: &str = "update";
@@ -269,6 +277,7 @@ static PRESERVABLE_ATTRIBUTES: &[&str] = &[
     "mode",
     "ownership",
     "timestamps",
+    #[cfg(feature = "feat_selinux")]
     "context",
     "links",
     "xattr",
@@ -276,24 +285,18 @@ static PRESERVABLE_ATTRIBUTES: &[&str] = &[
 ];
 
 #[cfg(not(unix))]
-static PRESERVABLE_ATTRIBUTES: &[&str] = &[
-    "ownership",
-    "timestamps",
-    "context",
-    "links",
-    "xattr",
-    "all",
-];
+static PRESERVABLE_ATTRIBUTES: &[&str] =
+    &["mode", "timestamps", "context", "links", "xattr", "all"];
 
 static DEFAULT_ATTRIBUTES: &[Attribute] = &[
-    #[cfg(unix)]
     Attribute::Mode,
+    #[cfg(unix)]
     Attribute::Ownership,
     Attribute::Timestamps,
 ];
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(Arg::with_name(options::TARGET_DIRECTORY)
@@ -355,24 +358,9 @@ pub fn uu_app() -> App<'static, 'static> {
              .conflicts_with(options::FORCE)
              .help("remove each existing destination file before attempting to open it \
                     (contrast with --force). On Windows, current only works for writeable files."))
-        .arg(Arg::with_name(options::BACKUP)
-             .long(options::BACKUP)
-             .help("make a backup of each existing destination file")
-             .takes_value(true)
-             .require_equals(true)
-             .min_values(0)
-             .value_name("CONTROL")
-        )
-        .arg(Arg::with_name(options::BACKUP_NO_ARG)
-             .short(options::BACKUP_NO_ARG)
-             .help("like --backup but does not accept an argument")
-        )
-        .arg(Arg::with_name(options::SUFFIX)
-             .short("S")
-             .long(options::SUFFIX)
-             .takes_value(true)
-             .value_name("SUFFIX")
-             .help("override the usual backup suffix"))
+        .arg(backup_control::arguments::backup())
+        .arg(backup_control::arguments::backup_no_args())
+        .arg(backup_control::arguments::suffix())
         .arg(Arg::with_name(options::UPDATE)
              .short("u")
              .long(options::UPDATE)
@@ -399,13 +387,13 @@ pub fn uu_app() -> App<'static, 'static> {
              .conflicts_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::NO_PRESERVE])
              // -d sets this option
              // --archive sets this option
-             .help("Preserve the specified attributes (default: mode (unix only), ownership, timestamps), \
+             .help("Preserve the specified attributes (default: mode, ownership (unix only), timestamps), \
                     if possible additional attributes: context, links, xattr, all"))
         .arg(Arg::with_name(options::PRESERVE_DEFAULT_ATTRIBUTES)
              .short("-p")
              .long(options::PRESERVE_DEFAULT_ATTRIBUTES)
              .conflicts_with_all(&[options::PRESERVE, options::NO_PRESERVE, options::ARCHIVE])
-             .help("same as --preserve=mode(unix only),ownership,timestamps"))
+             .help("same as --preserve=mode,ownership(unix only),timestamps"))
         .arg(Arg::with_name(options::NO_PRESERVE)
              .long(options::NO_PRESERVE)
              .takes_value(true)
@@ -464,8 +452,9 @@ pub fn uu_app() -> App<'static, 'static> {
              .multiple(true))
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let matches = uu_app()
         .after_help(&*format!(
             "{}\n{}",
@@ -475,11 +464,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .usage(&usage[..])
         .get_matches_from(args);
 
-    let options = crash_if_err!(EXIT_ERR, Options::from_matches(&matches));
+    let options = Options::from_matches(&matches)?;
 
     if options.overwrite == OverwriteMode::NoClobber && options.backup != BackupMode::NoBackup {
         show_usage_error!("options --backup and --no-clobber are mutually exclusive");
-        return 1;
+        return Err(ExitCode(EXIT_ERR).into());
     }
 
     let paths: Vec<String> = matches
@@ -487,7 +476,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .map(|v| v.map(ToString::to_string).collect())
         .unwrap_or_default();
 
-    let (sources, target) = crash_if_err!(EXIT_ERR, parse_path_args(&paths, &options));
+    let (sources, target) = parse_path_args(&paths, &options)?;
 
     if let Err(error) = copy(&sources, &target, &options) {
         match error {
@@ -497,10 +486,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             // Else we caught a fatal bubbled-up error, log it to stderr
             _ => show_error!("{}", error),
         };
-        return EXIT_ERR;
+        set_exit_code(EXIT_ERR);
     }
 
-    EXIT_OK
+    Ok(())
 }
 
 impl ClobberMode {
@@ -550,17 +539,18 @@ impl FromStr for Attribute {
 
     fn from_str(value: &str) -> CopyResult<Attribute> {
         Ok(match &*value.to_lowercase() {
-            #[cfg(unix)]
             "mode" => Attribute::Mode,
+            #[cfg(unix)]
             "ownership" => Attribute::Ownership,
             "timestamps" => Attribute::Timestamps,
+            #[cfg(feature = "feat_selinux")]
             "context" => Attribute::Context,
             "links" => Attribute::Links,
             "xattr" => Attribute::Xattr,
             _ => {
                 return Err(Error::InvalidArgument(format!(
-                    "invalid attribute '{}'",
-                    value
+                    "invalid attribute {}",
+                    value.quote()
                 )));
             }
         })
@@ -570,14 +560,16 @@ impl FromStr for Attribute {
 fn add_all_attributes() -> Vec<Attribute> {
     use Attribute::*;
 
-    #[cfg(target_os = "windows")]
-    let attr = vec![Ownership, Timestamps, Context, Xattr, Links];
-
-    #[cfg(not(target_os = "windows"))]
-    let mut attr = vec![Ownership, Timestamps, Context, Xattr, Links];
-
-    #[cfg(unix)]
-    attr.insert(0, Mode);
+    let attr = vec![
+        #[cfg(unix)]
+        Ownership,
+        Mode,
+        Timestamps,
+        #[cfg(feature = "feat_selinux")]
+        Context,
+        Links,
+        Xattr,
+    ];
 
     attr
 }
@@ -604,20 +596,12 @@ impl Options {
             || matches.is_present(options::RECURSIVE_ALIAS)
             || matches.is_present(options::ARCHIVE);
 
-        let backup_mode = backup_control::determine_backup_mode(
-            matches.is_present(options::BACKUP_NO_ARG),
-            matches.is_present(options::BACKUP),
-            matches.value_of(options::BACKUP),
-        );
-        let backup_mode = match backup_mode {
-            Err(err) => {
-                return Err(Error::Backup(err));
-            }
+        let backup_mode = match backup_control::determine_backup_mode(matches) {
+            Err(e) => return Err(Error::Backup(format!("{}", e))),
             Ok(mode) => mode,
         };
 
-        let backup_suffix =
-            backup_control::determine_backup_suffix(matches.value_of(options::SUFFIX));
+        let backup_suffix = backup_control::determine_backup_suffix(matches);
 
         let overwrite = OverwriteMode::from_matches(matches);
 
@@ -628,7 +612,7 @@ impl Options {
             .map(ToString::to_string);
 
         // Parse attributes to preserve
-        let preserve_attributes: Vec<Attribute> = if matches.is_present(options::PRESERVE) {
+        let mut preserve_attributes: Vec<Attribute> = if matches.is_present(options::PRESERVE) {
             match matches.values_of(options::PRESERVE) {
                 None => DEFAULT_ATTRIBUTES.to_vec(),
                 Some(attribute_strs) => {
@@ -655,6 +639,11 @@ impl Options {
             vec![]
         };
 
+        // Make sure ownership is changed before other attributes,
+        // as chown clears some of the permission and therefore could undo previous changes
+        // if not executed first.
+        preserve_attributes.sort_unstable();
+
         let options = Options {
             attributes_only: matches.is_present(options::ATTRIBUTES_ONLY),
             copy_contents: matches.is_present(options::COPY_CONTENTS),
@@ -678,8 +667,8 @@ impl Options {
                         "never" => ReflinkMode::Never,
                         value => {
                             return Err(Error::InvalidArgument(format!(
-                                "invalid argument '{}' for \'reflink\'",
-                                value
+                                "invalid argument {} for \'reflink\'",
+                                value.quote()
                             )));
                         }
                     }
@@ -851,7 +840,7 @@ fn copy(sources: &[Source], target: &TargetSlice, options: &Options) -> CopyResu
     let mut seen_sources = HashSet::with_capacity(sources.len());
     for source in sources {
         if seen_sources.contains(source) {
-            show_warning!("source '{}' specified more than once", source.display());
+            show_warning!("source {} specified more than once", source.quote());
         } else {
             let mut found_hard_link = false;
             if preserve_hard_links {
@@ -892,8 +881,8 @@ fn construct_dest_path(
 ) -> CopyResult<PathBuf> {
     if options.no_target_dir && target.is_dir() {
         return Err(format!(
-            "cannot overwrite directory '{}' with non-directory",
-            target.display()
+            "cannot overwrite directory {} with non-directory",
+            target.quote()
         )
         .into());
     }
@@ -960,7 +949,7 @@ fn adjust_canonicalization(p: &Path) -> Cow<Path> {
 /// will not cause a short-circuit.
 fn copy_directory(root: &Path, target: &TargetSlice, options: &Options) -> CopyResult<()> {
     if !options.recursive {
-        return Err(format!("omitting directory '{}'", root.display()).into());
+        return Err(format!("omitting directory {}", root.quote()).into());
     }
 
     // if no-dereference is enabled and this is a symlink, copy it as a file
@@ -1060,12 +1049,12 @@ impl OverwriteMode {
         match *self {
             OverwriteMode::NoClobber => Err(Error::NotAllFilesCopied),
             OverwriteMode::Interactive(_) => {
-                if prompt_yes!("{}: overwrite {}? ", executable!(), path.display()) {
+                if prompt_yes!("{}: overwrite {}? ", uucore::util_name(), path.quote()) {
                     Ok(())
                 } else {
                     Err(Error::Skipped(format!(
                         "Not overwriting {} at user request",
-                        path.display()
+                        path.quote()
                     )))
                 }
             }
@@ -1075,27 +1064,66 @@ impl OverwriteMode {
 }
 
 fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResult<()> {
-    let context = &*format!("'{}' -> '{}'", source.display().to_string(), dest.display());
+    let context = &*format!("{} -> {}", source.quote(), dest.quote());
+    let source_metadata = fs::symlink_metadata(source).context(context)?;
     match *attribute {
-        #[cfg(unix)]
         Attribute::Mode => {
-            let mode = fs::metadata(source).context(context)?.permissions().mode();
-            let mut dest_metadata = fs::metadata(source).context(context)?.permissions();
-            dest_metadata.set_mode(mode);
+            fs::set_permissions(dest, source_metadata.permissions()).context(context)?;
+            // FIXME: Implement this for windows as well
+            #[cfg(feature = "feat_acl")]
+            exacl::getfacl(source, None)
+                .and_then(|acl| exacl::setfacl(&[dest], &acl, None))
+                .map_err(|err| Error::Error(err.to_string()))?;
         }
+        #[cfg(unix)]
         Attribute::Ownership => {
-            let metadata = fs::metadata(source).context(context)?;
-            fs::set_permissions(dest, metadata.permissions()).context(context)?;
+            use std::os::unix::prelude::MetadataExt;
+            use uucore::perms::wrap_chown;
+            use uucore::perms::Verbosity;
+            use uucore::perms::VerbosityLevel;
+
+            let dest_uid = source_metadata.uid();
+            let dest_gid = source_metadata.gid();
+
+            wrap_chown(
+                dest,
+                &dest.symlink_metadata().context(context)?,
+                Some(dest_uid),
+                Some(dest_gid),
+                false,
+                Verbosity {
+                    groups_only: false,
+                    level: VerbosityLevel::Normal,
+                },
+            )
+            .map_err(Error::Error)?;
         }
         Attribute::Timestamps => {
-            let metadata = fs::metadata(source)?;
             filetime::set_file_times(
                 Path::new(dest),
-                FileTime::from_last_access_time(&metadata),
-                FileTime::from_last_modification_time(&metadata),
+                FileTime::from_last_access_time(&source_metadata),
+                FileTime::from_last_modification_time(&source_metadata),
             )?;
         }
-        Attribute::Context => {}
+        #[cfg(feature = "feat_selinux")]
+        Attribute::Context => {
+            let context = selinux::SecurityContext::of_path(source, false, false).map_err(|e| {
+                format!(
+                    "failed to get security context of {}: {}",
+                    source.display(),
+                    e
+                )
+            })?;
+            if let Some(context) = context {
+                context.set_for_path(dest, false, false).map_err(|e| {
+                    format!(
+                        "failed to set security context for {}: {}",
+                        dest.display(),
+                        e
+                    )
+                })?;
+            }
+        }
         Attribute::Links => {}
         Attribute::Xattr => {
             #[cfg(unix)]
@@ -1103,7 +1131,7 @@ fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResu
                 let xattrs = xattr::list(source)?;
                 for attr in xattrs {
                     if let Some(attr_value) = xattr::get(source, attr.clone())? {
-                        crash_if_err!(EXIT_ERR, xattr::set(dest, attr, &attr_value[..]));
+                        xattr::set(dest, attr, &attr_value[..])?;
                     }
                 }
             }
@@ -1132,7 +1160,7 @@ fn symlink_file(source: &Path, dest: &Path, context: &str) -> CopyResult<()> {
 }
 
 fn context_for(src: &Path, dest: &Path) -> String {
-    format!("'{}' -> '{}'", src.display(), dest.display())
+    format!("{} -> {}", src.quote(), dest.quote())
 }
 
 /// Implements a simple backup copy for the destination file.
@@ -1169,8 +1197,8 @@ fn handle_existing_dest(source: &Path, dest: &Path, options: &Options) -> CopyRe
     Ok(())
 }
 
-/// Copy the a file from `source` to `dest`. No path manipulation is
-/// done on either `source` or `dest`, the are used as provided.
+/// Copy the a file from `source` to `dest`. `source` will be dereferenced if
+/// `options.dereference` is set to true. `dest` will always be dereferenced.
 ///
 /// Behavior when copying to existing files is contingent on the
 /// `options.overwrite` mode. If a file is skipped, the return type
@@ -1187,41 +1215,66 @@ fn copy_file(source: &Path, dest: &Path, options: &Options) -> CopyResult<()> {
         println!("{}", context_for(source, dest));
     }
 
-    #[allow(unused)]
-    {
-        // TODO: implement --preserve flag
-        let mut preserve_context = false;
-        for attribute in &options.preserve_attributes {
-            if *attribute == Attribute::Context {
-                preserve_context = true;
-            }
+    // Calculate the context upfront before canonicalizing the path
+    let context = context_for(source, dest);
+    let context = context.as_str();
+
+    // canonicalize dest and source so that later steps can work with the paths directly
+    let dest = canonicalize(dest, MissingHandling::Missing, ResolveMode::Physical).unwrap();
+    let source = if options.dereference {
+        canonicalize(source, MissingHandling::Missing, ResolveMode::Physical).unwrap()
+    } else {
+        source.to_owned()
+    };
+
+    let dest_permissions = if dest.exists() {
+        dest.symlink_metadata().context(context)?.permissions()
+    } else {
+        #[allow(unused_mut)]
+        let mut permissions = source.symlink_metadata().context(context)?.permissions();
+        #[cfg(unix)]
+        {
+            use uucore::mode::get_umask;
+
+            let mut mode = permissions.mode();
+
+            // remove sticky bit, suid and gid bit
+            const SPECIAL_PERMS_MASK: u32 = 0o7000;
+            mode &= !SPECIAL_PERMS_MASK;
+
+            // apply umask
+            mode &= !get_umask();
+
+            permissions.set_mode(mode);
         }
-    }
+        permissions
+    };
+
     match options.copy_mode {
         CopyMode::Link => {
-            fs::hard_link(source, dest).context(&*context_for(source, dest))?;
+            fs::hard_link(&source, &dest).context(context)?;
         }
         CopyMode::Copy => {
-            copy_helper(source, dest, options)?;
+            copy_helper(&source, &dest, options, context)?;
         }
         CopyMode::SymLink => {
-            symlink_file(source, dest, &*context_for(source, dest))?;
+            symlink_file(&source, &dest, context)?;
         }
         CopyMode::Sparse => return Err(Error::NotImplemented(options::SPARSE.to_string())),
         CopyMode::Update => {
             if dest.exists() {
-                let src_metadata = fs::metadata(source)?;
-                let dest_metadata = fs::metadata(dest)?;
+                let src_metadata = fs::symlink_metadata(&source)?;
+                let dest_metadata = fs::symlink_metadata(&dest)?;
 
                 let src_time = src_metadata.modified()?;
                 let dest_time = dest_metadata.modified()?;
                 if src_time <= dest_time {
                     return Ok(());
                 } else {
-                    copy_helper(source, dest, options)?;
+                    copy_helper(&source, &dest, options, context)?;
                 }
             } else {
-                copy_helper(source, dest, options)?;
+                copy_helper(&source, &dest, options, context)?;
             }
         }
         CopyMode::AttrOnly => {
@@ -1229,53 +1282,51 @@ fn copy_file(source: &Path, dest: &Path, options: &Options) -> CopyResult<()> {
                 .write(true)
                 .truncate(false)
                 .create(true)
-                .open(dest)
+                .open(&dest)
                 .unwrap();
         }
     };
+
+    // TODO: implement something similar to gnu's lchown
+    if fs::symlink_metadata(&dest)
+        .map(|meta| !meta.file_type().is_symlink())
+        .unwrap_or(false)
+    {
+        fs::set_permissions(&dest, dest_permissions).unwrap();
+    }
     for attribute in &options.preserve_attributes {
-        copy_attribute(source, dest, attribute)?;
+        copy_attribute(&source, &dest, attribute)?;
     }
     Ok(())
 }
 
 /// Copy the file from `source` to `dest` either using the normal `fs::copy` or a
 /// copy-on-write scheme if --reflink is specified and the filesystem supports it.
-fn copy_helper(source: &Path, dest: &Path, options: &Options) -> CopyResult<()> {
+fn copy_helper(source: &Path, dest: &Path, options: &Options, context: &str) -> CopyResult<()> {
     if options.parents {
         let parent = dest.parent().unwrap_or(dest);
         fs::create_dir_all(parent)?;
     }
     let is_symlink = fs::symlink_metadata(&source)?.file_type().is_symlink();
-    if source.to_string_lossy() == "/dev/null" {
+    if source.as_os_str() == "/dev/null" {
         /* workaround a limitation of fs::copy
          * https://github.com/rust-lang/rust/issues/79390
          */
         File::create(dest)?;
-    } else if !options.dereference && is_symlink {
+    } else if is_symlink {
         copy_link(source, dest)?;
     } else if options.reflink_mode != ReflinkMode::Never {
         #[cfg(not(any(target_os = "linux", target_os = "macos")))]
         return Err("--reflink is only supported on linux and macOS"
             .to_string()
             .into());
-        #[cfg(any(target_os = "linux", target_os = "macos"))]
-        if is_symlink {
-            assert!(options.dereference);
-            let real_path = std::fs::read_link(source)?;
 
-            #[cfg(target_os = "macos")]
-            copy_on_write_macos(&real_path, dest, options.reflink_mode)?;
-            #[cfg(target_os = "linux")]
-            copy_on_write_linux(&real_path, dest, options.reflink_mode)?;
-        } else {
-            #[cfg(target_os = "macos")]
-            copy_on_write_macos(source, dest, options.reflink_mode)?;
-            #[cfg(target_os = "linux")]
-            copy_on_write_linux(source, dest, options.reflink_mode)?;
-        }
+        #[cfg(target_os = "macos")]
+        copy_on_write_macos(source, dest, options.reflink_mode, context)?;
+        #[cfg(target_os = "linux")]
+        copy_on_write_linux(source, dest, options.reflink_mode, context)?;
     } else {
-        fs::copy(source, dest).context(&*context_for(source, dest))?;
+        fs::copy(source, dest).context(context)?;
     }
 
     Ok(())
@@ -1289,8 +1340,8 @@ fn copy_link(source: &Path, dest: &Path) -> CopyResult<()> {
             Some(name) => dest.join(name).into(),
             None => crash!(
                 EXIT_ERR,
-                "cannot stat '{}': No such file or directory",
-                source.display()
+                "cannot stat {}: No such file or directory",
+                source.quote()
             ),
         }
     } else {
@@ -1306,16 +1357,21 @@ fn copy_link(source: &Path, dest: &Path) -> CopyResult<()> {
 
 /// Copies `source` to `dest` using copy-on-write if possible.
 #[cfg(target_os = "linux")]
-fn copy_on_write_linux(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyResult<()> {
+fn copy_on_write_linux(
+    source: &Path,
+    dest: &Path,
+    mode: ReflinkMode,
+    context: &str,
+) -> CopyResult<()> {
     debug_assert!(mode != ReflinkMode::Never);
 
-    let src_file = File::open(source).context(&*context_for(source, dest))?;
+    let src_file = File::open(source).context(context)?;
     let dst_file = OpenOptions::new()
         .write(true)
         .truncate(false)
         .create(true)
         .open(dest)
-        .context(&*context_for(source, dest))?;
+        .context(context)?;
     match mode {
         ReflinkMode::Always => unsafe {
             let result = ficlone(dst_file.as_raw_fd(), src_file.as_raw_fd() as *const i32);
@@ -1334,7 +1390,7 @@ fn copy_on_write_linux(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyRes
         ReflinkMode::Auto => unsafe {
             let result = ficlone(dst_file.as_raw_fd(), src_file.as_raw_fd() as *const i32);
             if result != 0 {
-                fs::copy(source, dest).context(&*context_for(source, dest))?;
+                fs::copy(source, dest).context(context)?;
             }
             Ok(())
         },
@@ -1344,7 +1400,12 @@ fn copy_on_write_linux(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyRes
 
 /// Copies `source` to `dest` using copy-on-write if possible.
 #[cfg(target_os = "macos")]
-fn copy_on_write_macos(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyResult<()> {
+fn copy_on_write_macos(
+    source: &Path,
+    dest: &Path,
+    mode: ReflinkMode,
+    context: &str,
+) -> CopyResult<()> {
     debug_assert!(mode != ReflinkMode::Never);
 
     // Extract paths in a form suitable to be passed to a syscall.
@@ -1389,7 +1450,7 @@ fn copy_on_write_macos(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyRes
                     format!("failed to clone {:?} from {:?}: {}", source, dest, error).into(),
                 )
             }
-            ReflinkMode::Auto => fs::copy(source, dest).context(&*context_for(source, dest))?,
+            ReflinkMode::Auto => fs::copy(source, dest).context(context)?,
             ReflinkMode::Never => unreachable!(),
         };
     }
@@ -1401,11 +1462,11 @@ fn copy_on_write_macos(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyRes
 pub fn verify_target_type(target: &Path, target_type: &TargetType) -> CopyResult<()> {
     match (target_type, target.is_dir()) {
         (&TargetType::Directory, false) => {
-            Err(format!("target: '{}' is not a directory", target.display()).into())
+            Err(format!("target: {} is not a directory", target.quote()).into())
         }
         (&TargetType::File, true) => Err(format!(
-            "cannot overwrite directory '{}' with non-directory",
-            target.display()
+            "cannot overwrite directory {} with non-directory",
+            target.quote()
         )
         .into()),
         _ => Ok(()),
@@ -1430,8 +1491,8 @@ pub fn localize_to_target(root: &Path, source: &Path, target: &Path) -> CopyResu
 
 pub fn paths_refer_to_same_file(p1: &Path, p2: &Path) -> io::Result<bool> {
     // We have to take symlinks and relative paths into account.
-    let pathbuf1 = canonicalize(p1, CanonicalizeMode::Normal)?;
-    let pathbuf2 = canonicalize(p2, CanonicalizeMode::Normal)?;
+    let pathbuf1 = canonicalize(p1, MissingHandling::Normal, ResolveMode::Logical)?;
+    let pathbuf2 = canonicalize(p2, MissingHandling::Normal, ResolveMode::Logical)?;
 
     Ok(pathbuf1 == pathbuf2)
 }
diff --git a/src/uu/csplit/Cargo.toml b/src/uu/csplit/Cargo.toml
index 2ddc3b89c..b76e942ee 100644
--- a/src/uu/csplit/Cargo.toml
+++ b/src/uu/csplit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_csplit"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "csplit ~ (uutils) Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ..., and output byte counts of each piece to standard output"
@@ -18,10 +18,13 @@ path = "src/csplit.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 thiserror = "1.0"
 regex = "1.0.0"
-glob = "0.2.11"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "csplit"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs
index 048ec80d8..0d99154df 100644
--- a/src/uu/csplit/src/csplit.rs
+++ b/src/uu/csplit/src/csplit.rs
@@ -10,6 +10,7 @@ use std::{
     fs::{remove_file, File},
     io::{BufRead, BufWriter, Write},
 };
+use uucore::display::Quotable;
 
 mod csplit_error;
 mod patterns;
@@ -34,8 +35,11 @@ mod options {
     pub const PATTERN: &str = "pattern";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE PATTERN...", executable!())
+fn usage() -> String {
+    format!(
+        "{0} [OPTION]... FILE PATTERN...",
+        uucore::execution_phrase()
+    )
 }
 
 /// Command line options for csplit.
@@ -316,18 +320,19 @@ impl<'a> SplitWriter<'a> {
             let l = line?;
             match n.cmp(&(&ln + 1)) {
                 Ordering::Less => {
-                    if input_iter.add_line_to_buffer(ln, l).is_some() {
-                        panic!("the buffer is big enough to contain 1 line");
-                    }
+                    assert!(
+                        input_iter.add_line_to_buffer(ln, l).is_none(),
+                        "the buffer is big enough to contain 1 line"
+                    );
                     ret = Ok(());
                     break;
                 }
                 Ordering::Equal => {
-                    if !self.options.suppress_matched
-                        && input_iter.add_line_to_buffer(ln, l).is_some()
-                    {
-                        panic!("the buffer is big enough to contain 1 line");
-                    }
+                    assert!(
+                        self.options.suppress_matched
+                            || input_iter.add_line_to_buffer(ln, l).is_none(),
+                        "the buffer is big enough to contain 1 line"
+                    );
                     ret = Ok(());
                     break;
                 }
@@ -374,9 +379,10 @@ impl<'a> SplitWriter<'a> {
                     match (self.options.suppress_matched, offset) {
                         // no offset, add the line to the next split
                         (false, 0) => {
-                            if input_iter.add_line_to_buffer(ln, l).is_some() {
-                                panic!("the buffer is big enough to contain 1 line");
-                            }
+                            assert!(
+                                input_iter.add_line_to_buffer(ln, l).is_none(),
+                                "the buffer is big enough to contain 1 line"
+                            );
                         }
                         // a positive offset, some more lines need to be added to the current split
                         (false, _) => self.writeln(l)?,
@@ -421,9 +427,10 @@ impl<'a> SplitWriter<'a> {
                     if !self.options.suppress_matched {
                         // add 1 to the buffer size to make place for the matched line
                         input_iter.set_size_of_buffer(offset_usize + 1);
-                        if input_iter.add_line_to_buffer(ln, l).is_some() {
-                            panic!("should be big enough to hold every lines");
-                        }
+                        assert!(
+                            input_iter.add_line_to_buffer(ln, l).is_none(),
+                            "should be big enough to hold every lines"
+                        );
                     }
                     self.finish_split();
                     if input_iter.buffer_len() < offset_usize {
@@ -565,7 +572,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(0, line), None);
                 assert_eq!(input_splitter.buffer_len(), 1);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -574,7 +581,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(1, line), None);
                 assert_eq!(input_splitter.buffer_len(), 2);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -586,7 +593,7 @@ mod tests {
                 );
                 assert_eq!(input_splitter.buffer_len(), 2);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         input_splitter.rewind_buffer();
@@ -596,7 +603,7 @@ mod tests {
                 assert_eq!(line, String::from("bbb"));
                 assert_eq!(input_splitter.buffer_len(), 1);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -604,7 +611,7 @@ mod tests {
                 assert_eq!(line, String::from("ccc"));
                 assert_eq!(input_splitter.buffer_len(), 0);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -612,7 +619,7 @@ mod tests {
                 assert_eq!(line, String::from("ddd"));
                 assert_eq!(input_splitter.buffer_len(), 0);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         assert!(input_splitter.next().is_none());
@@ -637,7 +644,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(0, line), None);
                 assert_eq!(input_splitter.buffer_len(), 1);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -646,7 +653,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(1, line), None);
                 assert_eq!(input_splitter.buffer_len(), 2);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -655,7 +662,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(2, line), None);
                 assert_eq!(input_splitter.buffer_len(), 3);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         input_splitter.rewind_buffer();
@@ -666,7 +673,7 @@ mod tests {
                 assert_eq!(input_splitter.add_line_to_buffer(0, line), None);
                 assert_eq!(input_splitter.buffer_len(), 3);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -674,7 +681,7 @@ mod tests {
                 assert_eq!(line, String::from("aaa"));
                 assert_eq!(input_splitter.buffer_len(), 2);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -682,7 +689,7 @@ mod tests {
                 assert_eq!(line, String::from("bbb"));
                 assert_eq!(input_splitter.buffer_len(), 1);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -690,7 +697,7 @@ mod tests {
                 assert_eq!(line, String::from("ccc"));
                 assert_eq!(input_splitter.buffer_len(), 0);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         match input_splitter.next() {
@@ -698,7 +705,7 @@ mod tests {
                 assert_eq!(line, String::from("ddd"));
                 assert_eq!(input_splitter.buffer_len(), 0);
             }
-            item @ _ => panic!("wrong item: {:?}", item),
+            item => panic!("wrong item: {:?}", item),
         };
 
         assert!(input_splitter.next().is_none());
@@ -706,7 +713,7 @@ mod tests {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let args = args
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
@@ -722,16 +729,16 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .unwrap()
         .map(str::to_string)
         .collect();
-    let patterns = return_if_err!(1, patterns::get_patterns(&patterns[..]));
+    let patterns = crash_if_err!(1, patterns::get_patterns(&patterns[..]));
     let options = CsplitOptions::new(&matches);
     if file_name == "-" {
         let stdin = io::stdin();
         crash_if_err!(1, csplit(&options, patterns, stdin.lock()));
     } else {
-        let file = return_if_err!(1, File::open(file_name));
-        let file_metadata = return_if_err!(1, file.metadata());
+        let file = crash_if_err!(1, File::open(file_name));
+        let file_metadata = crash_if_err!(1, file.metadata());
         if !file_metadata.is_file() {
-            crash!(1, "'{}' is not a regular file", file_name);
+            crash!(1, "{} is not a regular file", file_name.quote());
         }
         crash_if_err!(1, csplit(&options, patterns, BufReader::new(file)));
     };
@@ -739,7 +746,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
         .arg(
diff --git a/src/uu/csplit/src/csplit_error.rs b/src/uu/csplit/src/csplit_error.rs
index 637cf8890..1d4823ee2 100644
--- a/src/uu/csplit/src/csplit_error.rs
+++ b/src/uu/csplit/src/csplit_error.rs
@@ -1,26 +1,28 @@
 use std::io;
 use thiserror::Error;
 
+use uucore::display::Quotable;
+
 /// Errors thrown by the csplit command
 #[derive(Debug, Error)]
 pub enum CsplitError {
     #[error("IO error: {}", _0)]
     IoError(io::Error),
-    #[error("'{}': line number out of range", _0)]
+    #[error("{}: line number out of range", ._0.quote())]
     LineOutOfRange(String),
-    #[error("'{}': line number out of range on repetition {}", _0, _1)]
+    #[error("{}: line number out of range on repetition {}", ._0.quote(), _1)]
     LineOutOfRangeOnRepetition(String, usize),
-    #[error("'{}': match not found", _0)]
+    #[error("{}: match not found", ._0.quote())]
     MatchNotFound(String),
-    #[error("'{}': match not found on repetition {}", _0, _1)]
+    #[error("{}: match not found on repetition {}", ._0.quote(), _1)]
     MatchNotFoundOnRepetition(String, usize),
     #[error("line number must be greater than zero")]
     LineNumberIsZero,
     #[error("line number '{}' is smaller than preceding line number, {}", _0, _1)]
     LineNumberSmallerThanPrevious(usize, usize),
-    #[error("invalid pattern: {}", _0)]
+    #[error("{}: invalid pattern", ._0.quote())]
     InvalidPattern(String),
-    #[error("invalid number: '{}'", _0)]
+    #[error("invalid number: {}", ._0.quote())]
     InvalidNumber(String),
     #[error("incorrect conversion specification in suffix")]
     SuffixFormatIncorrect,
diff --git a/src/uu/csplit/src/split_name.rs b/src/uu/csplit/src/split_name.rs
index 758216414..44ea2a5af 100644
--- a/src/uu/csplit/src/split_name.rs
+++ b/src/uu/csplit/src/split_name.rs
@@ -47,7 +47,7 @@ impl SplitName {
             }),
             Some(custom) => {
                 let spec =
-                    Regex::new(r"(?P<ALL>%(?P<FLAG>[0#-])(?P<WIDTH>\d+)?(?P<TYPE>[diuoxX]))")
+                    Regex::new(r"(?P<ALL>%((?P<FLAG>[0#-])(?P<WIDTH>\d+)?)?(?P<TYPE>[diuoxX]))")
                         .unwrap();
                 let mut captures_iter = spec.captures_iter(&custom);
                 let custom_fn: Box<dyn Fn(usize) -> String> = match captures_iter.next() {
@@ -60,6 +60,21 @@ impl SplitName {
                             Some(m) => m.as_str().parse::<usize>().unwrap(),
                         };
                         match (captures.name("FLAG"), captures.name("TYPE")) {
+                            (None, Some(ref t)) => match t.as_str() {
+                                "d" | "i" | "u" => Box::new(move |n: usize| -> String {
+                                    format!("{}{}{}{}", prefix, before, n, after)
+                                }),
+                                "o" => Box::new(move |n: usize| -> String {
+                                    format!("{}{}{:o}{}", prefix, before, n, after)
+                                }),
+                                "x" => Box::new(move |n: usize| -> String {
+                                    format!("{}{}{:x}{}", prefix, before, n, after)
+                                }),
+                                "X" => Box::new(move |n: usize| -> String {
+                                    format!("{}{}{:X}{}", prefix, before, n, after)
+                                }),
+                                _ => return Err(CsplitError::SuffixFormatIncorrect),
+                            },
                             (Some(ref f), Some(ref t)) => {
                                 match (f.as_str(), t.as_str()) {
                                     /*
@@ -276,6 +291,12 @@ mod tests {
         assert_eq!(split_name.get(2), "xx00002");
     }
 
+    #[test]
+    fn no_padding_decimal() {
+        let split_name = SplitName::new(None, Some(String::from("cst-%d-")), None).unwrap();
+        assert_eq!(split_name.get(2), "xxcst-2-");
+    }
+
     #[test]
     fn zero_padding_decimal1() {
         let split_name = SplitName::new(None, Some(String::from("cst-%03d-")), None).unwrap();
diff --git a/src/uu/cut/Cargo.toml b/src/uu/cut/Cargo.toml
index 6f92b39d1..991e3c449 100644
--- a/src/uu/cut/Cargo.toml
+++ b/src/uu/cut/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_cut"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "cut ~ (uutils) display byte/field columns of input lines"
@@ -16,8 +16,8 @@ path = "src/cut.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 memchr = "2"
 bstr = "0.2"
 atty = "0.2"
@@ -25,3 +25,7 @@ atty = "0.2"
 [[bin]]
 name = "cut"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs
index e33b8a2fe..35d92b83f 100644
--- a/src/uu/cut/src/cut.rs
+++ b/src/uu/cut/src/cut.rs
@@ -15,6 +15,7 @@ use clap::{crate_version, App, Arg};
 use std::fs::File;
 use std::io::{stdin, stdout, BufReader, BufWriter, Read, Write};
 use std::path::Path;
+use uucore::display::Quotable;
 
 use self::searcher::Searcher;
 use uucore::ranges::Range;
@@ -351,19 +352,19 @@ fn cut_files(mut filenames: Vec<String>, mode: Mode) -> i32 {
             let path = Path::new(&filename[..]);
 
             if path.is_dir() {
-                show_error!("{}: Is a directory", filename);
+                show_error!("{}: Is a directory", filename.maybe_quote());
                 continue;
             }
 
             if path.metadata().is_err() {
-                show_error!("{}: No such file or directory", filename);
+                show_error!("{}: No such file or directory", filename.maybe_quote());
                 continue;
             }
 
             let file = match File::open(&path) {
                 Ok(f) => f,
                 Err(e) => {
-                    show_error!("opening '{}': {}", &filename[..], e);
+                    show_error!("opening {}: {}", filename.quote(), e);
                     continue;
                 }
             };
@@ -548,7 +549,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(SYNTAX)
diff --git a/src/uu/date/Cargo.toml b/src/uu/date/Cargo.toml
index c144d0d81..b1077fbe1 100644
--- a/src/uu/date/Cargo.toml
+++ b/src/uu/date/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_date"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "date ~ (uutils) display or set the current time"
@@ -17,8 +17,8 @@ path = "src/date.rs"
 [dependencies]
 chrono = "0.4.4"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
@@ -29,3 +29,7 @@ winapi = { version = "0.3", features = ["minwinbase", "sysinfoapi", "minwindef"]
 [[bin]]
 name = "date"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs
index 0071b5e8c..adcf77024 100644
--- a/src/uu/date/src/date.rs
+++ b/src/uu/date/src/date.rs
@@ -8,18 +8,17 @@
 
 // spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes
 
-#[macro_use]
-extern crate uucore;
-
 use chrono::{DateTime, FixedOffset, Local, Offset, Utc};
 #[cfg(windows)]
 use chrono::{Datelike, Timelike};
 use clap::{crate_version, App, Arg};
-#[cfg(all(unix, not(target_os = "macos")))]
+#[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))]
 use libc::{clock_settime, timespec, CLOCK_REALTIME};
 use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
+use uucore::display::Quotable;
+use uucore::show_error;
 #[cfg(windows)]
 use winapi::{
     shared::minwindef::WORD,
@@ -67,10 +66,12 @@ static RFC_3339_HELP_STRING: &str = "output date/time in RFC 3339 format.
  for date and time to the indicated precision.
  Example: 2006-08-14 02:34:56-06:00";
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(not(any(target_os = "macos", target_os = "redox")))]
 static OPT_SET_HELP_STRING: &str = "set time described by STRING";
 #[cfg(target_os = "macos")]
 static OPT_SET_HELP_STRING: &str = "set time described by STRING (not available on mac yet)";
+#[cfg(target_os = "redox")]
+static OPT_SET_HELP_STRING: &str = "set time described by STRING (not available on redox yet)";
 
 /// Settings for this program, parsed from the command line
 struct Settings {
@@ -146,7 +147,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let format = if let Some(form) = matches.value_of(OPT_FORMAT) {
         if !form.starts_with('+') {
-            eprintln!("date: invalid date '{}'", form);
+            show_error!("invalid date {}", form.quote());
             return 1;
         }
         let form = form[1..].to_string();
@@ -175,7 +176,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let set_to = match matches.value_of(OPT_SET).map(parse_date) {
         None => None,
         Some(Err((input, _err))) => {
-            eprintln!("date: invalid date '{}'", input);
+            show_error!("invalid date {}", input.quote());
             return 1;
         }
         Some(Ok(date)) => Some(date),
@@ -241,7 +242,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                     println!("{}", formatted);
                 }
                 Err((input, _err)) => {
-                    println!("date: invalid date '{}'", input);
+                    show_error!("invalid date {}", input.quote());
                 }
             }
         }
@@ -251,7 +252,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -353,11 +354,17 @@ fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
 
 #[cfg(target_os = "macos")]
 fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
-    eprintln!("date: setting the date is not supported by macOS");
+    show_error!("setting the date is not supported by macOS");
     1
 }
 
-#[cfg(all(unix, not(target_os = "macos")))]
+#[cfg(target_os = "redox")]
+fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
+    show_error!("setting the date is not supported by Redox");
+    1
+}
+
+#[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))]
 /// System call to set date (unix).
 /// See here for more:
 /// https://doc.rust-lang.org/libc/i686-unknown-linux-gnu/libc/fn.clock_settime.html
@@ -373,7 +380,7 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
 
     if result != 0 {
         let error = std::io::Error::last_os_error();
-        eprintln!("date: cannot set date: {}", error);
+        show_error!("cannot set date: {}", error);
         error.raw_os_error().unwrap()
     } else {
         0
@@ -403,7 +410,7 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
 
     if result == 0 {
         let error = std::io::Error::last_os_error();
-        eprintln!("date: cannot set date: {}", error);
+        show_error!("cannot set date: {}", error);
         error.raw_os_error().unwrap()
     } else {
         0
diff --git a/src/uu/dd/Cargo.toml b/src/uu/dd/Cargo.toml
new file mode 100644
index 000000000..e26c141cb
--- /dev/null
+++ b/src/uu/dd/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "uu_dd"
+version = "0.0.8"
+authors = ["uutils developers"]
+license = "MIT"
+description = "dd ~ (uutils) copy and convert files"
+
+homepage = "https://github.com/uutils/coreutils"
+repository = "https://github.com/uutils/coreutils/tree/master/src/uu/dd"
+keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
+categories = ["command-line-utilities"]
+edition = "2018"
+
+[lib]
+path = "src/dd.rs"
+
+[dependencies]
+byte-unit = "4.0"
+clap = { version = "2.33", features = [ "wrap_help" ] }
+gcd = "2.0"
+libc = "0.2"
+uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
+
+[dev-dependencies]
+tempfile = "^3"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+signal-hook = "0.3.9"
+
+[[bin]]
+name = "dd"
+path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/dd/src/conversion_tables.rs b/src/uu/dd/src/conversion_tables.rs
new file mode 100644
index 000000000..aca2ef9bc
--- /dev/null
+++ b/src/uu/dd/src/conversion_tables.rs
@@ -0,0 +1,221 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Tyler Steele <tyler.steele@protonmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+// Note: Conversion tables are just lookup tables.
+// eg. The ASCII->EBCDIC table stores the EBCDIC code at the index
+// obtained by treating the ASCII representation as a number.
+
+pub type ConversionTable = [u8; 256];
+
+pub const ASCII_UCASE_TO_LCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+    0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+    0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
+    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_LCASE_TO_UCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+    0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_EBCDIC: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xad, 0xe0, 0xbd, 0x9a, 0x6d,
+    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0x5f, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x6a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0x4a, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xa1, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_EBCDIC_UCASE_TO_LCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xad, 0xe0, 0xbd, 0x9a, 0x6d,
+    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0x5f, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x6a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0x4a, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xa1, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_EBCDIC_LCASE_TO_UCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xad, 0xe0, 0xbd, 0x9a, 0x6d,
+    0x79, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xc0, 0x4f, 0xd0, 0x5f, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x6a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0x4a, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xa1, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_IBM: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xad, 0xe0, 0xbd, 0x5f, 0x6d,
+    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_IBM_UCASE_TO_LCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xad, 0xe0, 0xbd, 0x5f, 0x6d,
+    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const ASCII_TO_IBM_LCASE_TO_UCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xad, 0xe0, 0xbd, 0x5f, 0x6d,
+    0x79, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const EBCDIC_TO_ASCII: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x9c, 0x09, 0x86, 0x7f, 0x97, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x9d, 0x85, 0x08, 0x87, 0x18, 0x19, 0x92, 0x8f, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x0a, 0x17, 0x1b, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07,
+    0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, 0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a,
+    0x20, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xd5, 0x2e, 0x3c, 0x28, 0x2b, 0x7c,
+    0x26, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x7e,
+    0x2d, 0x2f, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xcb, 0x2c, 0x25, 0x5f, 0x3e, 0x3f,
+    0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22,
+    0xc3, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
+    0xca, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x5e, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
+    0xd1, 0xe5, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0xd2, 0xd3, 0xd4, 0x5b, 0xd6, 0xd7,
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0x5d, 0xe6, 0xe7,
+    0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed,
+    0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3,
+    0x5c, 0x9f, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const EBCDIC_TO_ASCII_UCASE_TO_LCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xad, 0xe0, 0xbd, 0x5f, 0x6d,
+    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
+
+pub const EBCDIC_TO_ASCII_LCASE_TO_UCASE: ConversionTable = [
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f, 0x16, 0x05, 0x25, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26, 0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d, 0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61,
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f,
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xad, 0xe0, 0xbd, 0x5f, 0x6d,
+    0x79, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6,
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xc0, 0x4f, 0xd0, 0xa1, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x15, 0x06, 0x17, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x1b,
+    0x30, 0x31, 0x1a, 0x33, 0x34, 0x35, 0x36, 0x08, 0x38, 0x39, 0x3a, 0x3b, 0x04, 0x14, 0x3e, 0xe1,
+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+    0x58, 0x59, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x80, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e,
+    0x9f, 0xa0, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xda, 0xdb,
+    0xdc, 0xdd, 0xde, 0xdf, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
+];
diff --git a/src/uu/dd/src/datastructures.rs b/src/uu/dd/src/datastructures.rs
new file mode 100644
index 000000000..b4410d210
--- /dev/null
+++ b/src/uu/dd/src/datastructures.rs
@@ -0,0 +1,172 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Tyler Steele <tyler.steele@protonmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+// spell-checker:ignore ctable, outfile
+
+use crate::conversion_tables::*;
+
+use std::error::Error;
+use std::time;
+
+pub struct ProgUpdate {
+    pub read_stat: ReadStat,
+    pub write_stat: WriteStat,
+    pub duration: time::Duration,
+}
+
+#[derive(Clone, Copy, Default)]
+pub struct ReadStat {
+    pub reads_complete: u64,
+    pub reads_partial: u64,
+    pub records_truncated: u32,
+}
+impl std::ops::AddAssign for ReadStat {
+    fn add_assign(&mut self, other: Self) {
+        *self = Self {
+            reads_complete: self.reads_complete + other.reads_complete,
+            reads_partial: self.reads_partial + other.reads_partial,
+            records_truncated: self.records_truncated + other.records_truncated,
+        }
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct WriteStat {
+    pub writes_complete: u64,
+    pub writes_partial: u64,
+    pub bytes_total: u128,
+}
+impl std::ops::AddAssign for WriteStat {
+    fn add_assign(&mut self, other: Self) {
+        *self = Self {
+            writes_complete: self.writes_complete + other.writes_complete,
+            writes_partial: self.writes_partial + other.writes_partial,
+            bytes_total: self.bytes_total + other.bytes_total,
+        }
+    }
+}
+
+type Cbs = usize;
+
+/// Stores all Conv Flags that apply to the input
+#[derive(Debug, Default, PartialEq)]
+pub struct IConvFlags {
+    pub ctable: Option<&'static ConversionTable>,
+    pub block: Option<Cbs>,
+    pub unblock: Option<Cbs>,
+    pub swab: bool,
+    pub sync: Option<u8>,
+    pub noerror: bool,
+}
+
+/// Stores all Conv Flags that apply to the output
+#[derive(Debug, Default, PartialEq)]
+pub struct OConvFlags {
+    pub sparse: bool,
+    pub excl: bool,
+    pub nocreat: bool,
+    pub notrunc: bool,
+    pub fdatasync: bool,
+    pub fsync: bool,
+}
+
+/// Stores all Flags that apply to the input
+#[derive(Debug, Default, PartialEq)]
+pub struct IFlags {
+    pub cio: bool,
+    pub direct: bool,
+    pub directory: bool,
+    pub dsync: bool,
+    pub sync: bool,
+    pub nocache: bool,
+    pub nonblock: bool,
+    pub noatime: bool,
+    pub noctty: bool,
+    pub nofollow: bool,
+    pub nolinks: bool,
+    pub binary: bool,
+    pub text: bool,
+    pub fullblock: bool,
+    pub count_bytes: bool,
+    pub skip_bytes: bool,
+}
+
+/// Stores all Flags that apply to the output
+#[derive(Debug, Default, PartialEq)]
+pub struct OFlags {
+    pub append: bool,
+    pub cio: bool,
+    pub direct: bool,
+    pub directory: bool,
+    pub dsync: bool,
+    pub sync: bool,
+    pub nocache: bool,
+    pub nonblock: bool,
+    pub noatime: bool,
+    pub noctty: bool,
+    pub nofollow: bool,
+    pub nolinks: bool,
+    pub binary: bool,
+    pub text: bool,
+    pub seek_bytes: bool,
+}
+
+/// The value of the status cl-option.
+/// Controls printing of transfer stats
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub enum StatusLevel {
+    Progress,
+    Noxfer,
+    None,
+}
+
+/// The value of count=N
+/// Defaults to Reads(N)
+/// if iflag=count_bytes
+/// then becomes Bytes(N)
+#[derive(Debug, PartialEq)]
+pub enum CountType {
+    Reads(usize),
+    Bytes(usize),
+}
+
+#[derive(Debug)]
+pub enum InternalError {
+    WrongInputType,
+    WrongOutputType,
+    InvalidConvBlockUnblockCase,
+}
+
+impl std::fmt::Display for InternalError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::WrongInputType | Self::WrongOutputType => {
+                write!(f, "Internal dd error: Wrong Input/Output data type")
+            }
+            Self::InvalidConvBlockUnblockCase => {
+                write!(f, "Invalid Conversion, Block, or Unblock data")
+            }
+        }
+    }
+}
+
+impl Error for InternalError {}
+
+pub mod options {
+    pub const INFILE: &str = "if";
+    pub const OUTFILE: &str = "of";
+    pub const IBS: &str = "ibs";
+    pub const OBS: &str = "obs";
+    pub const BS: &str = "bs";
+    pub const CBS: &str = "cbs";
+    pub const COUNT: &str = "count";
+    pub const SKIP: &str = "skip";
+    pub const SEEK: &str = "seek";
+    pub const STATUS: &str = "status";
+    pub const CONV: &str = "conv";
+    pub const IFLAG: &str = "iflag";
+    pub const OFLAG: &str = "oflag";
+}
diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs
new file mode 100644
index 000000000..9f1d28714
--- /dev/null
+++ b/src/uu/dd/src/dd.rs
@@ -0,0 +1,1144 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Tyler Steele <tyler.steele@protonmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use uucore::InvalidEncodingHandling;
+
+#[cfg(test)]
+mod dd_unit_tests;
+
+mod datastructures;
+use datastructures::*;
+
+mod parseargs;
+use parseargs::Matches;
+
+mod conversion_tables;
+use conversion_tables::*;
+
+use byte_unit::Byte;
+use clap::{self, crate_version};
+use gcd::Gcd;
+#[cfg(target_os = "linux")]
+use signal_hook::consts::signal;
+use std::cmp;
+use std::convert::TryInto;
+use std::env;
+use std::error::Error;
+use std::fs::{File, OpenOptions};
+use std::io::{self, Read, Seek, Write};
+#[cfg(target_os = "linux")]
+use std::os::unix::fs::OpenOptionsExt;
+use std::path::Path;
+use std::sync::mpsc;
+#[cfg(target_os = "linux")]
+use std::sync::{atomic::AtomicUsize, atomic::Ordering, Arc};
+use std::thread;
+use std::time;
+
+const ABOUT: &str = "copy, and optionally convert, a file system resource";
+const BUF_INIT_BYTE: u8 = 0xDD;
+const RTN_SUCCESS: i32 = 0;
+const RTN_FAILURE: i32 = 1;
+const NEWLINE: u8 = b'\n';
+const SPACE: u8 = b' ';
+
+struct Input<R: Read> {
+    src: R,
+    non_ascii: bool,
+    ibs: usize,
+    print_level: Option<StatusLevel>,
+    count: Option<CountType>,
+    cflags: IConvFlags,
+    iflags: IFlags,
+}
+
+impl Input<io::Stdin> {
+    fn new(matches: &Matches) -> Result<Self, Box<dyn Error>> {
+        let ibs = parseargs::parse_ibs(matches)?;
+        let non_ascii = parseargs::parse_input_non_ascii(matches)?;
+        let print_level = parseargs::parse_status_level(matches)?;
+        let cflags = parseargs::parse_conv_flag_input(matches)?;
+        let iflags = parseargs::parse_iflags(matches)?;
+        let skip = parseargs::parse_skip_amt(&ibs, &iflags, matches)?;
+        let count = parseargs::parse_count(&iflags, matches)?;
+
+        let mut i = Input {
+            src: io::stdin(),
+            non_ascii,
+            ibs,
+            print_level,
+            count,
+            cflags,
+            iflags,
+        };
+
+        if let Some(amt) = skip {
+            let mut buf = vec![BUF_INIT_BYTE; amt];
+
+            i.force_fill(&mut buf, amt)?;
+        }
+
+        Ok(i)
+    }
+}
+
+#[cfg(target_os = "linux")]
+fn make_linux_iflags(iflags: &IFlags) -> Option<libc::c_int> {
+    let mut flag = 0;
+
+    if iflags.direct {
+        flag |= libc::O_DIRECT;
+    }
+    if iflags.directory {
+        flag |= libc::O_DIRECTORY;
+    }
+    if iflags.dsync {
+        flag |= libc::O_DSYNC;
+    }
+    if iflags.noatime {
+        flag |= libc::O_NOATIME;
+    }
+    if iflags.noctty {
+        flag |= libc::O_NOCTTY;
+    }
+    if iflags.nofollow {
+        flag |= libc::O_NOFOLLOW;
+    }
+    if iflags.nonblock {
+        flag |= libc::O_NONBLOCK;
+    }
+    if iflags.sync {
+        flag |= libc::O_SYNC;
+    }
+
+    if flag != 0 {
+        Some(flag)
+    } else {
+        None
+    }
+}
+
+impl Input<File> {
+    fn new(matches: &Matches) -> Result<Self, Box<dyn Error>> {
+        let ibs = parseargs::parse_ibs(matches)?;
+        let non_ascii = parseargs::parse_input_non_ascii(matches)?;
+        let print_level = parseargs::parse_status_level(matches)?;
+        let cflags = parseargs::parse_conv_flag_input(matches)?;
+        let iflags = parseargs::parse_iflags(matches)?;
+        let skip = parseargs::parse_skip_amt(&ibs, &iflags, matches)?;
+        let count = parseargs::parse_count(&iflags, matches)?;
+
+        if let Some(fname) = matches.value_of(options::INFILE) {
+            let mut src = {
+                let mut opts = OpenOptions::new();
+                opts.read(true);
+
+                #[cfg(target_os = "linux")]
+                if let Some(libc_flags) = make_linux_iflags(&iflags) {
+                    opts.custom_flags(libc_flags);
+                }
+
+                opts.open(fname)?
+            };
+
+            if let Some(amt) = skip {
+                let amt: u64 = amt.try_into()?;
+                src.seek(io::SeekFrom::Start(amt))?;
+            }
+
+            let i = Input {
+                src,
+                non_ascii,
+                ibs,
+                print_level,
+                count,
+                cflags,
+                iflags,
+            };
+
+            Ok(i)
+        } else {
+            Err(Box::new(InternalError::WrongInputType))
+        }
+    }
+}
+
+impl<R: Read> Read for Input<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let mut base_idx = 0;
+        let target_len = buf.len();
+        loop {
+            match self.src.read(&mut buf[base_idx..]) {
+                Ok(0) => return Ok(base_idx),
+                Ok(rlen) if self.iflags.fullblock => {
+                    base_idx += rlen;
+
+                    if base_idx >= target_len {
+                        return Ok(target_len);
+                    }
+                }
+                Ok(len) => return Ok(len),
+                Err(e) if e.kind() == io::ErrorKind::Interrupted => continue,
+                Err(_) if self.cflags.noerror => return Ok(base_idx),
+                Err(e) => return Err(e),
+            }
+        }
+    }
+}
+
+impl<R: Read> Input<R> {
+    /// Fills a given buffer.
+    /// Reads in increments of 'self.ibs'.
+    /// The start of each ibs-sized read follows the previous one.
+    fn fill_consecutive(&mut self, buf: &mut Vec<u8>) -> Result<ReadStat, Box<dyn Error>> {
+        let mut reads_complete = 0;
+        let mut reads_partial = 0;
+        let mut bytes_total = 0;
+
+        for chunk in buf.chunks_mut(self.ibs) {
+            match self.read(chunk)? {
+                rlen if rlen == self.ibs => {
+                    bytes_total += rlen;
+                    reads_complete += 1;
+                }
+                rlen if rlen > 0 => {
+                    bytes_total += rlen;
+                    reads_partial += 1;
+                }
+                _ => break,
+            }
+        }
+
+        buf.truncate(bytes_total);
+        Ok(ReadStat {
+            reads_complete,
+            reads_partial,
+            // Records are not truncated when filling.
+            records_truncated: 0,
+        })
+    }
+
+    /// Fills a given buffer.
+    /// Reads in increments of 'self.ibs'.
+    /// The start of each ibs-sized read is aligned to multiples of ibs; remaining space is filled with the 'pad' byte.
+    fn fill_blocks(&mut self, buf: &mut Vec<u8>, pad: u8) -> Result<ReadStat, Box<dyn Error>> {
+        let mut reads_complete = 0;
+        let mut reads_partial = 0;
+        let mut base_idx = 0;
+
+        while base_idx < buf.len() {
+            let next_blk = cmp::min(base_idx + self.ibs, buf.len());
+            let target_len = next_blk - base_idx;
+
+            match self.read(&mut buf[base_idx..next_blk])? {
+                0 => break,
+                rlen if rlen < target_len => {
+                    reads_partial += 1;
+                    let padding = vec![pad; target_len - rlen];
+                    buf.splice(base_idx + rlen..next_blk, padding.into_iter());
+                }
+                _ => {
+                    reads_complete += 1;
+                }
+            }
+
+            base_idx += self.ibs;
+        }
+
+        buf.truncate(base_idx);
+        Ok(ReadStat {
+            reads_complete,
+            reads_partial,
+            records_truncated: 0,
+        })
+    }
+
+    /// Force-fills a buffer, ignoring zero-length reads which would otherwise be
+    /// interpreted as EOF.
+    /// Note: This will not return unless the source (eventually) produces
+    /// enough bytes to meet target_len.
+    fn force_fill(&mut self, buf: &mut [u8], target_len: usize) -> Result<usize, Box<dyn Error>> {
+        let mut base_idx = 0;
+        while base_idx < target_len {
+            base_idx += self.read(&mut buf[base_idx..target_len])?;
+        }
+
+        Ok(base_idx)
+    }
+}
+
+trait OutputTrait: Sized + Write {
+    fn new(matches: &Matches) -> Result<Self, Box<dyn Error>>;
+    fn fsync(&mut self) -> io::Result<()>;
+    fn fdatasync(&mut self) -> io::Result<()>;
+}
+
+struct Output<W: Write> {
+    dst: W,
+    obs: usize,
+    cflags: OConvFlags,
+}
+
+impl OutputTrait for Output<io::Stdout> {
+    fn new(matches: &Matches) -> Result<Self, Box<dyn Error>> {
+        let obs = parseargs::parse_obs(matches)?;
+        let cflags = parseargs::parse_conv_flag_output(matches)?;
+
+        let dst = io::stdout();
+
+        Ok(Output { dst, obs, cflags })
+    }
+
+    fn fsync(&mut self) -> io::Result<()> {
+        self.dst.flush()
+    }
+
+    fn fdatasync(&mut self) -> io::Result<()> {
+        self.dst.flush()
+    }
+}
+
+impl<W: Write> Output<W>
+where
+    Self: OutputTrait,
+{
+    fn write_blocks(&mut self, buf: Vec<u8>) -> io::Result<WriteStat> {
+        let mut writes_complete = 0;
+        let mut writes_partial = 0;
+        let mut bytes_total = 0;
+
+        for chunk in buf.chunks(self.obs) {
+            match self.write(chunk)? {
+                wlen if wlen < chunk.len() => {
+                    writes_partial += 1;
+                    bytes_total += wlen;
+                }
+                wlen => {
+                    writes_complete += 1;
+                    bytes_total += wlen;
+                }
+            }
+        }
+
+        Ok(WriteStat {
+            writes_complete,
+            writes_partial,
+            bytes_total: bytes_total.try_into().unwrap_or(0u128),
+        })
+    }
+
+    fn dd_out<R: Read>(mut self, mut i: Input<R>) -> Result<(), Box<dyn Error>> {
+        let mut rstat = ReadStat {
+            reads_complete: 0,
+            reads_partial: 0,
+            records_truncated: 0,
+        };
+        let mut wstat = WriteStat {
+            writes_complete: 0,
+            writes_partial: 0,
+            bytes_total: 0,
+        };
+        let start = time::Instant::now();
+        let bsize = calc_bsize(i.ibs, self.obs);
+
+        let prog_tx = {
+            let (tx, rx) = mpsc::channel();
+            thread::spawn(gen_prog_updater(rx, i.print_level));
+            tx
+        };
+
+        while below_count_limit(&i.count, &rstat, &wstat) {
+            // Read/Write
+            let loop_bsize = calc_loop_bsize(&i.count, &rstat, &wstat, i.ibs, bsize);
+            match read_helper(&mut i, loop_bsize)? {
+                (
+                    ReadStat {
+                        reads_complete: 0,
+                        reads_partial: 0,
+                        ..
+                    },
+                    _,
+                ) => break,
+                (rstat_update, buf) => {
+                    let wstat_update = self.write_blocks(buf)?;
+
+                    rstat += rstat_update;
+                    wstat += wstat_update;
+                }
+            };
+            // Update Prog
+            prog_tx.send(ProgUpdate {
+                read_stat: rstat,
+                write_stat: wstat,
+                duration: start.elapsed(),
+            })?;
+        }
+
+        if self.cflags.fsync {
+            self.fsync()?;
+        } else if self.cflags.fdatasync {
+            self.fdatasync()?;
+        }
+
+        match i.print_level {
+            Some(StatusLevel::Noxfer) | Some(StatusLevel::None) => {}
+            _ => print_transfer_stats(&ProgUpdate {
+                read_stat: rstat,
+                write_stat: wstat,
+                duration: start.elapsed(),
+            }),
+        }
+        Ok(())
+    }
+}
+
+#[cfg(target_os = "linux")]
+fn make_linux_oflags(oflags: &OFlags) -> Option<libc::c_int> {
+    let mut flag = 0;
+
+    // oflag=FLAG
+    if oflags.append {
+        flag |= libc::O_APPEND;
+    }
+    if oflags.direct {
+        flag |= libc::O_DIRECT;
+    }
+    if oflags.directory {
+        flag |= libc::O_DIRECTORY;
+    }
+    if oflags.dsync {
+        flag |= libc::O_DSYNC;
+    }
+    if oflags.noatime {
+        flag |= libc::O_NOATIME;
+    }
+    if oflags.noctty {
+        flag |= libc::O_NOCTTY;
+    }
+    if oflags.nofollow {
+        flag |= libc::O_NOFOLLOW;
+    }
+    if oflags.nonblock {
+        flag |= libc::O_NONBLOCK;
+    }
+    if oflags.sync {
+        flag |= libc::O_SYNC;
+    }
+
+    if flag != 0 {
+        Some(flag)
+    } else {
+        None
+    }
+}
+
+impl OutputTrait for Output<File> {
+    fn new(matches: &Matches) -> Result<Self, Box<dyn Error>> {
+        fn open_dst(path: &Path, cflags: &OConvFlags, oflags: &OFlags) -> Result<File, io::Error> {
+            let mut opts = OpenOptions::new();
+            opts.write(true)
+                .create(!cflags.nocreat)
+                .truncate(!cflags.notrunc)
+                .create_new(cflags.excl)
+                .append(oflags.append);
+
+            #[cfg(target_os = "linux")]
+            if let Some(libc_flags) = make_linux_oflags(oflags) {
+                opts.custom_flags(libc_flags);
+            }
+
+            opts.open(path)
+        }
+        let obs = parseargs::parse_obs(matches)?;
+        let cflags = parseargs::parse_conv_flag_output(matches)?;
+        let oflags = parseargs::parse_oflags(matches)?;
+        let seek = parseargs::parse_seek_amt(&obs, &oflags, matches)?;
+
+        if let Some(fname) = matches.value_of(options::OUTFILE) {
+            let mut dst = open_dst(Path::new(&fname), &cflags, &oflags)?;
+
+            if let Some(amt) = seek {
+                let amt: u64 = amt.try_into()?;
+                dst.seek(io::SeekFrom::Start(amt))?;
+            }
+
+            Ok(Output { dst, obs, cflags })
+        } else {
+            // The following error should only occur if someone
+            // mistakenly calls Output::<File>::new() without checking
+            // if 'of' has been provided. In this case,
+            // Output::<io::stdout>::new() is probably intended.
+            Err(Box::new(InternalError::WrongOutputType))
+        }
+    }
+
+    fn fsync(&mut self) -> io::Result<()> {
+        self.dst.flush()?;
+        self.dst.sync_all()
+    }
+
+    fn fdatasync(&mut self) -> io::Result<()> {
+        self.dst.flush()?;
+        self.dst.sync_data()
+    }
+}
+
+impl Seek for Output<File> {
+    fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
+        self.dst.seek(pos)
+    }
+}
+
+impl Write for Output<File> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        fn is_sparse(buf: &[u8]) -> bool {
+            buf.iter().all(|&e| e == 0u8)
+        }
+        // -----------------------------
+        if self.cflags.sparse && is_sparse(buf) {
+            let seek_amt: i64 = buf
+                .len()
+                .try_into()
+                .expect("Internal dd Error: Seek amount greater than signed 64-bit integer");
+            self.dst.seek(io::SeekFrom::Current(seek_amt))?;
+            Ok(buf.len())
+        } else {
+            self.dst.write(buf)
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.dst.flush()
+    }
+}
+
+impl Write for Output<io::Stdout> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.dst.write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.dst.flush()
+    }
+}
+
+/// Splits the content of buf into cbs-length blocks
+/// Appends padding as specified by conv=block and cbs=N
+/// Expects ascii encoded data
+fn block(buf: Vec<u8>, cbs: usize, rstat: &mut ReadStat) -> Vec<Vec<u8>> {
+    let mut blocks = buf
+        .split(|&e| e == NEWLINE)
+        .map(|split| split.to_vec())
+        .fold(Vec::new(), |mut blocks, mut split| {
+            if split.len() > cbs {
+                rstat.records_truncated += 1;
+            }
+            split.resize(cbs, SPACE);
+            blocks.push(split);
+
+            blocks
+        });
+
+    if let Some(last) = blocks.last() {
+        if last.iter().all(|&e| e == SPACE) {
+            blocks.pop();
+        }
+    }
+
+    blocks
+}
+
+/// Trims padding from each cbs-length partition of buf
+/// as specified by conv=unblock and cbs=N
+/// Expects ascii encoded data
+fn unblock(buf: Vec<u8>, cbs: usize) -> Vec<u8> {
+    buf.chunks(cbs).fold(Vec::new(), |mut acc, block| {
+        if let Some(last_char_idx) = block.iter().rposition(|&e| e != SPACE) {
+            // Include text up to last space.
+            acc.extend(&block[..=last_char_idx]);
+        }
+
+        acc.push(NEWLINE);
+        acc
+    })
+}
+
+/// A helper for teasing out which options must be applied and in which order.
+/// Some user options, such as the presence of conversion tables, will determine whether the input is assumed to be ascii. The parser sets the Input::non_ascii flag accordingly.
+/// Examples:
+///     - If conv=ebcdic or conv=ibm is specified then block, unblock or swab must be performed before the conversion happens since the source will start in ascii.
+///     - If conv=ascii is specified then block, unblock or swab must be performed after the conversion since the source starts in ebcdic.
+///     - If no conversion is specified then the source is assumed to be in ascii.
+/// For more info see `info dd`
+fn conv_block_unblock_helper<R: Read>(
+    mut buf: Vec<u8>,
+    i: &mut Input<R>,
+    rstat: &mut ReadStat,
+) -> Result<Vec<u8>, Box<dyn Error>> {
+    // Local Predicate Fns -------------------------------------------------
+    fn should_block_then_conv<R: Read>(i: &Input<R>) -> bool {
+        !i.non_ascii && i.cflags.block.is_some()
+    }
+    fn should_conv_then_block<R: Read>(i: &Input<R>) -> bool {
+        i.non_ascii && i.cflags.block.is_some()
+    }
+    fn should_unblock_then_conv<R: Read>(i: &Input<R>) -> bool {
+        !i.non_ascii && i.cflags.unblock.is_some()
+    }
+    fn should_conv_then_unblock<R: Read>(i: &Input<R>) -> bool {
+        i.non_ascii && i.cflags.unblock.is_some()
+    }
+    fn conv_only<R: Read>(i: &Input<R>) -> bool {
+        i.cflags.ctable.is_some() && i.cflags.block.is_none() && i.cflags.unblock.is_none()
+    }
+    // Local Helper Fns ----------------------------------------------------
+    fn apply_conversion(buf: &mut [u8], ct: &ConversionTable) {
+        for idx in 0..buf.len() {
+            buf[idx] = ct[buf[idx] as usize];
+        }
+    }
+    // --------------------------------------------------------------------
+    if conv_only(i) {
+        // no block/unblock
+        let ct = i.cflags.ctable.unwrap();
+        apply_conversion(&mut buf, ct);
+
+        Ok(buf)
+    } else if should_block_then_conv(i) {
+        // ascii input so perform the block first
+        let cbs = i.cflags.block.unwrap();
+
+        let mut blocks = block(buf, cbs, rstat);
+
+        if let Some(ct) = i.cflags.ctable {
+            for buf in blocks.iter_mut() {
+                apply_conversion(buf, ct);
+            }
+        }
+
+        let blocks = blocks.into_iter().flatten().collect();
+
+        Ok(blocks)
+    } else if should_conv_then_block(i) {
+        // Non-ascii so perform the conversion first
+        let cbs = i.cflags.block.unwrap();
+
+        if let Some(ct) = i.cflags.ctable {
+            apply_conversion(&mut buf, ct);
+        }
+
+        let blocks = block(buf, cbs, rstat).into_iter().flatten().collect();
+
+        Ok(blocks)
+    } else if should_unblock_then_conv(i) {
+        // ascii input so perform the unblock first
+        let cbs = i.cflags.unblock.unwrap();
+
+        let mut buf = unblock(buf, cbs);
+
+        if let Some(ct) = i.cflags.ctable {
+            apply_conversion(&mut buf, ct);
+        }
+
+        Ok(buf)
+    } else if should_conv_then_unblock(i) {
+        // Non-ascii input so perform the conversion first
+        let cbs = i.cflags.unblock.unwrap();
+
+        if let Some(ct) = i.cflags.ctable {
+            apply_conversion(&mut buf, ct);
+        }
+
+        let buf = unblock(buf, cbs);
+
+        Ok(buf)
+    } else {
+        // The following error should not happen, as it results from
+        // insufficient command line data. This case should be caught
+        // by the parser before making it this far.
+        // Producing this error is an alternative to risking an unwrap call
+        // on 'cbs' if the required data is not provided.
+        Err(Box::new(InternalError::InvalidConvBlockUnblockCase))
+    }
+}
+
+/// Read helper performs read operations common to all dd reads, and dispatches the buffer to relevant helper functions as dictated by the operations requested by the user.
+fn read_helper<R: Read>(
+    i: &mut Input<R>,
+    bsize: usize,
+) -> Result<(ReadStat, Vec<u8>), Box<dyn Error>> {
+    // Local Predicate Fns -----------------------------------------------
+    fn is_conv<R: Read>(i: &Input<R>) -> bool {
+        i.cflags.ctable.is_some()
+    }
+    fn is_block<R: Read>(i: &Input<R>) -> bool {
+        i.cflags.block.is_some()
+    }
+    fn is_unblock<R: Read>(i: &Input<R>) -> bool {
+        i.cflags.unblock.is_some()
+    }
+    // Local Helper Fns -------------------------------------------------
+    fn perform_swab(buf: &mut [u8]) {
+        for base in (1..buf.len()).step_by(2) {
+            buf.swap(base, base - 1);
+        }
+    }
+    // ------------------------------------------------------------------
+    // Read
+    let mut buf = vec![BUF_INIT_BYTE; bsize];
+    let mut rstat = match i.cflags.sync {
+        Some(ch) => i.fill_blocks(&mut buf, ch)?,
+        _ => i.fill_consecutive(&mut buf)?,
+    };
+    // Return early if no data
+    if rstat.reads_complete == 0 && rstat.reads_partial == 0 {
+        return Ok((rstat, buf));
+    }
+
+    // Perform any conv=x[,x...] options
+    if i.cflags.swab {
+        perform_swab(&mut buf);
+    }
+    if is_conv(i) || is_block(i) || is_unblock(i) {
+        let buf = conv_block_unblock_helper(buf, i, &mut rstat)?;
+        Ok((rstat, buf))
+    } else {
+        Ok((rstat, buf))
+    }
+}
+
+// Print io lines of a status update:
+// <complete>+<partial> records in
+// <complete>+<partial> records out
+fn print_io_lines(update: &ProgUpdate) {
+    eprintln!(
+        "{}+{} records in",
+        update.read_stat.reads_complete, update.read_stat.reads_partial
+    );
+    if update.read_stat.records_truncated > 0 {
+        eprintln!("{} truncated records", update.read_stat.records_truncated);
+    }
+    eprintln!(
+        "{}+{} records out",
+        update.write_stat.writes_complete, update.write_stat.writes_partial
+    );
+}
+// Print the progress line of a status update:
+// <byte-count> bytes (<base-1000-size>, <base-2-size>) copied, <time> s, <base-2-rate>/s
+fn make_prog_line(update: &ProgUpdate) -> String {
+    let btotal_metric = Byte::from_bytes(update.write_stat.bytes_total)
+        .get_appropriate_unit(false)
+        .format(0);
+    let btotal_bin = Byte::from_bytes(update.write_stat.bytes_total)
+        .get_appropriate_unit(true)
+        .format(0);
+    let safe_millis = cmp::max(1, update.duration.as_millis());
+    let transfer_rate = Byte::from_bytes(1000 * (update.write_stat.bytes_total / safe_millis))
+        .get_appropriate_unit(false)
+        .format(1);
+
+    format!(
+        "{} bytes ({}, {}) copied, {:.1} s, {}/s",
+        update.write_stat.bytes_total,
+        btotal_metric,
+        btotal_bin,
+        update.duration.as_secs_f64(),
+        transfer_rate
+    )
+}
+// Print progress line only. Overwrite the current line.
+fn reprint_prog_line(update: &ProgUpdate) {
+    eprint!("\r{}", make_prog_line(update));
+}
+// Print progress line only. Print as a new line.
+fn print_prog_line(update: &ProgUpdate) {
+    eprintln!("{}", make_prog_line(update));
+}
+// Print both io lines and progress line.
+fn print_transfer_stats(update: &ProgUpdate) {
+    print_io_lines(update);
+    print_prog_line(update);
+}
+
+// Generate a progress updater that tracks progress, receives updates, and responds to progress update requests (signals).
+// Signals:
+// - SIGUSR1: Trigger progress line reprint. Linux (GNU & BSD) only.
+// - TODO: SIGINFO: Trigger progress line reprint. BSD-style Linux only.
+fn gen_prog_updater(rx: mpsc::Receiver<ProgUpdate>, print_level: Option<StatusLevel>) -> impl Fn() {
+    // --------------------------------------------------------------
+    #[cfg(target_os = "linux")]
+    const SIGUSR1_USIZE: usize = signal::SIGUSR1 as usize;
+    // --------------------------------------------------------------
+    #[cfg(target_os = "linux")]
+    fn posixly_correct() -> bool {
+        env::var("POSIXLY_CORRECT").is_ok()
+    }
+    #[cfg(target_os = "linux")]
+    fn register_linux_signal_handler(sigval: Arc<AtomicUsize>) -> Result<(), Box<dyn Error>> {
+        if !posixly_correct() {
+            signal_hook::flag::register_usize(signal::SIGUSR1, sigval, SIGUSR1_USIZE)?;
+        }
+
+        Ok(())
+    }
+    // --------------------------------------------------------------
+    move || {
+        #[cfg(target_os = "linux")]
+        let sigval = Arc::new(AtomicUsize::new(0));
+
+        #[cfg(target_os = "linux")]
+        register_linux_signal_handler(sigval.clone()).unwrap_or_else(|e| {
+            if Some(StatusLevel::None) != print_level {
+                eprintln!(
+                    "Internal dd Warning: Unable to register signal handler \n\t{}",
+                    e
+                );
+            }
+        });
+
+        while let Ok(update) = rx.recv() {
+            // (Re)print status line if progress is requested.
+            if Some(StatusLevel::Progress) == print_level {
+                reprint_prog_line(&update);
+            }
+            // Handle signals
+            #[cfg(target_os = "linux")]
+            if let SIGUSR1_USIZE = sigval.load(Ordering::Relaxed) {
+                print_transfer_stats(&update);
+            };
+        }
+    }
+}
+
+// Calculate a 'good' internal buffer size.
+// For performance of the read/write functions, the buffer should hold
+// both an integral number of reads and an integral number of writes. For
+// sane real-world memory use, it should not be too large. I believe
+// the least common multiple is a good representation of these interests.
+// https://en.wikipedia.org/wiki/Least_common_multiple#Using_the_greatest_common_divisor
+fn calc_bsize(ibs: usize, obs: usize) -> usize {
+    let gcd = Gcd::gcd(ibs, obs);
+    // calculate the lcm from gcd
+    (ibs / gcd) * obs
+}
+
+// Calculate the buffer size appropriate for this loop iteration, respecting
+// a count=N if present.
+fn calc_loop_bsize(
+    count: &Option<CountType>,
+    rstat: &ReadStat,
+    wstat: &WriteStat,
+    ibs: usize,
+    ideal_bsize: usize,
+) -> usize {
+    match count {
+        Some(CountType::Reads(rmax)) => {
+            let rmax: u64 = (*rmax).try_into().unwrap();
+            let rsofar = rstat.reads_complete + rstat.reads_partial;
+            let rremain: usize = (rmax - rsofar).try_into().unwrap();
+            cmp::min(ideal_bsize, rremain * ibs)
+        }
+        Some(CountType::Bytes(bmax)) => {
+            let bmax: u128 = (*bmax).try_into().unwrap();
+            let bremain: usize = (bmax - wstat.bytes_total).try_into().unwrap();
+            cmp::min(ideal_bsize, bremain)
+        }
+        None => ideal_bsize,
+    }
+}
+
+// Decide if the current progress is below a count=N limit or return
+// true if no such limit is set.
+fn below_count_limit(count: &Option<CountType>, rstat: &ReadStat, wstat: &WriteStat) -> bool {
+    match count {
+        Some(CountType::Reads(n)) => {
+            let n = (*n).try_into().unwrap();
+            rstat.reads_complete + rstat.reads_partial <= n
+        }
+        Some(CountType::Bytes(n)) => {
+            let n = (*n).try_into().unwrap();
+            wstat.bytes_total <= n
+        }
+        None => true,
+    }
+}
+
+fn append_dashes_if_not_present(mut acc: Vec<String>, mut s: String) -> Vec<String> {
+    if !s.starts_with("--") && !s.starts_with('-') {
+        s.insert_str(0, "--");
+    }
+    acc.push(s);
+    acc
+}
+
+macro_rules! unpack_or_rtn (
+    ($i:expr, $o:expr) =>
+    {{
+        match ($i, $o)
+        {
+            (Ok(i), Ok(o)) =>
+                (i,o),
+            (Err(e), _) =>
+            {
+                eprintln!("dd Error: {}", e);
+                return RTN_FAILURE;
+            },
+            (_, Err(e)) =>
+            {
+                eprintln!("dd Error: {}", e);
+                return RTN_FAILURE;
+            },
+        }
+    }};
+);
+
+pub fn uumain(args: impl uucore::Args) -> i32 {
+    let dashed_args = args
+        .collect_str(InvalidEncodingHandling::Ignore)
+        .accept_any()
+        .into_iter()
+        .fold(Vec::new(), append_dashes_if_not_present);
+
+    let matches = uu_app()
+        //.after_help(TODO: Add note about multiplier strings here.)
+        .get_matches_from(dashed_args);
+
+    let result = match (
+        matches.is_present(options::INFILE),
+        matches.is_present(options::OUTFILE),
+    ) {
+        (true, true) => {
+            let (i, o) =
+                unpack_or_rtn!(Input::<File>::new(&matches), Output::<File>::new(&matches));
+
+            o.dd_out(i)
+        }
+        (false, true) => {
+            let (i, o) = unpack_or_rtn!(
+                Input::<io::Stdin>::new(&matches),
+                Output::<File>::new(&matches)
+            );
+
+            o.dd_out(i)
+        }
+        (true, false) => {
+            let (i, o) = unpack_or_rtn!(
+                Input::<File>::new(&matches),
+                Output::<io::Stdout>::new(&matches)
+            );
+
+            o.dd_out(i)
+        }
+        (false, false) => {
+            let (i, o) = unpack_or_rtn!(
+                Input::<io::Stdin>::new(&matches),
+                Output::<io::Stdout>::new(&matches)
+            );
+
+            o.dd_out(i)
+        }
+    };
+    match result {
+        Ok(_) => RTN_SUCCESS,
+        Err(e) => {
+            eprintln!("dd exiting with error:\n\t{}", e);
+            RTN_FAILURE
+        }
+    }
+}
+
+pub fn uu_app() -> clap::App<'static, 'static> {
+    clap::App::new(uucore::util_name())
+        .version(crate_version!())
+        .about(ABOUT)
+        .arg(
+            clap::Arg::with_name(options::INFILE)
+                .long(options::INFILE)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("FILE")
+                .help("(alternatively if=FILE) specifies the file used for input. When not specified, stdin is used instead")
+        )
+        .arg(
+            clap::Arg::with_name(options::OUTFILE)
+                .long(options::OUTFILE)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("FILE")
+                .help("(alternatively of=FILE) specifies the file used for output. When not specified, stdout is used instead")
+        )
+        .arg(
+            clap::Arg::with_name(options::IBS)
+                .long(options::IBS)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively ibs=N) specifies the size of buffer used for reads (default: 512). Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::OBS)
+                .long(options::OBS)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively obs=N) specifies the size of buffer used for writes (default: 512). Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::BS)
+                .long(options::BS)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively bs=N) specifies ibs=N and obs=N (default: 512). If ibs or obs are also specified, bs=N takes precedence. Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::CBS)
+                .long(options::CBS)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively cbs=BYTES) specifies the 'conversion block size' in bytes. Applies to the conv=block, and conv=unblock operations. Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::SKIP)
+                .long(options::SKIP)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively skip=N) causes N ibs-sized records of input to be skipped before beginning copy/convert operations. See iflag=count_bytes if skipping N bytes is preferred. Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::SEEK)
+                .long(options::SEEK)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively seek=N) seeks N obs-sized records into output before beginning copy/convert operations. See oflag=seek_bytes if seeking N bytes is preferred. Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::COUNT)
+                .long(options::COUNT)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("N")
+                .help("(alternatively count=N) stop reading input after N ibs-sized read operations rather than proceeding until EOF. See iflag=count_bytes if stopping after N bytes is preferred. Multiplier strings permitted.")
+        )
+        .arg(
+            clap::Arg::with_name(options::STATUS)
+                .long(options::STATUS)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("LEVEL")
+                .help("(alternatively status=LEVEL) controls whether volume and performance stats are written to stderr.
+
+When unspecified, dd will print stats upon completion. An example is below.
+\t6+0 records in
+\t16+0 records out
+\t8192 bytes (8.2 kB, 8.0 KiB) copied, 0.00057009 s, 14.4 MB/s
+The first two lines are the 'volume' stats and the final line is the 'performance' stats.
+The volume stats indicate the number of complete and partial ibs-sized reads, or obs-sized writes that took place during the copy. The format of the volume stats is <complete>+<partial>. If records have been truncated (see conv=block), the volume stats will contain the number of truncated records.
+
+Permissible LEVEL values are:
+\t progress: Print periodic performance stats as the copy proceeds.
+\t noxfer: Print final volume stats, but not performance stats.
+\t none: Do not print any stats.
+
+Printing performance stats is also triggered by the INFO signal (where supported), or the USR1 signal. Setting the POSIXLY_CORRECT environment variable to any value (including an empty value) will cause the USR1 signal to be ignored.
+
+")
+        )
+        .arg(
+            clap::Arg::with_name(options::CONV)
+                .long(options::CONV)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("CONV")
+                .help("(alternatively conv=CONV[,CONV]) specifies a comma-separated list of conversion options or (for legacy reasons) file flags. Conversion options and file flags may be intermixed.
+
+Conversion options:
+\t One of {ascii, ebcdic, ibm} will perform an encoding conversion.
+\t\t 'ascii' converts from EBCDIC to ASCII. This is the inverse of the 'ebcdic' option.
+\t\t 'ebcdic' converts from ASCII to EBCDIC. This is the inverse of the 'ascii' option.
+\t\t 'ibm' converts from ASCII to EBCDIC, applying the conventions for '[', ']' and '~' specified in POSIX.
+
+\t One of {ucase, lcase} will perform a case conversion. Works in conjunction with option {ascii, ebcdic, ibm} to infer input encoding. If no other conversion option is specified, input is assumed to be ascii.
+\t\t 'ucase' converts from lower-case to upper-case
+\t\t 'lcase' converts from upper-case to lower-case.
+
+\t One of {block, unblock}. Convert between lines terminated by newline characters, and fixed-width lines padded by spaces (without any newlines). Both the 'block' and 'unblock' options require cbs=BYTES be specified.
+\t\t 'block' for each newline less than the size indicated by cbs=BYTES, remove the newline and pad with spaces up to cbs. Lines longer than cbs are truncated.
+\t\t 'unblock' for each block of input of the size indicated by cbs=BYTES, remove right-trailing spaces and replace with a newline character.
+
+\t 'sparse' attempts to seek the output when an obs-sized block consists of only zeros.
+\t 'swab' swaps each adjacent pair of bytes. If an odd number of bytes is present, the final byte is omitted.
+\t 'sync' pad each ibs-sided block with zeros. If 'block' or 'unblock' is specified, pad with spaces instead.
+
+Conversion Flags:
+\t One of {excl, nocreat}
+\t\t 'excl' the output file must be created. Fail if the output file is already present.
+\t\t 'nocreat' the output file will not be created. Fail if the output file in not already present.
+\t 'notrunc' the output file will not be truncated. If this option is not present, output will be truncated when opened.
+\t 'noerror' all read errors will be ignored. If this option is not present, dd will only ignore Error::Interrupted.
+\t 'fdatasync' data will be written before finishing.
+\t 'fsync' data and metadata will be written before finishing.
+
+")
+        )
+        .arg(
+            clap::Arg::with_name(options::IFLAG)
+                .long(options::IFLAG)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("FLAG")
+                .help("(alternatively iflag=FLAG[,FLAG]) a comma separated list of input flags which specify how the input source is treated. FLAG may be any of the input-flags or general-flags specified below.
+
+Input-Flags
+\t 'count_bytes' a value to count=N will be interpreted as bytes.
+\t 'skip_bytes' a value to skip=N will be interpreted as bytes.
+\t 'fullblock' wait for ibs bytes from each read. zero-length reads are still considered EOF.
+
+General-Flags
+\t 'direct' use direct I/O for data.
+\t 'directory' fail unless the given input (if used as an iflag) or output (if used as an oflag) is a directory.
+\t 'dsync' use synchronized I/O for data.
+\t 'sync' use synchronized I/O for data and metadata.
+\t 'nonblock' use non-blocking I/O.
+\t 'noatime' do not update access time.
+\t 'nocache' request that OS drop cache.
+\t 'noctty' do not assign a controlling tty.
+\t 'nofollow' do not follow system links.
+
+")
+        )
+        .arg(
+            clap::Arg::with_name(options::OFLAG)
+                .long(options::OFLAG)
+                .takes_value(true)
+                .require_equals(true)
+                .value_name("FLAG")
+                .help("(alternatively oflag=FLAG[,FLAG]) a comma separated list of output flags which specify how the output source is treated. FLAG may be any of the output-flags or general-flags specified below.
+
+Output-Flags
+\t 'append' open file in append mode. Consider setting conv=notrunc as well.
+\t 'seek_bytes' a value to seek=N will be interpreted as bytes.
+
+General-Flags
+\t 'direct' use direct I/O for data.
+\t 'directory' fail unless the given input (if used as an iflag) or output (if used as an oflag) is a directory.
+\t 'dsync' use synchronized I/O for data.
+\t 'sync' use synchronized I/O for data and metadata.
+\t 'nonblock' use non-blocking I/O.
+\t 'noatime' do not update access time.
+\t 'nocache' request that OS drop cache.
+\t 'noctty' do not assign a controlling tty.
+\t 'nofollow' do not follow system links.
+
+")
+        )
+}
diff --git a/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs b/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs
new file mode 100644
index 000000000..e2cfa77d0
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/block_unblock_tests.rs
@@ -0,0 +1,351 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+#[cfg(unix)]
+macro_rules! make_block_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $block:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            print_level: None,
+                            count: None,
+                            cflags: IConvFlags {
+                                block: $block,
+                                ..IConvFlags::default()
+                            },
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+#[cfg(unix)]
+macro_rules! make_unblock_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $unblock:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            print_level: None,
+                            count: None,
+                            cflags: IConvFlags {
+                                unblock: $unblock,
+                                ..IConvFlags::default()
+                            },
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+#[test]
+fn block_test_no_nl() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(res, vec![vec![0u8, 1u8, 2u8, 3u8],]);
+}
+
+#[test]
+fn block_test_no_nl_short_record() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 8, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],]
+    );
+}
+
+#[test]
+fn block_test_no_nl_trunc() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8, 4u8];
+    let res = block(buf, 4, &mut rs);
+
+    // Commented section(s) should be truncated and appear for reference only.
+    assert_eq!(res, vec![vec![0u8, 1u8, 2u8, 3u8 /*, 4u8*/],]);
+    assert_eq!(rs.records_truncated, 1);
+}
+
+#[test]
+fn block_test_nl_gt_cbs_trunc() {
+    let mut rs = ReadStat::default();
+    let buf = vec![
+        0u8, 1u8, 2u8, 3u8, 4u8, NEWLINE, 0u8, 1u8, 2u8, 3u8, 4u8, NEWLINE, 5u8, 6u8, 7u8, 8u8,
+    ];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            // Commented section(s) should be truncated and appear for reference only.
+            vec![0u8, 1u8, 2u8, 3u8],
+            // vec![4u8, SPACE, SPACE, SPACE],
+            vec![0u8, 1u8, 2u8, 3u8],
+            // vec![4u8, SPACE, SPACE, SPACE],
+            vec![5u8, 6u8, 7u8, 8u8],
+        ]
+    );
+    assert_eq!(rs.records_truncated, 2);
+}
+
+#[test]
+fn block_test_surrounded_nl() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NEWLINE, 4u8, 5u8, 6u8, 7u8, 8u8];
+    let res = block(buf, 8, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+            vec![4u8, 5u8, 6u8, 7u8, 8u8, SPACE, SPACE, SPACE],
+        ]
+    );
+}
+
+#[test]
+fn block_test_multiple_nl_same_cbs_block() {
+    let mut rs = ReadStat::default();
+    let buf = vec![
+        0u8, 1u8, 2u8, 3u8, NEWLINE, 4u8, NEWLINE, 5u8, 6u8, 7u8, 8u8, 9u8,
+    ];
+    let res = block(buf, 8, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+            vec![4u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+            vec![5u8, 6u8, 7u8, 8u8, 9u8, SPACE, SPACE, SPACE],
+        ]
+    );
+}
+
+#[test]
+fn block_test_multiple_nl_diff_cbs_block() {
+    let mut rs = ReadStat::default();
+    let buf = vec![
+        0u8, 1u8, 2u8, 3u8, NEWLINE, 4u8, 5u8, 6u8, 7u8, NEWLINE, 8u8, 9u8,
+    ];
+    let res = block(buf, 8, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+            vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
+            vec![8u8, 9u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+        ]
+    );
+}
+
+#[test]
+fn block_test_end_nl_diff_cbs_block() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NEWLINE];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(res, vec![vec![0u8, 1u8, 2u8, 3u8],]);
+}
+
+#[test]
+fn block_test_end_nl_same_cbs_block() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, NEWLINE];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(res, vec![vec![0u8, 1u8, 2u8, SPACE]]);
+}
+
+#[test]
+fn block_test_double_end_nl() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, NEWLINE, NEWLINE];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![vec![0u8, 1u8, 2u8, SPACE], vec![SPACE, SPACE, SPACE, SPACE],]
+    );
+}
+
+#[test]
+fn block_test_start_nl() {
+    let mut rs = ReadStat::default();
+    let buf = vec![NEWLINE, 0u8, 1u8, 2u8, 3u8];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![vec![SPACE, SPACE, SPACE, SPACE], vec![0u8, 1u8, 2u8, 3u8],]
+    );
+}
+
+#[test]
+fn block_test_double_surrounded_nl_no_trunc() {
+    let mut rs = ReadStat::default();
+    let buf = vec![0u8, 1u8, 2u8, 3u8, NEWLINE, NEWLINE, 4u8, 5u8, 6u8, 7u8];
+    let res = block(buf, 8, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+            vec![SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+            vec![4u8, 5u8, 6u8, 7u8, SPACE, SPACE, SPACE, SPACE],
+        ]
+    );
+}
+
+#[test]
+fn block_test_double_surrounded_nl_double_trunc() {
+    let mut rs = ReadStat::default();
+    let buf = vec![
+        0u8, 1u8, 2u8, 3u8, NEWLINE, NEWLINE, 4u8, 5u8, 6u8, 7u8, 8u8,
+    ];
+    let res = block(buf, 4, &mut rs);
+
+    assert_eq!(
+        res,
+        vec![
+            // Commented section(s) should be truncated and appear for reference only.
+            vec![0u8, 1u8, 2u8, 3u8],
+            vec![SPACE, SPACE, SPACE, SPACE],
+            vec![4u8, 5u8, 6u8, 7u8 /*, 8u8*/],
+        ]
+    );
+    assert_eq!(rs.records_truncated, 1);
+}
+
+#[cfg(unix)]
+make_block_test!(
+    block_cbs16,
+    "block-cbs-16",
+    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
+    Some(16),
+    File::open("./test-resources/dd-block-cbs16.spec").unwrap()
+);
+
+#[cfg(unix)]
+make_block_test!(
+    block_cbs16_as_cbs8,
+    "block-cbs-16-as-cbs8",
+    File::open("./test-resources/dd-block-cbs16.test").unwrap(),
+    Some(8),
+    File::open("./test-resources/dd-block-cbs8.spec").unwrap()
+);
+
+#[cfg(unix)]
+make_block_test!(
+    block_consecutive_nl,
+    "block-consecutive-nl",
+    File::open("./test-resources/dd-block-consecutive-nl.test").unwrap(),
+    Some(16),
+    File::open("./test-resources/dd-block-consecutive-nl-cbs16.spec").unwrap()
+);
+
+#[test]
+fn unblock_test_full_cbs() {
+    let buf = vec![0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8];
+    let res = unblock(buf, 8);
+
+    assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, NEWLINE],);
+}
+
+#[test]
+fn unblock_test_all_space() {
+    let buf = vec![SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE];
+    let res = unblock(buf, 8);
+
+    assert_eq!(res, vec![NEWLINE],);
+}
+
+#[test]
+fn unblock_test_decoy_spaces() {
+    let buf = vec![0u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, 7u8];
+    let res = unblock(buf, 8);
+
+    assert_eq!(
+        res,
+        vec![0u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, 7u8, NEWLINE],
+    );
+}
+
+#[test]
+fn unblock_test_strip_single_cbs() {
+    let buf = vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE];
+    let res = unblock(buf, 8);
+
+    assert_eq!(res, vec![0u8, 1u8, 2u8, 3u8, NEWLINE],);
+}
+
+#[test]
+fn unblock_test_strip_multi_cbs() {
+    let buf = vec![
+        vec![0u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+        vec![0u8, 1u8, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE],
+        vec![0u8, 1u8, 2u8, SPACE, SPACE, SPACE, SPACE, SPACE],
+        vec![0u8, 1u8, 2u8, 3u8, SPACE, SPACE, SPACE, SPACE],
+    ]
+    .into_iter()
+    .flatten()
+    .collect::<Vec<_>>();
+
+    let res = unblock(buf, 8);
+
+    let exp = vec![
+        vec![0u8, NEWLINE],
+        vec![0u8, 1u8, NEWLINE],
+        vec![0u8, 1u8, 2u8, NEWLINE],
+        vec![0u8, 1u8, 2u8, 3u8, NEWLINE],
+    ]
+    .into_iter()
+    .flatten()
+    .collect::<Vec<_>>();
+
+    assert_eq!(res, exp);
+}
+
+#[cfg(unix)]
+make_unblock_test!(
+    unblock_multi_16,
+    "unblock-multi-16",
+    File::open("./test-resources/dd-unblock-cbs16.test").unwrap(),
+    Some(16),
+    File::open("./test-resources/dd-unblock-cbs16.spec").unwrap()
+);
+
+#[cfg(unix)]
+make_unblock_test!(
+    unblock_multi_16_as_8,
+    "unblock-multi-16-as-8",
+    File::open("./test-resources/dd-unblock-cbs16.test").unwrap(),
+    Some(8),
+    File::open("./test-resources/dd-unblock-cbs8.spec").unwrap()
+);
diff --git a/src/uu/dd/src/dd_unit_tests/conv_sync_tests.rs b/src/uu/dd/src/dd_unit_tests/conv_sync_tests.rs
new file mode 100644
index 000000000..904a97cf5
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/conv_sync_tests.rs
@@ -0,0 +1,106 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+macro_rules! make_sync_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $sync:expr, $ibs:expr, $obs:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: $ibs,
+                            print_level: None,
+                            count: None,
+                            cflags: IConvFlags {
+                                sync: $sync,
+                                ..IConvFlags::default()
+                            },
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: $obs,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+// Zeros
+make_sync_test!(
+    zeros_4k_conv_sync_obs_gt_ibs,
+    "zeros_4k_conv_sync_obs_gt_ibs",
+    File::open("./test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test").unwrap(),
+    Some(0u8),
+    521,
+    1031,
+    File::open("./test-resources/gnudd-conv-sync-ibs-521-obs-1031-zeros.spec").unwrap()
+);
+
+make_sync_test!(
+    zeros_4k_conv_sync_ibs_gt_obs,
+    "zeros_4k_conv_sync_ibs_gt_obs",
+    File::open("./test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test").unwrap(),
+    Some(0u8),
+    1031,
+    521,
+    File::open("./test-resources/gnudd-conv-sync-ibs-1031-obs-521-zeros.spec").unwrap()
+);
+
+// Deadbeef
+make_sync_test!(
+    deadbeef_32k_conv_sync_obs_gt_ibs,
+    "deadbeef_32k_conv_sync_obs_gt_ibs",
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+    Some(0u8),
+    521,
+    1031,
+    File::open("./test-resources/gnudd-conv-sync-ibs-521-obs-1031-deadbeef.spec").unwrap()
+);
+
+make_sync_test!(
+    deadbeef_32k_conv_sync_ibs_gt_obs,
+    "deadbeef_32k_conv_sync_ibs_gt_obs",
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+    Some(0u8),
+    1031,
+    521,
+    File::open("./test-resources/gnudd-conv-sync-ibs-1031-obs-521-deadbeef.spec").unwrap()
+);
+
+// Random
+make_sync_test!(
+    random_73k_test_bs_prime_obs_gt_ibs_sync,
+    "random-73k-test-bs-prime-obs-gt-ibs-sync",
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+    Some(0u8),
+    521,
+    1031,
+    File::open("./test-resources/gnudd-conv-sync-ibs-521-obs-1031-random.spec").unwrap()
+);
+
+make_sync_test!(
+    random_73k_test_bs_prime_ibs_gt_obs_sync,
+    "random-73k-test-bs-prime-ibs-gt-obs-sync",
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+    Some(0u8),
+    1031,
+    521,
+    File::open("./test-resources/gnudd-conv-sync-ibs-1031-obs-521-random.spec").unwrap()
+);
+
+make_sync_test!(
+    deadbeef_16_delayed,
+    "deadbeef-16-delayed",
+    LazyReader {
+        src: File::open("./test-resources/deadbeef-16.test").unwrap()
+    },
+    Some(0u8),
+    16,
+    32,
+    File::open("./test-resources/deadbeef-16.spec").unwrap()
+);
diff --git a/src/uu/dd/src/dd_unit_tests/conversion_tests.rs b/src/uu/dd/src/dd_unit_tests/conversion_tests.rs
new file mode 100644
index 000000000..9255a1a89
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/conversion_tests.rs
@@ -0,0 +1,233 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+macro_rules! make_conv_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $ctable:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            print_level: None,
+                            count: None,
+                            cflags: icf!($ctable),
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+macro_rules! make_icf_test (
+    ( $test_id:ident, $test_name:expr, $src:expr, $icf:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            print_level: None,
+                            count: None,
+                            cflags: $icf,
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+make_conv_test!(
+    atoe_conv_spec_test,
+    "atoe-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC),
+    File::open("./test-resources/gnudd-conv-atoe-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    etoa_conv_spec_test,
+    "etoa-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&EBCDIC_TO_ASCII),
+    File::open("./test-resources/gnudd-conv-etoa-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    atoibm_conv_spec_test,
+    "atoibm-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM),
+    File::open("./test-resources/gnudd-conv-atoibm-seq-byte-values.spec").unwrap()
+);
+
+make_conv_test!(
+    lcase_ascii_to_ucase_ascii,
+    "lcase_ascii_to_ucase_ascii",
+    File::open("./test-resources/lcase-ascii.test").unwrap(),
+    Some(&ASCII_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ascii.test").unwrap()
+);
+
+make_conv_test!(
+    ucase_ascii_to_lcase_ascii,
+    "ucase_ascii_to_lcase_ascii",
+    File::open("./test-resources/ucase-ascii.test").unwrap(),
+    Some(&ASCII_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ascii.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ebcdic,ucase
+    atoe_and_ucase_conv_spec_test,
+    "atoe-and-ucase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ebcdic.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ebcdic,lcase
+    atoe_and_lcase_conv_spec_test,
+    "atoe-and-lcase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_EBCDIC_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ebcdic.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ibm,ucase
+    atoibm_and_ucase_conv_spec_test,
+    "atoibm-and-ucase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM_UCASE_TO_LCASE),
+    File::open("./test-resources/lcase-ibm.test").unwrap()
+);
+
+make_conv_test!(
+    // conv=ibm,lcase
+    atoibm_and_lcase_conv_spec_test,
+    "atoibm-and-lcase-conv-spec-test",
+    File::open("./test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test").unwrap(),
+    Some(&ASCII_TO_IBM_LCASE_TO_UCASE),
+    File::open("./test-resources/ucase-ibm.test").unwrap()
+);
+
+#[test]
+fn all_valid_ascii_ebcdic_ascii_roundtrip_conv_test() {
+    // ASCII->EBCDIC
+    let test_name = "all-valid-ascii-to-ebcdic";
+    let tmp_fname_ae = format!("./test-resources/FAILED-{}.test", test_name);
+
+    let i = Input {
+        src: File::open(
+            "./test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test",
+        )
+        .unwrap(),
+        non_ascii: false,
+        ibs: 128,
+        print_level: None,
+        count: None,
+        cflags: icf!(Some(&ASCII_TO_EBCDIC)),
+        iflags: IFlags::default(),
+    };
+
+    let o = Output {
+        dst: File::create(&tmp_fname_ae).unwrap(),
+        obs: 1024,
+        cflags: OConvFlags::default(),
+    };
+
+    o.dd_out(i).unwrap();
+
+    // EBCDIC->ASCII
+    let test_name = "all-valid-ebcdic-to-ascii";
+    let tmp_fname_ea = format!("./test-resources/FAILED-{}.test", test_name);
+
+    let i = Input {
+        src: File::open(&tmp_fname_ae).unwrap(),
+        non_ascii: false,
+        ibs: 256,
+        print_level: None,
+        count: None,
+        cflags: icf!(Some(&EBCDIC_TO_ASCII)),
+        iflags: IFlags::default(),
+    };
+
+    let o = Output {
+        dst: File::create(&tmp_fname_ea).unwrap(),
+        obs: 1024,
+        cflags: OConvFlags::default(),
+    };
+
+    o.dd_out(i).unwrap();
+
+    // Final Comparison
+    let res = File::open(&tmp_fname_ea).unwrap();
+    let spec =
+        File::open("./test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test")
+            .unwrap();
+
+    assert_eq!(
+        res.metadata().unwrap().len(),
+        spec.metadata().unwrap().len()
+    );
+
+    let res = BufReader::new(res);
+    let spec = BufReader::new(spec);
+
+    let res = BufReader::new(res);
+
+    // Check all bytes match
+    for (b_res, b_spec) in res.bytes().zip(spec.bytes()) {
+        assert_eq!(b_res.unwrap(), b_spec.unwrap());
+    }
+
+    fs::remove_file(&tmp_fname_ae).unwrap();
+    fs::remove_file(&tmp_fname_ea).unwrap();
+}
+
+make_icf_test!(
+    swab_256_test,
+    "swab-256",
+    File::open("./test-resources/seq-byte-values.test").unwrap(),
+    IConvFlags {
+        ctable: None,
+        block: None,
+        unblock: None,
+        swab: true,
+        sync: None,
+        noerror: false,
+    },
+    File::open("./test-resources/seq-byte-values-swapped.test").unwrap()
+);
+
+make_icf_test!(
+    swab_257_test,
+    "swab-257",
+    File::open("./test-resources/seq-byte-values-odd.test").unwrap(),
+    IConvFlags {
+        ctable: None,
+        block: None,
+        unblock: None,
+        swab: true,
+        sync: None,
+        noerror: false,
+    },
+    File::open("./test-resources/seq-byte-values-odd.spec").unwrap()
+);
diff --git a/src/uu/dd/src/dd_unit_tests/mod.rs b/src/uu/dd/src/dd_unit_tests/mod.rs
new file mode 100644
index 000000000..9641c9bba
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/mod.rs
@@ -0,0 +1,89 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+mod block_unblock_tests;
+mod conv_sync_tests;
+mod conversion_tests;
+mod sanity_tests;
+
+use std::fs;
+use std::io::prelude::*;
+use std::io::BufReader;
+
+struct LazyReader<R: Read> {
+    src: R,
+}
+
+impl<R: Read> Read for LazyReader<R> {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        let reduced = cmp::max(buf.len() / 2, 1);
+        self.src.read(&mut buf[..reduced])
+    }
+}
+
+#[macro_export]
+macro_rules! icf (
+    ( $ctable:expr ) =>
+    {
+        IConvFlags {
+            ctable: $ctable,
+            ..IConvFlags::default()
+        }
+    };
+);
+
+#[macro_export]
+macro_rules! make_spec_test (
+    ( $test_id:ident, $test_name:expr, $src:expr ) =>
+    {
+        // When spec not given, output should match input
+        make_spec_test!($test_id, $test_name, $src, $src);
+    };
+    ( $test_id:ident, $test_name:expr, $src:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        Input {
+                            src: $src,
+                            non_ascii: false,
+                            ibs: 512,
+                            print_level: None,
+                            count: None,
+                            cflags: IConvFlags::default(),
+                            iflags: IFlags::default(),
+                        },
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: 512,
+                            cflags: OConvFlags::default(),
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+    ( $test_id:ident, $test_name:expr, $i:expr, $o:expr, $spec:expr, $tmp_fname:expr ) =>
+    {
+        #[test]
+        fn $test_id()
+        {
+            $o.dd_out($i).unwrap();
+
+            let res = File::open($tmp_fname).unwrap();
+            // Check test file isn't empty (unless spec file is too)
+            assert_eq!(res.metadata().unwrap().len(), $spec.metadata().unwrap().len());
+
+            let spec = BufReader::new($spec);
+            let res = BufReader::new(res);
+
+            // Check all bytes match
+            for (b_res, b_spec) in res.bytes().zip(spec.bytes())
+            {
+                assert_eq!(b_res.unwrap(),
+                           b_spec.unwrap());
+            }
+
+            fs::remove_file($tmp_fname).unwrap();
+        }
+    };
+);
diff --git a/src/uu/dd/src/dd_unit_tests/sanity_tests.rs b/src/uu/dd/src/dd_unit_tests/sanity_tests.rs
new file mode 100644
index 000000000..edf25fe5d
--- /dev/null
+++ b/src/uu/dd/src/dd_unit_tests/sanity_tests.rs
@@ -0,0 +1,316 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+const DST_PLACEHOLDER: Vec<u8> = Vec::new();
+
+macro_rules! make_io_test (
+    ( $test_id:ident, $test_name:expr, $i:expr, $o:expr, $spec:expr ) =>
+    {
+        make_spec_test!($test_id,
+                        $test_name,
+                        $i,
+                        Output {
+                            dst: File::create(format!("./test-resources/FAILED-{}.test", $test_name)).unwrap(),
+                            obs: $o.obs,
+                            cflags: $o.cflags,
+                        },
+                        $spec,
+                        format!("./test-resources/FAILED-{}.test", $test_name)
+        );
+    };
+);
+
+make_spec_test!(
+    zeros_4k_test,
+    "zeros-4k",
+    File::open("./test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test").unwrap()
+);
+
+make_spec_test!(
+    ones_4k_test,
+    "ones-4k",
+    File::open("./test-resources/ones-6ae59e64850377ee5470c854761551ea.test").unwrap()
+);
+
+make_spec_test!(
+    deadbeef_32k_test,
+    "deadbeef-32k",
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap()
+);
+
+make_spec_test!(
+    random_73k_test,
+    "random-73k",
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
+);
+
+make_io_test!(
+    random_73k_test_not_a_multiple_obs_gt_ibs,
+    "random-73k-not-a-multiple-obs-gt-ibs",
+    Input {
+        src: File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+        non_ascii: false,
+        ibs: 521,
+        print_level: None,
+        count: None,
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
+);
+
+make_io_test!(
+    random_73k_test_obs_lt_not_a_multiple_ibs,
+    "random-73k-obs-lt-not-a-multiple-ibs",
+    Input {
+        src: File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+        non_ascii: false,
+        ibs: 1031,
+        print_level: None,
+        count: None,
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 521,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
+);
+
+make_io_test!(
+    deadbeef_all_32k_test_count_reads,
+    "deadbeef_all_32k_test_count_reads",
+    Input {
+        src: File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+        non_ascii: false,
+        ibs: 1024,
+        print_level: None,
+        count: Some(CountType::Reads(32)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1024,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap()
+);
+
+make_io_test!(
+    deadbeef_all_32k_test_count_bytes,
+    "deadbeef_all_32k_test_count_bytes",
+    Input {
+        src: File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+        non_ascii: false,
+        ibs: 531,
+        print_level: None,
+        count: Some(CountType::Bytes(32 * 1024)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap()
+);
+
+make_io_test!(
+    deadbeef_32k_to_16k_test_count_reads,
+    "deadbeef_32k_test_count_reads",
+    Input {
+        src: File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+        non_ascii: false,
+        ibs: 1024,
+        print_level: None,
+        count: Some(CountType::Reads(16)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/gnudd-deadbeef-first-16k.spec").unwrap()
+);
+
+make_io_test!(
+    deadbeef_32k_to_12345_test_count_bytes,
+    "deadbeef_32k_to_12345_test_count_bytes",
+    Input {
+        src: File::open("./test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test").unwrap(),
+        non_ascii: false,
+        ibs: 531,
+        print_level: None,
+        count: Some(CountType::Bytes(12345)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/gnudd-deadbeef-first-12345.spec").unwrap()
+);
+
+make_io_test!(
+    random_73k_test_count_reads,
+    "random-73k-test-count-reads",
+    Input {
+        src: File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+        non_ascii: false,
+        ibs: 1024,
+        print_level: None,
+        count: Some(CountType::Reads(32)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1024,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/gnudd-random-first-32k.spec").unwrap()
+);
+
+make_io_test!(
+    random_73k_test_count_bytes,
+    "random-73k-test-count-bytes",
+    Input {
+        src: File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap(),
+        non_ascii: false,
+        ibs: 521,
+        print_level: None,
+        count: Some(CountType::Bytes(32 * 1024)),
+        cflags: IConvFlags::default(),
+        iflags: IFlags::default(),
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/gnudd-random-first-32k.spec").unwrap()
+);
+
+make_io_test!(
+    random_73k_test_lazy_fullblock,
+    "random-73k-test-lazy-fullblock",
+    Input {
+        src: LazyReader {
+            src: File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test")
+                .unwrap()
+        },
+        non_ascii: false,
+        ibs: 521,
+        print_level: None,
+        count: None,
+        cflags: IConvFlags::default(),
+        iflags: IFlags {
+            fullblock: true,
+            ..IFlags::default()
+        },
+    },
+    Output {
+        dst: DST_PLACEHOLDER,
+        obs: 1031,
+        cflags: OConvFlags::default(),
+    },
+    File::open("./test-resources/random-5828891cb1230748e146f34223bbd3b5.test").unwrap()
+);
+
+// Test internal buffer size fn
+#[test]
+fn bsize_test_primes() {
+    let (n, m) = (7901, 7919);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, n * m);
+}
+
+#[test]
+fn bsize_test_rel_prime_obs_greater() {
+    let (n, m) = (7 * 5119, 13 * 5119);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, 7 * 13 * 5119);
+}
+
+#[test]
+fn bsize_test_rel_prime_ibs_greater() {
+    let (n, m) = (13 * 5119, 7 * 5119);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, 7 * 13 * 5119);
+}
+
+#[test]
+fn bsize_test_3fac_rel_prime() {
+    let (n, m) = (11 * 13 * 5119, 7 * 11 * 5119);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, 7 * 11 * 13 * 5119);
+}
+
+#[test]
+fn bsize_test_ibs_greater() {
+    let (n, m) = (512 * 1024, 256 * 1024);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, n);
+}
+
+#[test]
+fn bsize_test_obs_greater() {
+    let (n, m) = (256 * 1024, 512 * 1024);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, m);
+}
+
+#[test]
+fn bsize_test_bs_eq() {
+    let (n, m) = (1024, 1024);
+    let res = calc_bsize(n, m);
+    assert!(res % n == 0);
+    assert!(res % m == 0);
+
+    assert_eq!(res, m);
+}
+
+#[test]
+#[should_panic]
+fn test_nocreat_causes_failure_when_ofile_doesnt_exist() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--conv=nocreat"),
+        String::from("--of=not-a-real.file"),
+    ];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let _ = Output::<File>::new(&matches).unwrap();
+}
diff --git a/src/uu/dd/src/main.rs b/src/uu/dd/src/main.rs
new file mode 100644
index 000000000..fb6f5a6f5
--- /dev/null
+++ b/src/uu/dd/src/main.rs
@@ -0,0 +1 @@
+uucore_procs::main!(uu_dd); // spell-checker:ignore procs uucore
diff --git a/src/uu/dd/src/parseargs.rs b/src/uu/dd/src/parseargs.rs
new file mode 100644
index 000000000..3683023ac
--- /dev/null
+++ b/src/uu/dd/src/parseargs.rs
@@ -0,0 +1,664 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Tyler Steele <tyler.steele@protonmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+// spell-checker:ignore ctty, ctable, iconvflags, oconvflags
+
+#[cfg(test)]
+mod unit_tests;
+
+use super::*;
+use std::error::Error;
+
+pub type Matches = clap::ArgMatches<'static>;
+
+/// Parser Errors describe errors with parser input
+#[derive(Debug, PartialEq)]
+pub enum ParseError {
+    MultipleFmtTable,
+    MultipleUCaseLCase,
+    MultipleBlockUnblock,
+    MultipleExclNoCreat,
+    FlagNoMatch(String),
+    ConvFlagNoMatch(String),
+    MultiplierStringParseFailure(String),
+    MultiplierStringOverflow(String),
+    BlockUnblockWithoutCBS,
+    StatusLevelNotRecognized(String),
+    Unimplemented(String),
+}
+
+impl std::fmt::Display for ParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::MultipleFmtTable => {
+                write!(
+                    f,
+                    "Only one of conv=ascii conv=ebcdic or conv=ibm may be specified"
+                )
+            }
+            Self::MultipleUCaseLCase => {
+                write!(f, "Only one of conv=lcase or conv=ucase may be specified")
+            }
+            Self::MultipleBlockUnblock => {
+                write!(f, "Only one of conv=block or conv=unblock may be specified")
+            }
+            Self::MultipleExclNoCreat => {
+                write!(f, "Only one ov conv=excl or conv=nocreat may be specified")
+            }
+            Self::FlagNoMatch(arg) => {
+                write!(f, "Unrecognized iflag=FLAG or oflag=FLAG -> {}", arg)
+            }
+            Self::ConvFlagNoMatch(arg) => {
+                write!(f, "Unrecognized conv=CONV -> {}", arg)
+            }
+            Self::MultiplierStringParseFailure(arg) => {
+                write!(f, "Unrecognized byte multiplier -> {}", arg)
+            }
+            Self::MultiplierStringOverflow(arg) => {
+                write!(
+                    f,
+                    "Multiplier string would overflow on current system -> {}",
+                    arg
+                )
+            }
+            Self::BlockUnblockWithoutCBS => {
+                write!(f, "conv=block or conv=unblock specified without cbs=N")
+            }
+            Self::StatusLevelNotRecognized(arg) => {
+                write!(f, "status=LEVEL not recognized -> {}", arg)
+            }
+            Self::Unimplemented(arg) => {
+                write!(f, "feature not implemented on this system -> {}", arg)
+            }
+        }
+    }
+}
+
+impl Error for ParseError {}
+
+/// Some flags specified as part of a conv=CONV[,CONV]... block
+/// relate to the input file, others to the output file.
+#[derive(Debug, PartialEq)]
+enum ConvFlag {
+    // Input
+    FmtAtoE,
+    FmtEtoA,
+    FmtAtoI,
+    Block,
+    Unblock,
+    UCase,
+    LCase,
+    Swab,
+    Sync,
+    NoError,
+    // Output
+    Sparse,
+    Excl,
+    NoCreat,
+    NoTrunc,
+    FDataSync,
+    FSync,
+}
+
+impl std::str::FromStr for ConvFlag {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            // Input
+            "ascii" => Ok(Self::FmtEtoA),
+            "ebcdic" => Ok(Self::FmtAtoE),
+            "ibm" => Ok(Self::FmtAtoI),
+            "lcase" => Ok(Self::LCase),
+            "ucase" => Ok(Self::UCase),
+            "block" => Ok(Self::Block),
+            "unblock" => Ok(Self::Unblock),
+            "swab" => Ok(Self::Swab),
+            "sync" => Ok(Self::Sync),
+            "noerror" => Ok(Self::NoError),
+            // Output
+            "sparse" => Ok(Self::Sparse),
+            "excl" => Ok(Self::Excl),
+            "nocreat" => Ok(Self::NoCreat),
+            "notrunc" => Ok(Self::NoTrunc),
+            "fdatasync" => Ok(Self::FDataSync),
+            "fsync" => Ok(Self::FSync),
+            _ => Err(ParseError::ConvFlagNoMatch(String::from(s))),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq)]
+enum Flag {
+    // Input only
+    FullBlock,
+    CountBytes,
+    SkipBytes,
+    // Either
+    #[allow(unused)]
+    Cio,
+    #[allow(unused)]
+    Direct,
+    #[allow(unused)]
+    Directory,
+    #[allow(unused)]
+    Dsync,
+    #[allow(unused)]
+    Sync,
+    #[allow(unused)]
+    NoCache,
+    #[allow(unused)]
+    NonBlock,
+    #[allow(unused)]
+    NoATime,
+    #[allow(unused)]
+    NoCtty,
+    #[allow(unused)]
+    NoFollow,
+    #[allow(unused)]
+    NoLinks,
+    #[allow(unused)]
+    Binary,
+    #[allow(unused)]
+    Text,
+    // Output only
+    Append,
+    SeekBytes,
+}
+
+impl std::str::FromStr for Flag {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            // Input only
+            "fullblock" => Ok(Self::FullBlock),
+            "count_bytes" => Ok(Self::CountBytes),
+            "skip_bytes" => Ok(Self::SkipBytes),
+            // Either
+            "cio" =>
+            // Ok(Self::Cio),
+            {
+                Err(ParseError::Unimplemented(s.to_string()))
+            }
+            "direct" =>
+            // Ok(Self::Direct),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::Direct)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "directory" =>
+            // Ok(Self::Directory),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::Directory)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "dsync" =>
+            // Ok(Self::Dsync),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::Dsync)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "sync" =>
+            // Ok(Self::Sync),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::Sync)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "nocache" =>
+            // Ok(Self::NoCache),
+            {
+                Err(ParseError::Unimplemented(s.to_string()))
+            }
+            "nonblock" =>
+            // Ok(Self::NonBlock),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::NonBlock)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "noatime" =>
+            // Ok(Self::NoATime),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::NoATime)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "noctty" =>
+            // Ok(Self::NoCtty),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::NoCtty)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "nofollow" =>
+            // Ok(Self::NoFollow),
+            {
+                if cfg!(target_os = "linux") {
+                    Ok(Self::NoFollow)
+                } else {
+                    Err(ParseError::Unimplemented(s.to_string()))
+                }
+            }
+            "nolinks" =>
+            // Ok(Self::NoLinks),
+            {
+                Err(ParseError::Unimplemented(s.to_string()))
+            }
+            "binary" =>
+            // Ok(Self::Binary),
+            {
+                Err(ParseError::Unimplemented(s.to_string()))
+            }
+            "text" =>
+            // Ok(Self::Text),
+            {
+                Err(ParseError::Unimplemented(s.to_string()))
+            }
+            // Output only
+            "append" => Ok(Self::Append),
+            "seek_bytes" => Ok(Self::SeekBytes),
+            _ => Err(ParseError::FlagNoMatch(String::from(s))),
+        }
+    }
+}
+
+impl std::str::FromStr for StatusLevel {
+    type Err = ParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "none" => Ok(StatusLevel::None),
+            "noxfer" => Ok(StatusLevel::Noxfer),
+            "progress" => Ok(StatusLevel::Progress),
+            _ => Err(ParseError::StatusLevelNotRecognized(s.to_string())),
+        }
+    }
+}
+
+/// Parse bytes using str::parse, then map error if needed.
+fn parse_bytes_only(s: &str) -> Result<usize, ParseError> {
+    s.parse()
+        .map_err(|_| ParseError::MultiplierStringParseFailure(s.to_string()))
+}
+
+/// Parse byte and multiplier like 512, 5KiB, or 1G.
+/// Uses uucore::parse_size, and adds the 'w' and 'c' suffixes which are mentioned
+/// in dd's info page.
+fn parse_bytes_with_opt_multiplier(s: &str) -> Result<usize, ParseError> {
+    if let Some(idx) = s.rfind('c') {
+        parse_bytes_only(&s[..idx])
+    } else if let Some(idx) = s.rfind('w') {
+        let partial = parse_bytes_only(&s[..idx])?;
+
+        partial
+            .checked_mul(2)
+            .ok_or_else(|| ParseError::MultiplierStringOverflow(s.to_string()))
+    } else {
+        uucore::parse_size::parse_size(s).map_err(|e| match e {
+            uucore::parse_size::ParseSizeError::ParseFailure(s) => {
+                ParseError::MultiplierStringParseFailure(s)
+            }
+            uucore::parse_size::ParseSizeError::SizeTooBig(s) => {
+                ParseError::MultiplierStringOverflow(s)
+            }
+        })
+    }
+}
+
+pub fn parse_ibs(matches: &Matches) -> Result<usize, ParseError> {
+    if let Some(mixed_str) = matches.value_of(options::BS) {
+        parse_bytes_with_opt_multiplier(mixed_str)
+    } else if let Some(mixed_str) = matches.value_of(options::IBS) {
+        parse_bytes_with_opt_multiplier(mixed_str)
+    } else {
+        Ok(512)
+    }
+}
+
+fn parse_cbs(matches: &Matches) -> Result<Option<usize>, ParseError> {
+    if let Some(s) = matches.value_of(options::CBS) {
+        let bytes = parse_bytes_with_opt_multiplier(s)?;
+        Ok(Some(bytes))
+    } else {
+        Ok(None)
+    }
+}
+
+pub fn parse_status_level(matches: &Matches) -> Result<Option<StatusLevel>, ParseError> {
+    match matches.value_of(options::STATUS) {
+        Some(s) => {
+            let st = s.parse()?;
+            Ok(Some(st))
+        }
+        None => Ok(None),
+    }
+}
+
+pub fn parse_obs(matches: &Matches) -> Result<usize, ParseError> {
+    if let Some(mixed_str) = matches.value_of("bs") {
+        parse_bytes_with_opt_multiplier(mixed_str)
+    } else if let Some(mixed_str) = matches.value_of("obs") {
+        parse_bytes_with_opt_multiplier(mixed_str)
+    } else {
+        Ok(512)
+    }
+}
+
+fn parse_ctable(fmt: Option<ConvFlag>, case: Option<ConvFlag>) -> Option<&'static ConversionTable> {
+    fn parse_conv_and_case_table(
+        fmt: &ConvFlag,
+        case: &ConvFlag,
+    ) -> Option<&'static ConversionTable> {
+        match (fmt, case) {
+            (ConvFlag::FmtAtoE, ConvFlag::UCase) => Some(&ASCII_TO_EBCDIC_LCASE_TO_UCASE),
+            (ConvFlag::FmtAtoE, ConvFlag::LCase) => Some(&ASCII_TO_EBCDIC_UCASE_TO_LCASE),
+            (ConvFlag::FmtEtoA, ConvFlag::UCase) => Some(&EBCDIC_TO_ASCII_LCASE_TO_UCASE),
+            (ConvFlag::FmtEtoA, ConvFlag::LCase) => Some(&EBCDIC_TO_ASCII_UCASE_TO_LCASE),
+            (ConvFlag::FmtAtoI, ConvFlag::UCase) => Some(&ASCII_TO_IBM_UCASE_TO_LCASE),
+            (ConvFlag::FmtAtoI, ConvFlag::LCase) => Some(&ASCII_TO_IBM_LCASE_TO_UCASE),
+            (_, _) => None,
+        }
+    }
+    fn parse_conv_table_only(fmt: &ConvFlag) -> Option<&'static ConversionTable> {
+        match fmt {
+            ConvFlag::FmtAtoE => Some(&ASCII_TO_EBCDIC),
+            ConvFlag::FmtEtoA => Some(&EBCDIC_TO_ASCII),
+            ConvFlag::FmtAtoI => Some(&ASCII_TO_IBM),
+            _ => None,
+        }
+    }
+    // ------------------------------------------------------------------------
+    match (fmt, case) {
+        // Both [ascii | ebcdic | ibm] and [lcase | ucase] specified
+        (Some(fmt), Some(case)) => parse_conv_and_case_table(&fmt, &case),
+        // Only [ascii | ebcdic | ibm] specified
+        (Some(fmt), None) => parse_conv_table_only(&fmt),
+        // Only [lcase | ucase] specified
+        (None, Some(ConvFlag::UCase)) => Some(&ASCII_LCASE_TO_UCASE),
+        (None, Some(ConvFlag::LCase)) => Some(&ASCII_UCASE_TO_LCASE),
+        // ST else...
+        (_, _) => None,
+    }
+}
+
+fn parse_flag_list<T: std::str::FromStr<Err = ParseError>>(
+    tag: &str,
+    matches: &Matches,
+) -> Result<Vec<T>, ParseError> {
+    let mut flags = Vec::new();
+
+    if let Some(comma_str) = matches.value_of(tag) {
+        for s in comma_str.split(',') {
+            let flag = s.parse()?;
+            flags.push(flag);
+        }
+    }
+
+    Ok(flags)
+}
+
+/// Parse Conversion Options (Input Variety)
+/// Construct and validate a IConvFlags
+pub fn parse_conv_flag_input(matches: &Matches) -> Result<IConvFlags, ParseError> {
+    let mut iconvflags = IConvFlags::default();
+    let mut fmt = None;
+    let mut case = None;
+    let mut is_sync = false;
+
+    let flags = parse_flag_list(options::CONV, matches)?;
+    let cbs = parse_cbs(matches)?;
+
+    for flag in flags {
+        match flag {
+            ConvFlag::FmtEtoA => {
+                if fmt.is_some() {
+                    return Err(ParseError::MultipleFmtTable);
+                } else {
+                    fmt = Some(flag);
+                }
+            }
+            ConvFlag::FmtAtoE => {
+                if fmt.is_some() {
+                    return Err(ParseError::MultipleFmtTable);
+                } else {
+                    fmt = Some(flag);
+                }
+            }
+            ConvFlag::FmtAtoI => {
+                if fmt.is_some() {
+                    return Err(ParseError::MultipleFmtTable);
+                } else {
+                    fmt = Some(flag);
+                }
+            }
+            ConvFlag::UCase => {
+                if case.is_some() {
+                    return Err(ParseError::MultipleUCaseLCase);
+                } else {
+                    case = Some(flag)
+                }
+            }
+            ConvFlag::LCase => {
+                if case.is_some() {
+                    return Err(ParseError::MultipleUCaseLCase);
+                } else {
+                    case = Some(flag)
+                }
+            }
+            ConvFlag::Block => match (cbs, iconvflags.unblock) {
+                (Some(cbs), None) => iconvflags.block = Some(cbs),
+                (None, _) => return Err(ParseError::BlockUnblockWithoutCBS),
+                (_, Some(_)) => return Err(ParseError::MultipleBlockUnblock),
+            },
+            ConvFlag::Unblock => match (cbs, iconvflags.block) {
+                (Some(cbs), None) => iconvflags.unblock = Some(cbs),
+                (None, _) => return Err(ParseError::BlockUnblockWithoutCBS),
+                (_, Some(_)) => return Err(ParseError::MultipleBlockUnblock),
+            },
+            ConvFlag::Swab => iconvflags.swab = true,
+            ConvFlag::Sync => is_sync = true,
+            ConvFlag::NoError => iconvflags.noerror = true,
+            _ => {}
+        }
+    }
+
+    // The final conversion table depends on both
+    // fmt (eg. ASCII -> EBCDIC)
+    // case (eg. UCASE -> LCASE)
+    // So the final value can't be set until all flags are parsed.
+    let ctable = parse_ctable(fmt, case);
+
+    // The final value of sync depends on block/unblock
+    // block implies sync with ' '
+    // unblock implies sync with 0
+    // So the final value can't be set until all flags are parsed.
+    let sync = if is_sync && (iconvflags.block.is_some() || iconvflags.unblock.is_some()) {
+        Some(b' ')
+    } else if is_sync {
+        Some(0u8)
+    } else {
+        None
+    };
+
+    Ok(IConvFlags {
+        ctable,
+        sync,
+        ..iconvflags
+    })
+}
+
+/// Parse Conversion Options (Output Variety)
+/// Construct and validate a OConvFlags
+pub fn parse_conv_flag_output(matches: &Matches) -> Result<OConvFlags, ParseError> {
+    let mut oconvflags = OConvFlags::default();
+
+    let flags = parse_flag_list(options::CONV, matches)?;
+
+    for flag in flags {
+        match flag {
+            ConvFlag::Sparse => oconvflags.sparse = true,
+            ConvFlag::Excl => {
+                if !oconvflags.nocreat {
+                    oconvflags.excl = true;
+                } else {
+                    return Err(ParseError::MultipleExclNoCreat);
+                }
+            }
+            ConvFlag::NoCreat => {
+                if !oconvflags.excl {
+                    oconvflags.nocreat = true;
+                } else {
+                    return Err(ParseError::MultipleExclNoCreat);
+                }
+            }
+            ConvFlag::NoTrunc => oconvflags.notrunc = true,
+            ConvFlag::FDataSync => oconvflags.fdatasync = true,
+            ConvFlag::FSync => oconvflags.fsync = true,
+            _ => {}
+        }
+    }
+
+    Ok(oconvflags)
+}
+
+/// Parse IFlags struct from CL-input
+pub fn parse_iflags(matches: &Matches) -> Result<IFlags, ParseError> {
+    let mut iflags = IFlags::default();
+
+    let flags = parse_flag_list(options::IFLAG, matches)?;
+
+    for flag in flags {
+        match flag {
+            Flag::Cio => iflags.cio = true,
+            Flag::Direct => iflags.direct = true,
+            Flag::Directory => iflags.directory = true,
+            Flag::Dsync => iflags.dsync = true,
+            Flag::Sync => iflags.sync = true,
+            Flag::NoCache => iflags.nocache = true,
+            Flag::NonBlock => iflags.nonblock = true,
+            Flag::NoATime => iflags.noatime = true,
+            Flag::NoCtty => iflags.noctty = true,
+            Flag::NoFollow => iflags.nofollow = true,
+            Flag::NoLinks => iflags.nolinks = true,
+            Flag::Binary => iflags.binary = true,
+            Flag::Text => iflags.text = true,
+            Flag::FullBlock => iflags.fullblock = true,
+            Flag::CountBytes => iflags.count_bytes = true,
+            Flag::SkipBytes => iflags.skip_bytes = true,
+            _ => {}
+        }
+    }
+
+    Ok(iflags)
+}
+
+/// Parse OFlags struct from CL-input
+pub fn parse_oflags(matches: &Matches) -> Result<OFlags, ParseError> {
+    let mut oflags = OFlags::default();
+
+    let flags = parse_flag_list(options::OFLAG, matches)?;
+
+    for flag in flags {
+        match flag {
+            Flag::Append => oflags.append = true,
+            Flag::Cio => oflags.cio = true,
+            Flag::Direct => oflags.direct = true,
+            Flag::Directory => oflags.directory = true,
+            Flag::Dsync => oflags.dsync = true,
+            Flag::Sync => oflags.sync = true,
+            Flag::NoCache => oflags.nocache = true,
+            Flag::NonBlock => oflags.nonblock = true,
+            Flag::NoATime => oflags.noatime = true,
+            Flag::NoCtty => oflags.noctty = true,
+            Flag::NoFollow => oflags.nofollow = true,
+            Flag::NoLinks => oflags.nolinks = true,
+            Flag::Binary => oflags.binary = true,
+            Flag::Text => oflags.text = true,
+            Flag::SeekBytes => oflags.seek_bytes = true,
+            _ => {}
+        }
+    }
+
+    Ok(oflags)
+}
+
+/// Parse the amount of the input file to skip.
+pub fn parse_skip_amt(
+    ibs: &usize,
+    iflags: &IFlags,
+    matches: &Matches,
+) -> Result<Option<usize>, ParseError> {
+    if let Some(amt) = matches.value_of(options::SKIP) {
+        let n = parse_bytes_with_opt_multiplier(amt)?;
+        if iflags.skip_bytes {
+            Ok(Some(n))
+        } else {
+            Ok(Some(ibs * n))
+        }
+    } else {
+        Ok(None)
+    }
+}
+
+/// Parse the amount of the output file to seek.
+pub fn parse_seek_amt(
+    obs: &usize,
+    oflags: &OFlags,
+    matches: &Matches,
+) -> Result<Option<usize>, ParseError> {
+    if let Some(amt) = matches.value_of(options::SEEK) {
+        let n = parse_bytes_with_opt_multiplier(amt)?;
+        if oflags.seek_bytes {
+            Ok(Some(n))
+        } else {
+            Ok(Some(obs * n))
+        }
+    } else {
+        Ok(None)
+    }
+}
+
+/// Parse the value of count=N and the type of N implied by iflags
+pub fn parse_count(iflags: &IFlags, matches: &Matches) -> Result<Option<CountType>, ParseError> {
+    if let Some(amt) = matches.value_of(options::COUNT) {
+        let n = parse_bytes_with_opt_multiplier(amt)?;
+        if iflags.count_bytes {
+            Ok(Some(CountType::Bytes(n)))
+        } else {
+            Ok(Some(CountType::Reads(n)))
+        }
+    } else {
+        Ok(None)
+    }
+}
+
+/// Parse whether the args indicate the input is not ascii
+pub fn parse_input_non_ascii(matches: &Matches) -> Result<bool, ParseError> {
+    if let Some(conv_opts) = matches.value_of(options::CONV) {
+        Ok(conv_opts.contains("ascii"))
+    } else {
+        Ok(false)
+    }
+}
diff --git a/src/uu/dd/src/parseargs/unit_tests.rs b/src/uu/dd/src/parseargs/unit_tests.rs
new file mode 100644
index 000000000..21900ee49
--- /dev/null
+++ b/src/uu/dd/src/parseargs/unit_tests.rs
@@ -0,0 +1,587 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use super::*;
+
+use crate::StatusLevel;
+
+#[cfg(not(target_os = "linux"))]
+#[test]
+fn unimplemented_flags_should_error_non_linux() {
+    let mut succeeded = Vec::new();
+
+    // The following flags are only implemented in linux
+    for &flag in &[
+        "direct",
+        "directory",
+        "dsync",
+        "sync",
+        "nonblock",
+        "noatime",
+        "noctty",
+        "nofollow",
+    ] {
+        let args = vec![
+            String::from("dd"),
+            format!("--iflag={}", flag),
+            format!("--oflag={}", flag),
+        ];
+        let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+        if parse_iflags(&matches).is_ok() {
+            succeeded.push(format!("iflag={}", flag));
+        }
+        if parse_oflags(&matches).is_ok() {
+            succeeded.push(format!("oflag={}", flag));
+        }
+    }
+
+    assert!(
+        succeeded.is_empty(),
+        "The following flags did not panic as expected: {:?}",
+        succeeded
+    );
+}
+
+#[test]
+fn unimplemented_flags_should_error() {
+    let mut succeeded = Vec::new();
+
+    // The following flags are not implemented
+    for &flag in &["cio", "nocache", "nolinks", "text", "binary"] {
+        let args = vec![
+            String::from("dd"),
+            format!("--iflag={}", flag),
+            format!("--oflag={}", flag),
+        ];
+        let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+        if parse_iflags(&matches).is_ok() {
+            succeeded.push(format!("iflag={}", flag))
+        }
+        if parse_oflags(&matches).is_ok() {
+            succeeded.push(format!("oflag={}", flag))
+        }
+    }
+
+    assert!(
+        succeeded.is_empty(),
+        "The following flags did not panic as expected: {:?}",
+        succeeded
+    );
+}
+
+#[test]
+fn test_status_level_absent() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--if=foo.file"),
+        String::from("--of=bar.file"),
+    ];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let st = parse_status_level(&matches).unwrap();
+
+    assert_eq!(st, None);
+}
+
+#[test]
+fn test_status_level_none() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--status=none"),
+        String::from("--if=foo.file"),
+        String::from("--of=bar.file"),
+    ];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let st = parse_status_level(&matches).unwrap().unwrap();
+
+    assert_eq!(st, StatusLevel::None);
+}
+
+#[test]
+fn test_all_top_level_args_no_leading_dashes() {
+    let args = vec![
+        String::from("dd"),
+        String::from("if=foo.file"),
+        String::from("of=bar.file"),
+        String::from("ibs=10"),
+        String::from("obs=10"),
+        String::from("cbs=1"),
+        String::from("bs=100"),
+        String::from("count=2"),
+        String::from("skip=2"),
+        String::from("seek=2"),
+        String::from("status=progress"),
+        String::from("conv=ascii,ucase"),
+        String::from("iflag=count_bytes,skip_bytes"),
+        String::from("oflag=append,seek_bytes"),
+    ];
+    let args = args
+        .into_iter()
+        .fold(Vec::new(), append_dashes_if_not_present);
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    assert_eq!(100, parse_ibs(&matches).unwrap());
+    assert_eq!(100, parse_obs(&matches).unwrap());
+    assert_eq!(1, parse_cbs(&matches).unwrap().unwrap());
+    assert_eq!(
+        CountType::Bytes(2),
+        parse_count(
+            &IFlags {
+                count_bytes: true,
+                ..IFlags::default()
+            },
+            &matches
+        )
+        .unwrap()
+        .unwrap()
+    );
+    assert_eq!(
+        200,
+        parse_skip_amt(&100, &IFlags::default(), &matches)
+            .unwrap()
+            .unwrap()
+    );
+    assert_eq!(
+        200,
+        parse_seek_amt(&100, &OFlags::default(), &matches)
+            .unwrap()
+            .unwrap()
+    );
+    assert_eq!(
+        StatusLevel::Progress,
+        parse_status_level(&matches).unwrap().unwrap()
+    );
+    assert_eq!(
+        IConvFlags {
+            ctable: Some(&EBCDIC_TO_ASCII_LCASE_TO_UCASE),
+            ..IConvFlags::default()
+        },
+        parse_conv_flag_input(&matches).unwrap()
+    );
+    assert_eq!(
+        OConvFlags::default(),
+        parse_conv_flag_output(&matches).unwrap()
+    );
+    assert_eq!(
+        IFlags {
+            count_bytes: true,
+            skip_bytes: true,
+            ..IFlags::default()
+        },
+        parse_iflags(&matches).unwrap()
+    );
+    assert_eq!(
+        OFlags {
+            append: true,
+            seek_bytes: true,
+            ..OFlags::default()
+        },
+        parse_oflags(&matches).unwrap()
+    );
+}
+
+#[test]
+fn test_all_top_level_args_with_leading_dashes() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--if=foo.file"),
+        String::from("--of=bar.file"),
+        String::from("--ibs=10"),
+        String::from("--obs=10"),
+        String::from("--cbs=1"),
+        String::from("--bs=100"),
+        String::from("--count=2"),
+        String::from("--skip=2"),
+        String::from("--seek=2"),
+        String::from("--status=progress"),
+        String::from("--conv=ascii,ucase"),
+        String::from("--iflag=count_bytes,skip_bytes"),
+        String::from("--oflag=append,seek_bytes"),
+    ];
+    let args = args
+        .into_iter()
+        .fold(Vec::new(), append_dashes_if_not_present);
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    assert_eq!(100, parse_ibs(&matches).unwrap());
+    assert_eq!(100, parse_obs(&matches).unwrap());
+    assert_eq!(1, parse_cbs(&matches).unwrap().unwrap());
+    assert_eq!(
+        CountType::Bytes(2),
+        parse_count(
+            &IFlags {
+                count_bytes: true,
+                ..IFlags::default()
+            },
+            &matches
+        )
+        .unwrap()
+        .unwrap()
+    );
+    assert_eq!(
+        200,
+        parse_skip_amt(&100, &IFlags::default(), &matches)
+            .unwrap()
+            .unwrap()
+    );
+    assert_eq!(
+        200,
+        parse_seek_amt(&100, &OFlags::default(), &matches)
+            .unwrap()
+            .unwrap()
+    );
+    assert_eq!(
+        StatusLevel::Progress,
+        parse_status_level(&matches).unwrap().unwrap()
+    );
+    assert_eq!(
+        IConvFlags {
+            ctable: Some(&EBCDIC_TO_ASCII_LCASE_TO_UCASE),
+            ..IConvFlags::default()
+        },
+        parse_conv_flag_input(&matches).unwrap()
+    );
+    assert_eq!(
+        OConvFlags::default(),
+        parse_conv_flag_output(&matches).unwrap()
+    );
+    assert_eq!(
+        IFlags {
+            count_bytes: true,
+            skip_bytes: true,
+            ..IFlags::default()
+        },
+        parse_iflags(&matches).unwrap()
+    );
+    assert_eq!(
+        OFlags {
+            append: true,
+            seek_bytes: true,
+            ..OFlags::default()
+        },
+        parse_oflags(&matches).unwrap()
+    );
+}
+
+#[test]
+fn test_status_level_progress() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--if=foo.file"),
+        String::from("--of=bar.file"),
+        String::from("--status=progress"),
+    ];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let st = parse_status_level(&matches).unwrap().unwrap();
+
+    assert_eq!(st, StatusLevel::Progress);
+}
+
+#[test]
+fn test_status_level_noxfer() {
+    let args = vec![
+        String::from("dd"),
+        String::from("--if=foo.file"),
+        String::from("--status=noxfer"),
+        String::from("--of=bar.file"),
+    ];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let st = parse_status_level(&matches).unwrap().unwrap();
+
+    assert_eq!(st, StatusLevel::Noxfer);
+}
+
+// ----- IConvFlags/Output -----
+
+#[test]
+#[should_panic]
+fn icf_ctable_error() {
+    let args = vec![String::from("dd"), String::from("--conv=ascii,ebcdic,ibm")];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let _ = parse_conv_flag_input(&matches).unwrap();
+}
+
+#[test]
+#[should_panic]
+fn icf_case_error() {
+    let args = vec![String::from("dd"), String::from("--conv=ucase,lcase")];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let _ = parse_conv_flag_input(&matches).unwrap();
+}
+
+#[test]
+#[should_panic]
+fn icf_block_error() {
+    let args = vec![String::from("dd"), String::from("--conv=block,unblock")];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let _ = parse_conv_flag_input(&matches).unwrap();
+}
+
+#[test]
+#[should_panic]
+fn icf_creat_error() {
+    let args = vec![String::from("dd"), String::from("--conv=excl,nocreat")];
+
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let _ = parse_conv_flag_output(&matches).unwrap();
+}
+
+#[test]
+fn parse_icf_token_ibm() {
+    let exp = vec![ConvFlag::FmtAtoI];
+
+    let args = vec![String::from("dd"), String::from("--conv=ibm")];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[test]
+fn parse_icf_tokens_elu() {
+    let exp = vec![ConvFlag::FmtEtoA, ConvFlag::LCase, ConvFlag::Unblock];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--conv=ebcdic,lcase,unblock"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+    let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[test]
+fn parse_icf_tokens_remaining() {
+    let exp = vec![
+        ConvFlag::FmtAtoE,
+        ConvFlag::UCase,
+        ConvFlag::Block,
+        ConvFlag::Sparse,
+        ConvFlag::Swab,
+        ConvFlag::Sync,
+        ConvFlag::NoError,
+        ConvFlag::Excl,
+        ConvFlag::NoCreat,
+        ConvFlag::NoTrunc,
+        ConvFlag::NoError,
+        ConvFlag::FDataSync,
+        ConvFlag::FSync,
+    ];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--conv=ascii,ucase,block,sparse,swab,sync,noerror,excl,nocreat,notrunc,noerror,fdatasync,fsync"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<ConvFlag>("conv", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[test]
+fn parse_iflag_tokens() {
+    let exp = vec![
+        Flag::FullBlock,
+        Flag::CountBytes,
+        Flag::SkipBytes,
+        Flag::Append,
+        Flag::SeekBytes,
+    ];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--iflag=fullblock,count_bytes,skip_bytes,append,seek_bytes"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<Flag>("iflag", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[test]
+fn parse_oflag_tokens() {
+    let exp = vec![
+        Flag::FullBlock,
+        Flag::CountBytes,
+        Flag::SkipBytes,
+        Flag::Append,
+        Flag::SeekBytes,
+    ];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--oflag=fullblock,count_bytes,skip_bytes,append,seek_bytes"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<Flag>("oflag", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn parse_iflag_tokens_linux() {
+    let exp = vec![
+        Flag::Direct,
+        Flag::Directory,
+        Flag::Dsync,
+        Flag::Sync,
+        Flag::NonBlock,
+        Flag::NoATime,
+        Flag::NoCtty,
+        Flag::NoFollow,
+    ];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--iflag=direct,directory,dsync,sync,nonblock,noatime,noctty,nofollow"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<Flag>("iflag", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn parse_oflag_tokens_linux() {
+    let exp = vec![
+        Flag::Direct,
+        Flag::Directory,
+        Flag::Dsync,
+        Flag::Sync,
+        Flag::NonBlock,
+        Flag::NoATime,
+        Flag::NoCtty,
+        Flag::NoFollow,
+    ];
+
+    let args = vec![
+        String::from("dd"),
+        String::from("--oflag=direct,directory,dsync,sync,nonblock,noatime,noctty,nofollow"),
+    ];
+    let matches = uu_app().get_matches_from_safe(args).unwrap();
+
+    let act = parse_flag_list::<Flag>("oflag", &matches).unwrap();
+
+    assert_eq!(exp.len(), act.len());
+    for cf in &exp {
+        assert!(exp.contains(cf));
+    }
+}
+
+// ----- Multiplier Strings etc. -----
+macro_rules! test_byte_parser (
+    ( $test_name:ident, $bs_str:expr, $bs:expr ) =>
+    {
+        #[allow(non_snake_case)]
+        #[test]
+        fn $test_name()
+        {
+            // let bs_str = String::from($bs_str);
+            assert_eq!($bs, parse_bytes_with_opt_multiplier($bs_str).unwrap())
+        }
+    }
+);
+
+test_byte_parser!(test_bytes_n, "765", 765);
+test_byte_parser!(test_bytes_c, "13c", 13);
+
+test_byte_parser!(test_bytes_w, "1w", 2);
+
+test_byte_parser!(test_bytes_b, "1b", 512);
+
+test_byte_parser!(test_bytes_k, "1kB", 1000);
+test_byte_parser!(test_bytes_K, "1K", 1024);
+test_byte_parser!(test_bytes_Ki, "1KiB", 1024);
+
+test_byte_parser!(test_bytes_MB, "2MB", 2 * 1000 * 1000);
+test_byte_parser!(test_bytes_M, "2M", 2 * 1024 * 1024);
+test_byte_parser!(test_bytes_Mi, "2MiB", 2 * 1024 * 1024);
+
+test_byte_parser!(test_bytes_GB, "3GB", 3 * 1000 * 1000 * 1000);
+test_byte_parser!(test_bytes_G, "3G", 3 * 1024 * 1024 * 1024);
+test_byte_parser!(test_bytes_Gi, "3GiB", 3 * 1024 * 1024 * 1024);
+
+#[cfg(target_pointer_width = "64")]
+#[cfg(test)]
+mod test_64bit_arch {
+    use super::*;
+
+    test_byte_parser!(test_bytes_TB, "4TB", 4 * 1000 * 1000 * 1000 * 1000);
+    test_byte_parser!(test_bytes_T, "4T", 4 * 1024 * 1024 * 1024 * 1024);
+    test_byte_parser!(test_bytes_Ti, "4TiB", 4 * 1024 * 1024 * 1024 * 1024);
+
+    test_byte_parser!(test_bytes_PB, "5PB", 5 * 1000 * 1000 * 1000 * 1000 * 1000);
+    test_byte_parser!(test_bytes_P, "5P", 5 * 1024 * 1024 * 1024 * 1024 * 1024);
+    test_byte_parser!(test_bytes_Pi, "5PiB", 5 * 1024 * 1024 * 1024 * 1024 * 1024);
+
+    test_byte_parser!(
+        test_bytes_EB,
+        "6EB",
+        6 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000
+    );
+    test_byte_parser!(
+        test_bytes_E,
+        "6E",
+        6 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024
+    );
+    test_byte_parser!(
+        test_bytes_Ei,
+        "6EiB",
+        6 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024
+    );
+}
+
+#[test]
+#[should_panic]
+fn test_overflow_panic() {
+    let bs_str = format!("{}KiB", usize::MAX);
+
+    parse_bytes_with_opt_multiplier(&bs_str).unwrap();
+}
+
+#[test]
+#[should_panic]
+fn test_neg_panic() {
+    let bs_str = format!("{}", -1);
+
+    parse_bytes_with_opt_multiplier(&bs_str).unwrap();
+}
diff --git a/src/uu/dd/test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test b/src/uu/dd/test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test
new file mode 100644
index 000000000..7e1cc9de8
Binary files /dev/null and b/src/uu/dd/test-resources/all-valid-ascii-chars-37eff01866ba3f538421b30b7cbefcac.test differ
diff --git a/src/uu/dd/test-resources/dd-block-cbs16-win.test b/src/uu/dd/test-resources/dd-block-cbs16-win.test
new file mode 100644
index 000000000..9b51cb8f3
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-cbs16-win.test
@@ -0,0 +1,16 @@
+0
+01
+012
+0123
+01234
+012345
+0123456
+01234567
+012345678
+0123456789
+0123456789a
+0123456789ab
+0123456789abc
+0123456789abcd
+0123456789abcde
+0123456789abcdef
diff --git a/src/uu/dd/test-resources/dd-block-cbs16.spec b/src/uu/dd/test-resources/dd-block-cbs16.spec
new file mode 100644
index 000000000..d06bc43ca
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-cbs16.spec
@@ -0,0 +1 @@
+0               01              012             0123            01234           012345          0123456         01234567        012345678       0123456789      0123456789a     0123456789ab    0123456789abc   0123456789abcd  0123456789abcde 0123456789abcdef
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/dd-block-cbs16.test b/src/uu/dd/test-resources/dd-block-cbs16.test
new file mode 100644
index 000000000..b59df5561
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-cbs16.test
@@ -0,0 +1,16 @@
+0
+01
+012
+0123
+01234
+012345
+0123456
+01234567
+012345678
+0123456789
+0123456789a
+0123456789ab
+0123456789abc
+0123456789abcd
+0123456789abcde
+0123456789abcdef
diff --git a/src/uu/dd/test-resources/dd-block-cbs8.spec b/src/uu/dd/test-resources/dd-block-cbs8.spec
new file mode 100644
index 000000000..ea86bdd74
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-cbs8.spec
@@ -0,0 +1 @@
+0       01      012     0123    01234   012345  0123456 012345670123456701234567012345670123456701234567012345670123456701234567
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/dd-block-consecutive-nl-cbs16.spec b/src/uu/dd/test-resources/dd-block-consecutive-nl-cbs16.spec
new file mode 100644
index 000000000..f365007e0
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-consecutive-nl-cbs16.spec
@@ -0,0 +1 @@
+pre                                             post            
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/dd-block-consecutive-nl-win.test b/src/uu/dd/test-resources/dd-block-consecutive-nl-win.test
new file mode 100644
index 000000000..1bf473b2b
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-consecutive-nl-win.test
@@ -0,0 +1,4 @@
+pre
+
+
+post
diff --git a/src/uu/dd/test-resources/dd-block-consecutive-nl.test b/src/uu/dd/test-resources/dd-block-consecutive-nl.test
new file mode 100644
index 000000000..df0029a74
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-block-consecutive-nl.test
@@ -0,0 +1,4 @@
+pre
+
+
+post
diff --git a/src/uu/dd/test-resources/dd-unblock-cbs16-win.spec b/src/uu/dd/test-resources/dd-unblock-cbs16-win.spec
new file mode 100644
index 000000000..9b51cb8f3
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-unblock-cbs16-win.spec
@@ -0,0 +1,16 @@
+0
+01
+012
+0123
+01234
+012345
+0123456
+01234567
+012345678
+0123456789
+0123456789a
+0123456789ab
+0123456789abc
+0123456789abcd
+0123456789abcde
+0123456789abcdef
diff --git a/src/uu/dd/test-resources/dd-unblock-cbs16.spec b/src/uu/dd/test-resources/dd-unblock-cbs16.spec
new file mode 100644
index 000000000..b59df5561
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-unblock-cbs16.spec
@@ -0,0 +1,16 @@
+0
+01
+012
+0123
+01234
+012345
+0123456
+01234567
+012345678
+0123456789
+0123456789a
+0123456789ab
+0123456789abc
+0123456789abcd
+0123456789abcde
+0123456789abcdef
diff --git a/src/uu/dd/test-resources/dd-unblock-cbs16.test b/src/uu/dd/test-resources/dd-unblock-cbs16.test
new file mode 100644
index 000000000..d06bc43ca
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-unblock-cbs16.test
@@ -0,0 +1 @@
+0               01              012             0123            01234           012345          0123456         01234567        012345678       0123456789      0123456789a     0123456789ab    0123456789abc   0123456789abcd  0123456789abcde 0123456789abcdef
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/dd-unblock-cbs8-win.spec b/src/uu/dd/test-resources/dd-unblock-cbs8-win.spec
new file mode 100644
index 000000000..8031036c1
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-unblock-cbs8-win.spec
@@ -0,0 +1,32 @@
+0
+
+01
+
+012
+
+0123
+
+01234
+
+012345
+
+0123456
+
+01234567
+
+01234567
+8
+01234567
+89
+01234567
+89a
+01234567
+89ab
+01234567
+89abc
+01234567
+89abcd
+01234567
+89abcde
+01234567
+89abcdef
diff --git a/src/uu/dd/test-resources/dd-unblock-cbs8.spec b/src/uu/dd/test-resources/dd-unblock-cbs8.spec
new file mode 100644
index 000000000..02a88fe2a
--- /dev/null
+++ b/src/uu/dd/test-resources/dd-unblock-cbs8.spec
@@ -0,0 +1,32 @@
+0
+
+01
+
+012
+
+0123
+
+01234
+
+012345
+
+0123456
+
+01234567
+
+01234567
+8
+01234567
+89
+01234567
+89a
+01234567
+89ab
+01234567
+89abc
+01234567
+89abcd
+01234567
+89abcde
+01234567
+89abcdef
diff --git a/src/uu/dd/test-resources/deadbeef-16.spec b/src/uu/dd/test-resources/deadbeef-16.spec
new file mode 100644
index 000000000..4eb7c10f1
Binary files /dev/null and b/src/uu/dd/test-resources/deadbeef-16.spec differ
diff --git a/src/uu/dd/test-resources/deadbeef-16.test b/src/uu/dd/test-resources/deadbeef-16.test
new file mode 100644
index 000000000..85f2b7569
--- /dev/null
+++ b/src/uu/dd/test-resources/deadbeef-16.test
@@ -0,0 +1 @@
+����������������������������������������������������������������
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test b/src/uu/dd/test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test
new file mode 100644
index 000000000..d2a5d0683
--- /dev/null
+++ b/src/uu/dd/test-resources/deadbeef-18d99661a1de1fc9af21b0ec2cd67ba3.test
@@ -0,0 +1 @@
+��ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ��
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/gnudd-conv-atoe-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-atoe-seq-byte-values.spec
new file mode 100644
index 000000000..8701c67fd
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-atoe-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-atoibm-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-atoibm-seq-byte-values.spec
new file mode 100644
index 000000000..3835d57cf
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-atoibm-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-ebcdic-ltou-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-ebcdic-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..ed0686639
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-ebcdic-ltou-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-ebcdic-utol-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-ebcdic-utol-seq-byte-values.spec
new file mode 100644
index 000000000..13c82e5e3
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-ebcdic-utol-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-etoa-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-etoa-seq-byte-values.spec
new file mode 100644
index 000000000..433b1f600
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-etoa-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-ibm-ltou-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-ibm-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..d425e7d01
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-ibm-ltou-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-ibm-utol-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-ibm-utol-seq-byte-values.spec
new file mode 100644
index 000000000..1dcaccbcd
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-ibm-utol-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-ltou-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..5aacec0cd
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-ltou-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-deadbeef.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-deadbeef.spec
new file mode 100644
index 000000000..e7bbc1c3b
--- /dev/null
+++ b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-deadbeef.spec
@@ -0,0 +1 @@
+��ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ��
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-random.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-random.spec
new file mode 100644
index 000000000..fce148186
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-random.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-zeros.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-zeros.spec
new file mode 100644
index 000000000..83236da5d
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-1031-obs-521-zeros.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-deadbeef.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-deadbeef.spec
new file mode 100644
index 000000000..1caf16059
--- /dev/null
+++ b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-deadbeef.spec
@@ -0,0 +1 @@
+��ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ��
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-random.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-random.spec
new file mode 100644
index 000000000..e473df7d0
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-random.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-zeros.spec b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-zeros.spec
new file mode 100644
index 000000000..ecd7b444e
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-sync-ibs-521-obs-1031-zeros.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-conv-utol-seq-byte-values.spec b/src/uu/dd/test-resources/gnudd-conv-utol-seq-byte-values.spec
new file mode 100644
index 000000000..d205368d5
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-conv-utol-seq-byte-values.spec differ
diff --git a/src/uu/dd/test-resources/gnudd-deadbeef-first-12345.spec b/src/uu/dd/test-resources/gnudd-deadbeef-first-12345.spec
new file mode 100644
index 000000000..c36c9ec7a
--- /dev/null
+++ b/src/uu/dd/test-resources/gnudd-deadbeef-first-12345.spec
@@ -0,0 +1 @@
+��ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/gnudd-deadbeef-first-16k.spec b/src/uu/dd/test-resources/gnudd-deadbeef-first-16k.spec
new file mode 100644
index 000000000..dbd247457
--- /dev/null
+++ b/src/uu/dd/test-resources/gnudd-deadbeef-first-16k.spec
@@ -0,0 +1 @@
+��ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ�ﾭ��
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/gnudd-random-first-32k.spec b/src/uu/dd/test-resources/gnudd-random-first-32k.spec
new file mode 100644
index 000000000..8f42c0a64
Binary files /dev/null and b/src/uu/dd/test-resources/gnudd-random-first-32k.spec differ
diff --git a/src/uu/dd/test-resources/lcase-ascii.test b/src/uu/dd/test-resources/lcase-ascii.test
new file mode 100644
index 000000000..50a669800
Binary files /dev/null and b/src/uu/dd/test-resources/lcase-ascii.test differ
diff --git a/src/uu/dd/test-resources/lcase-ebcdic.spec b/src/uu/dd/test-resources/lcase-ebcdic.spec
new file mode 100644
index 000000000..13c82e5e3
Binary files /dev/null and b/src/uu/dd/test-resources/lcase-ebcdic.spec differ
diff --git a/src/uu/dd/test-resources/lcase-ebcdic.test b/src/uu/dd/test-resources/lcase-ebcdic.test
new file mode 100644
index 000000000..13c82e5e3
Binary files /dev/null and b/src/uu/dd/test-resources/lcase-ebcdic.test differ
diff --git a/src/uu/dd/test-resources/lcase-ibm.spec b/src/uu/dd/test-resources/lcase-ibm.spec
new file mode 100644
index 000000000..1dcaccbcd
Binary files /dev/null and b/src/uu/dd/test-resources/lcase-ibm.spec differ
diff --git a/src/uu/dd/test-resources/lcase-ibm.test b/src/uu/dd/test-resources/lcase-ibm.test
new file mode 100644
index 000000000..1dcaccbcd
Binary files /dev/null and b/src/uu/dd/test-resources/lcase-ibm.test differ
diff --git a/src/uu/dd/test-resources/ones-6ae59e64850377ee5470c854761551ea.test b/src/uu/dd/test-resources/ones-6ae59e64850377ee5470c854761551ea.test
new file mode 100644
index 000000000..7de9e36a6
--- /dev/null
+++ b/src/uu/dd/test-resources/ones-6ae59e64850377ee5470c854761551ea.test
@@ -0,0 +1 @@
+����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/src/uu/dd/test-resources/random-5828891cb1230748e146f34223bbd3b5.test b/src/uu/dd/test-resources/random-5828891cb1230748e146f34223bbd3b5.test
new file mode 100644
index 000000000..6e997411c
Binary files /dev/null and b/src/uu/dd/test-resources/random-5828891cb1230748e146f34223bbd3b5.test differ
diff --git a/src/uu/dd/test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test b/src/uu/dd/test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test
new file mode 100644
index 000000000..be75933c8
Binary files /dev/null and b/src/uu/dd/test-resources/seq-byte-values-b632a992d3aed5d8d1a59cc5a5a455ba.test differ
diff --git a/src/uu/dd/test-resources/seq-byte-values-odd.spec b/src/uu/dd/test-resources/seq-byte-values-odd.spec
new file mode 100644
index 000000000..2952a28a1
Binary files /dev/null and b/src/uu/dd/test-resources/seq-byte-values-odd.spec differ
diff --git a/src/uu/dd/test-resources/seq-byte-values-odd.test b/src/uu/dd/test-resources/seq-byte-values-odd.test
new file mode 100644
index 000000000..40152a773
Binary files /dev/null and b/src/uu/dd/test-resources/seq-byte-values-odd.test differ
diff --git a/src/uu/dd/test-resources/seq-byte-values-swapped.test b/src/uu/dd/test-resources/seq-byte-values-swapped.test
new file mode 100644
index 000000000..be75933c8
Binary files /dev/null and b/src/uu/dd/test-resources/seq-byte-values-swapped.test differ
diff --git a/src/uu/dd/test-resources/seq-byte-values.test b/src/uu/dd/test-resources/seq-byte-values.test
new file mode 100644
index 000000000..c86626638
Binary files /dev/null and b/src/uu/dd/test-resources/seq-byte-values.test differ
diff --git a/src/uu/dd/test-resources/ucase-ascii.test b/src/uu/dd/test-resources/ucase-ascii.test
new file mode 100644
index 000000000..38bd675c4
Binary files /dev/null and b/src/uu/dd/test-resources/ucase-ascii.test differ
diff --git a/src/uu/dd/test-resources/ucase-ebcdic.spec b/src/uu/dd/test-resources/ucase-ebcdic.spec
new file mode 100644
index 000000000..ed0686639
Binary files /dev/null and b/src/uu/dd/test-resources/ucase-ebcdic.spec differ
diff --git a/src/uu/dd/test-resources/ucase-ebcdic.test b/src/uu/dd/test-resources/ucase-ebcdic.test
new file mode 100644
index 000000000..ed0686639
Binary files /dev/null and b/src/uu/dd/test-resources/ucase-ebcdic.test differ
diff --git a/src/uu/dd/test-resources/ucase-ibm.spec b/src/uu/dd/test-resources/ucase-ibm.spec
new file mode 100644
index 000000000..d425e7d01
Binary files /dev/null and b/src/uu/dd/test-resources/ucase-ibm.spec differ
diff --git a/src/uu/dd/test-resources/ucase-ibm.test b/src/uu/dd/test-resources/ucase-ibm.test
new file mode 100644
index 000000000..d425e7d01
Binary files /dev/null and b/src/uu/dd/test-resources/ucase-ibm.test differ
diff --git a/src/uu/dd/test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test b/src/uu/dd/test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test
new file mode 100644
index 000000000..08e7df176
Binary files /dev/null and b/src/uu/dd/test-resources/zeros-620f0b67a91f7f74151bc5be745b7110.test differ
diff --git a/src/uu/df/Cargo.toml b/src/uu/df/Cargo.toml
index 6979a79b4..9486640d0 100644
--- a/src/uu/df/Cargo.toml
+++ b/src/uu/df/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_df"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "df ~ (uutils) display file system information"
@@ -17,8 +17,8 @@ path = "src/df.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 number_prefix = "0.4"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc", "fsext"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["libc", "fsext"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "df"
diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs
index 1092938df..2f703542c 100644
--- a/src/uu/df/src/df.rs
+++ b/src/uu/df/src/df.rs
@@ -6,8 +6,8 @@
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
+use uucore::error::UError;
+use uucore::error::UResult;
 #[cfg(unix)]
 use uucore::fsext::statfs_fn;
 use uucore::fsext::{read_fs_list, FsUsage, MountInfo};
@@ -19,23 +19,19 @@ use std::cell::Cell;
 use std::collections::HashMap;
 use std::collections::HashSet;
 
+use std::error::Error;
 #[cfg(unix)]
 use std::ffi::CString;
+use std::fmt::Display;
 #[cfg(unix)]
 use std::mem;
 
-#[cfg(target_os = "freebsd")]
-use uucore::libc::{c_char, fsid_t, uid_t};
-
 #[cfg(windows)]
 use std::path::Path;
 
 static ABOUT: &str = "Show information about the file system on which each FILE resides,\n\
                       or all file systems by default.";
 
-static EXIT_OK: i32 = 0;
-static EXIT_ERR: i32 = 1;
-
 static OPT_ALL: &str = "all";
 static OPT_BLOCKSIZE: &str = "blocksize";
 static OPT_DIRECT: &str = "direct";
@@ -78,8 +74,8 @@ struct Filesystem {
     usage: FsUsage,
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 impl FsSelector {
@@ -226,8 +222,8 @@ fn filter_mount_list(vmi: Vec<MountInfo>, paths: &[String], opt: &Options) -> Ve
 /// Convert `value` to a human readable string based on `base`.
 /// e.g. It returns 1G when value is 1 * 1024 * 1024 * 1024 and base is 1024.
 /// Note: It returns `value` if `base` isn't positive.
-fn human_readable(value: u64, base: i64) -> String {
-    match base {
+fn human_readable(value: u64, base: i64) -> UResult<String> {
+    let base_str = match base {
         d if d < 0 => value.to_string(),
 
         // ref: [Binary prefix](https://en.wikipedia.org/wiki/Binary_prefix) @@ <https://archive.is/cnwmF>
@@ -242,8 +238,10 @@ fn human_readable(value: u64, base: i64) -> String {
             NumberPrefix::Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
         },
 
-        _ => crash!(EXIT_ERR, "Internal error: Unknown base value {}", base),
-    }
+        _ => return Err(DfError::InvalidBaseValue(base.to_string()).into()),
+    };
+
+    Ok(base_str)
 }
 
 fn use_size(free_size: u64, total_size: u64) -> String {
@@ -256,8 +254,32 @@ fn use_size(free_size: u64, total_size: u64) -> String {
     );
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[derive(Debug)]
+enum DfError {
+    InvalidBaseValue(String),
+}
+
+impl Display for DfError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DfError::InvalidBaseValue(s) => write!(f, "Internal error: Unknown base value {}", s),
+        }
+    }
+}
+
+impl Error for DfError {}
+
+impl UError for DfError {
+    fn code(&self) -> i32 {
+        match self {
+            DfError::InvalidBaseValue(_) => 1,
+        }
+    }
+}
+
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let paths: Vec<String> = matches
@@ -268,8 +290,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     #[cfg(windows)]
     {
         if matches.is_present(OPT_INODES) {
-            println!("{}: doesn't support -i option", executable!());
-            return EXIT_OK;
+            println!("{}: doesn't support -i option", uucore::util_name());
+            return Ok(());
         }
     }
 
@@ -353,15 +375,15 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         if opt.show_inode_instead {
             print!(
                 "{0: >12} ",
-                human_readable(fs.usage.files, opt.human_readable_base)
+                human_readable(fs.usage.files, opt.human_readable_base)?
             );
             print!(
                 "{0: >12} ",
-                human_readable(fs.usage.files - fs.usage.ffree, opt.human_readable_base)
+                human_readable(fs.usage.files - fs.usage.ffree, opt.human_readable_base)?
             );
             print!(
                 "{0: >12} ",
-                human_readable(fs.usage.ffree, opt.human_readable_base)
+                human_readable(fs.usage.ffree, opt.human_readable_base)?
             );
             print!(
                 "{0: >5} ",
@@ -375,15 +397,15 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             let free_size = fs.usage.blocksize * fs.usage.bfree;
             print!(
                 "{0: >12} ",
-                human_readable(total_size, opt.human_readable_base)
+                human_readable(total_size, opt.human_readable_base)?
             );
             print!(
                 "{0: >12} ",
-                human_readable(total_size - free_size, opt.human_readable_base)
+                human_readable(total_size - free_size, opt.human_readable_base)?
             );
             print!(
                 "{0: >12} ",
-                human_readable(free_size, opt.human_readable_base)
+                human_readable(free_size, opt.human_readable_base)?
             );
             if cfg!(target_os = "macos") {
                 let used = fs.usage.blocks - fs.usage.bfree;
@@ -396,11 +418,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         println!();
     }
 
-    EXIT_OK
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/dircolors/Cargo.toml b/src/uu/dircolors/Cargo.toml
index e9e333ec6..0bf53d91a 100644
--- a/src/uu/dircolors/Cargo.toml
+++ b/src/uu/dircolors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_dircolors"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "dircolors ~ (uutils) display commands to set LS_COLORS"
@@ -17,9 +17,13 @@ path = "src/dircolors.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 glob = "0.3.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "dircolors"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs
index 70b609e31..5d0b3ac3e 100644
--- a/src/uu/dircolors/src/dircolors.rs
+++ b/src/uu/dircolors/src/dircolors.rs
@@ -17,6 +17,7 @@ use std::fs::File;
 use std::io::{BufRead, BufReader};
 
 use clap::{crate_version, App, Arg};
+use uucore::display::Quotable;
 
 mod options {
     pub const BOURNE_SHELL: &str = "bourne-shell";
@@ -62,8 +63,8 @@ pub fn guess_syntax() -> OutputFmt {
     }
 }
 
-fn get_usage() -> String {
-    format!("{0} {1}", executable!(), SYNTAX)
+fn usage() -> String {
+    format!("{0} {1}", uucore::execution_phrase(), SYNTAX)
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
@@ -71,7 +72,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(&args);
 
@@ -94,9 +95,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     if matches.is_present(options::PRINT_DATABASE) {
         if !files.is_empty() {
             show_usage_error!(
-                "extra operand '{}'\nfile operands cannot be combined with \
+                "extra operand {}\nfile operands cannot be combined with \
                  --print-database (-p)",
-                files[0]
+                files[0].quote()
             );
             return 1;
         }
@@ -126,7 +127,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         result = parse(INTERNAL_DB.lines(), out_format, "")
     } else {
         if files.len() > 1 {
-            show_usage_error!("extra operand '{}'", files[1]);
+            show_usage_error!("extra operand {}", files[1].quote());
             return 1;
         }
         match File::open(files[0]) {
@@ -135,7 +136,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 result = parse(fin.lines().filter_map(Result::ok), out_format, files[0])
             }
             Err(e) => {
-                show_error!("{}: {}", files[0], e);
+                show_error!("{}: {}", files[0].maybe_quote(), e);
                 return 1;
             }
         }
@@ -153,7 +154,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
         .after_help(LONG_HELP)
@@ -314,7 +315,8 @@ where
         if val.is_empty() {
             return Err(format!(
                 "{}:{}: invalid line;  missing second token",
-                fp, num
+                fp.maybe_quote(),
+                num
             ));
         }
         let lower = key.to_lowercase();
@@ -341,7 +343,12 @@ where
                 } else if let Some(s) = table.get(lower.as_str()) {
                     result.push_str(format!("{}={}:", s, val).as_str());
                 } else {
-                    return Err(format!("{}:{}: unrecognized keyword {}", fp, num, key));
+                    return Err(format!(
+                        "{}:{}: unrecognized keyword {}",
+                        fp.maybe_quote(),
+                        num,
+                        key
+                    ));
                 }
             }
         }
diff --git a/src/uu/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml
index bd9e449d7..7946459f3 100644
--- a/src/uu/dirname/Cargo.toml
+++ b/src/uu/dirname/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_dirname"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "dirname ~ (uutils) display parent directory of PATHNAME"
@@ -17,8 +17,8 @@ path = "src/dirname.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "dirname"
diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs
index 63ee57272..129c9369e 100644
--- a/src/uu/dirname/src/dirname.rs
+++ b/src/uu/dirname/src/dirname.rs
@@ -5,11 +5,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::path::Path;
+use uucore::display::print_verbatim;
 use uucore::error::{UResult, UUsageError};
 use uucore::InvalidEncodingHandling;
 
@@ -20,8 +18,8 @@ mod options {
     pub const DIR: &str = "dir";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION] NAME...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION] NAME...", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -37,7 +35,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -65,7 +63,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                     if d.components().next() == None {
                         print!(".")
                     } else {
-                        print!("{}", d.to_string_lossy());
+                        print_verbatim(d).unwrap();
                     }
                 }
                 None => {
@@ -79,14 +77,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             print!("{}", separator);
         }
     } else {
-        return Err(UUsageError::new(1, "missing operand".to_string()));
+        return Err(UUsageError::new(1, "missing operand"));
     }
 
     Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .about(ABOUT)
         .version(crate_version!())
         .arg(
diff --git a/src/uu/du/Cargo.toml b/src/uu/du/Cargo.toml
index dfc50f7a6..c9da0462c 100644
--- a/src/uu/du/Cargo.toml
+++ b/src/uu/du/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_du"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "du ~ (uutils) display disk usage"
@@ -17,8 +17,8 @@ path = "src/du.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 chrono = "0.4"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version="0.3", features=[] }
diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs
index 9c05eb982..9fd44b001 100644
--- a/src/uu/du/src/du.rs
+++ b/src/uu/du/src/du.rs
@@ -32,7 +32,8 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::{Duration, UNIX_EPOCH};
 use std::{error::Error, fmt::Display};
-use uucore::error::{UCustomError, UResult};
+use uucore::display::{print_verbatim, Quotable};
+use uucore::error::{UError, UResult};
 use uucore::parse_size::{parse_size, ParseSizeError};
 use uucore::InvalidEncodingHandling;
 #[cfg(windows)]
@@ -70,7 +71,6 @@ mod options {
     pub const FILE: &str = "FILE";
 }
 
-const NAME: &str = "du";
 const SUMMARY: &str = "estimate file space usage";
 const LONG_HELP: &str = "
 Display values are in units of the first available SIZE from --block-size,
@@ -87,7 +87,7 @@ const UNITS: [(char, u32); 6] = [('E', 6), ('P', 5), ('T', 4), ('G', 3), ('M', 2
 
 struct Options {
     all: bool,
-    program_name: String,
+    util_name: String,
     max_depth: Option<usize>,
     total: bool,
     separate_dirs: bool,
@@ -294,9 +294,9 @@ fn du(
             Err(e) => {
                 safe_writeln!(
                     stderr(),
-                    "{}: cannot read directory '{}': {}",
-                    options.program_name,
-                    my_stat.path.display(),
+                    "{}: cannot read directory {}: {}",
+                    options.util_name,
+                    my_stat.path.quote(),
                     e
                 );
                 return Box::new(iter::once(my_stat));
@@ -335,11 +335,11 @@ fn du(
                     }
                     Err(error) => match error.kind() {
                         ErrorKind::PermissionDenied => {
-                            let description = format!("cannot access '{}'", entry.path().display());
+                            let description = format!("cannot access {}", entry.path().quote());
                             let error_message = "Permission denied";
                             show_error_custom_description!(description, "{}", error_message)
                         }
-                        _ => show_error!("cannot access '{}': {}", entry.path().display(), error),
+                        _ => show_error!("cannot access {}: {}", entry.path().quote(), error),
                     },
                 },
                 Err(error) => show_error!("{}", error),
@@ -393,11 +393,11 @@ fn convert_size_other(size: u64, _multiplier: u64, block_size: u64) -> String {
     format!("{}", ((size as f64) / (block_size as f64)).ceil())
 }
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... [FILE]...
     {0} [OPTION]... --files0-from=F",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
@@ -412,25 +412,30 @@ enum DuError {
 impl Display for DuError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            DuError::InvalidMaxDepthArg(s) => write!(f, "invalid maximum depth '{}'", s),
+            DuError::InvalidMaxDepthArg(s) => write!(f, "invalid maximum depth {}", s.quote()),
             DuError::SummarizeDepthConflict(s) => {
-                write!(f, "summarizing conflicts with --max-depth={}", s)
+                write!(
+                    f,
+                    "summarizing conflicts with --max-depth={}",
+                    s.maybe_quote()
+                )
             }
             DuError::InvalidTimeStyleArg(s) => write!(
                 f,
-                "invalid argument '{}' for 'time style'
+                "invalid argument {} for 'time style'
 Valid arguments are:
 - 'full-iso'
 - 'long-iso'
 - 'iso'
 Try '{} --help' for more information.",
-                s, NAME
+                s.quote(),
+                uucore::execution_phrase()
             ),
             DuError::InvalidTimeArg(s) => write!(
                 f,
-                "Invalid argument '{}' for --time.
+                "Invalid argument {} for --time.
 'birth' and 'creation' arguments are not supported on this platform.",
-                s
+                s.quote()
             ),
         }
     }
@@ -438,7 +443,7 @@ Try '{} --help' for more information.",
 
 impl Error for DuError {}
 
-impl UCustomError for DuError {
+impl UError for DuError {
     fn code(&self) -> i32 {
         match self {
             Self::InvalidMaxDepthArg(_) => 1,
@@ -456,7 +461,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -466,7 +471,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let options = Options {
         all: matches.is_present(options::ALL),
-        program_name: NAME.to_owned(),
+        util_name: uucore::util_name().to_owned(),
         max_depth,
         total: matches.is_present(options::TOTAL),
         separate_dirs: matches.is_present(options::SEPARATE_DIRS),
@@ -566,21 +571,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                         };
                         if !summarize || index == len - 1 {
                             let time_str = tm.format(time_format_str).to_string();
-                            print!(
-                                "{}\t{}\t{}{}",
-                                convert_size(size),
-                                time_str,
-                                stat.path.display(),
-                                line_separator
-                            );
+                            print!("{}\t{}\t", convert_size(size), time_str);
+                            print_verbatim(stat.path).unwrap();
+                            print!("{}", line_separator);
                         }
                     } else if !summarize || index == len - 1 {
-                        print!(
-                            "{}\t{}{}",
-                            convert_size(size),
-                            stat.path.display(),
-                            line_separator
-                        );
+                        print!("{}\t", convert_size(size));
+                        print_verbatim(stat.path).unwrap();
+                        print!("{}", line_separator);
                     }
                     if options.total && index == (len - 1) {
                         // The last element will be the total size of the the path under
@@ -590,7 +588,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                 }
             }
             Err(_) => {
-                show_error!("{}: {}", path_string, "No such file or directory");
+                show_error!(
+                    "{}: {}",
+                    path_string.maybe_quote(),
+                    "No such file or directory"
+                );
             }
         }
     }
@@ -625,7 +627,7 @@ fn parse_depth(max_depth_str: Option<&str>, summarize: bool) -> UResult<Option<u
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
         .after_help(LONG_HELP)
@@ -837,8 +839,8 @@ fn format_error_message(error: ParseSizeError, s: &str, option: &str) -> String
     // GNU's du echos affected flag, -B or --block-size (-t or --threshold), depending user's selection
     // GNU's du does distinguish between "invalid (suffix in) argument"
     match error {
-        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument '{}'", option, s),
-        ParseSizeError::SizeTooBig(_) => format!("--{} argument '{}' too large", option, s),
+        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
+        ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
     }
 }
 
diff --git a/src/uu/echo/Cargo.toml b/src/uu/echo/Cargo.toml
index 60a547e21..05dd1eba1 100644
--- a/src/uu/echo/Cargo.toml
+++ b/src/uu/echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_echo"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "echo ~ (uutils) display TEXT"
@@ -16,8 +16,8 @@ path = "src/echo.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "echo"
diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs
index aae1ad10d..a0e6c0d9c 100644
--- a/src/uu/echo/src/echo.rs
+++ b/src/uu/echo/src/echo.rs
@@ -6,9 +6,6 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::io::{self, Write};
 use std::iter::Peekable;
@@ -132,7 +129,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         // TrailingVarArg specifies the final positional argument is a VarArg
         // and it doesn't attempts the parse any further args.
diff --git a/src/uu/env/Cargo.toml b/src/uu/env/Cargo.toml
index 9f778aa3f..374a4eda9 100644
--- a/src/uu/env/Cargo.toml
+++ b/src/uu/env/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_env"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "env ~ (uutils) set each NAME to VALUE in the environment and run COMMAND"
@@ -17,9 +17,9 @@ path = "src/env.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-rust-ini = "0.13.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+rust-ini = "0.17.0"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "env"
diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs
index 51ff92801..8967a798a 100644
--- a/src/uu/env/src/env.rs
+++ b/src/uu/env/src/env.rs
@@ -7,11 +7,14 @@
 
 /* last synced with: env (GNU coreutils) 8.13 */
 
-// spell-checker:ignore (ToDO) chdir execvp progname subcommand subcommands unsets
+// spell-checker:ignore (ToDO) chdir execvp progname subcommand subcommands unsets setenv putenv posix_spawnp
 
 #[macro_use]
 extern crate clap;
 
+#[macro_use]
+extern crate uucore;
+
 use clap::{App, AppSettings, Arg};
 use ini::Ini;
 use std::borrow::Cow;
@@ -19,6 +22,8 @@ use std::env;
 use std::io::{self, Write};
 use std::iter::Iterator;
 use std::process::Command;
+use uucore::display::Quotable;
+use uucore::error::{UResult, USimpleError};
 
 const USAGE: &str = "env [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]";
 const AFTER_HELP: &str = "\
@@ -61,8 +66,14 @@ fn parse_name_value_opt<'a>(opts: &mut Options<'a>, opt: &'a str) -> Result<bool
 
 fn parse_program_opt<'a>(opts: &mut Options<'a>, opt: &'a str) -> Result<(), i32> {
     if opts.null {
-        eprintln!("{}: cannot specify --null (-0) with command", crate_name!());
-        eprintln!("Type \"{} --help\" for detailed information", crate_name!());
+        eprintln!(
+            "{}: cannot specify --null (-0) with command",
+            uucore::util_name()
+        );
+        eprintln!(
+            "Type \"{} --help\" for detailed information",
+            uucore::execution_phrase()
+        );
         Err(1)
     } else {
         opts.program.push(opt);
@@ -70,7 +81,7 @@ fn parse_program_opt<'a>(opts: &mut Options<'a>, opt: &'a str) -> Result<(), i32
     }
 }
 
-fn load_config_file(opts: &mut Options) -> Result<(), i32> {
+fn load_config_file(opts: &mut Options) -> UResult<()> {
     // NOTE: config files are parsed using an INI parser b/c it's available and compatible with ".env"-style files
     //   ... * but support for actual INI files, although working, is not intended, nor claimed
     for &file in &opts.files {
@@ -83,13 +94,13 @@ fn load_config_file(opts: &mut Options) -> Result<(), i32> {
         };
 
         let conf = conf.map_err(|error| {
-            eprintln!("env: error: \"{}\": {}", file, error);
+            show_error!("{}: {}", file.maybe_quote(), error);
             1
         })?;
 
         for (_, prop) in &conf {
             // ignore all INI section lines (treat them as comments)
-            for (key, value) in prop {
+            for (key, value) in prop.iter() {
                 env::set_var(key, value);
             }
         }
@@ -157,7 +168,7 @@ pub fn uu_app() -> App<'static, 'static> {
             .help("remove variable from the environment"))
 }
 
-fn run_env(args: impl uucore::Args) -> Result<(), i32> {
+fn run_env(args: impl uucore::Args) -> UResult<()> {
     let app = uu_app();
     let matches = app.get_matches_from(args);
 
@@ -188,8 +199,10 @@ fn run_env(args: impl uucore::Args) -> Result<(), i32> {
         match env::set_current_dir(d) {
             Ok(()) => d,
             Err(error) => {
-                eprintln!("env: cannot change directory to \"{}\": {}", d, error);
-                return Err(125);
+                return Err(USimpleError::new(
+                    125,
+                    format!("cannot change directory to \"{}\": {}", d, error),
+                ));
             }
         };
     }
@@ -243,7 +256,32 @@ fn run_env(args: impl uucore::Args) -> Result<(), i32> {
 
     // set specified env vars
     for &(name, val) in &opts.sets {
-        // FIXME: set_var() panics if name is an empty string
+        /*
+         * set_var panics if name is an empty string
+         * set_var internally calls setenv (on unix at least), while GNU env calls putenv instead.
+         *
+         * putenv returns successfully if provided with something like "=a" and modifies the environ
+         * variable to contain "=a" inside it, effectively modifying the process' current environment
+         * to contain a malformed string in it. Using GNU's implementation, the command `env =a`
+         * prints out the malformed string and even invokes the child process with that environment.
+         * This can be seen by using `env -i =a env` or `env -i =a cat /proc/self/environ`
+         *
+         * POSIX.1-2017 doesn't seem to mention what to do if the string is malformed (at least
+         * not in "Chapter 8, Environment Variables" or in the definition for environ and various
+         * exec*'s or in the description of env in the "Shell & Utilities" volume).
+         *
+         * It also doesn't specify any checks for putenv before modifying the environ variable, which
+         * is likely why glibc doesn't do so. However, setenv's first argument cannot point to
+         * an empty string or a string containing '='.
+         *
+         * There is no benefit in replicating GNU's env behavior, since it will only modify the
+         * environment in weird ways
+         */
+
+        if name.is_empty() {
+            show_warning!("no name specified for value {}", val.quote());
+            continue;
+        }
         env::set_var(name, val);
     }
 
@@ -251,11 +289,16 @@ fn run_env(args: impl uucore::Args) -> Result<(), i32> {
         // we need to execute a command
         let (prog, args) = build_command(&mut opts.program);
 
-        // FIXME: this should just use execvp() (no fork()) on Unix-like systems
+        /*
+         * On Unix-like systems Command::status either ends up calling either fork or posix_spawnp
+         * (which ends up calling clone). Keep using the current process would be ideal, but the
+         * standard library contains many checks and fail-safes to ensure the process ends up being
+         * created. This is much simpler than dealing with the hassles of calling execvp directly.
+         */
         match Command::new(&*prog).args(args).status() {
-            Ok(exit) if !exit.success() => return Err(exit.code().unwrap()),
-            Err(ref err) if err.kind() == io::ErrorKind::NotFound => return Err(127),
-            Err(_) => return Err(126),
+            Ok(exit) if !exit.success() => return Err(exit.code().unwrap().into()),
+            Err(ref err) if err.kind() == io::ErrorKind::NotFound => return Err(127.into()),
+            Err(_) => return Err(126.into()),
             Ok(_) => (),
         }
     } else {
@@ -266,9 +309,7 @@ fn run_env(args: impl uucore::Args) -> Result<(), i32> {
     Ok(())
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    match run_env(args) {
-        Ok(()) => 0,
-        Err(code) => code,
-    }
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    run_env(args)
 }
diff --git a/src/uu/expand/Cargo.toml b/src/uu/expand/Cargo.toml
index 5921ef679..efd338dab 100644
--- a/src/uu/expand/Cargo.toml
+++ b/src/uu/expand/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_expand"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "expand ~ (uutils) convert input tabs to spaces"
@@ -17,9 +17,13 @@ path = "src/expand.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 unicode-width = "0.1.5"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "expand"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs
index 66c3eb259..b09b8aaab 100644
--- a/src/uu/expand/src/expand.rs
+++ b/src/uu/expand/src/expand.rs
@@ -17,6 +17,7 @@ use std::fs::File;
 use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
 use std::str::from_utf8;
 use unicode_width::UnicodeWidthChar;
+use uucore::display::Quotable;
 
 static ABOUT: &str = "Convert tabs in each FILE to spaces, writing to standard output.
  With no FILE, or when FILE is -, read standard input.";
@@ -32,32 +33,90 @@ static LONG_HELP: &str = "";
 
 static DEFAULT_TABSTOP: usize = 8;
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
-fn tabstops_parse(s: String) -> Vec<usize> {
-    let words = s.split(',');
+/// The mode to use when replacing tabs beyond the last one specified in
+/// the `--tabs` argument.
+enum RemainingMode {
+    None,
+    Slash,
+    Plus,
+}
 
-    let nums = words
-        .map(|sn| {
-            sn.parse::<usize>()
-                .unwrap_or_else(|_| crash!(1, "{}\n", "tab size contains invalid character(s)"))
-        })
-        .collect::<Vec<usize>>();
+/// Decide whether the character is either a space or a comma.
+///
+/// # Examples
+///
+/// ```rust,ignore
+/// assert!(is_space_or_comma(' '))
+/// assert!(is_space_or_comma(','))
+/// assert!(!is_space_or_comma('a'))
+/// ```
+fn is_space_or_comma(c: char) -> bool {
+    c == ' ' || c == ','
+}
 
-    if nums.iter().any(|&n| n == 0) {
-        crash!(1, "{}\n", "tab size cannot be 0");
+/// Parse a list of tabstops from a `--tabs` argument.
+///
+/// This function returns both the vector of numbers appearing in the
+/// comma- or space-separated list, and also an optional mode, specified
+/// by either a "/" or a "+" character appearing before the final number
+/// in the list. This mode defines the strategy to use for computing the
+/// number of spaces to use for columns beyond the end of the tab stop
+/// list specified here.
+fn tabstops_parse(s: String) -> (RemainingMode, Vec<usize>) {
+    // Leading commas and spaces are ignored.
+    let s = s.trim_start_matches(is_space_or_comma);
+
+    // If there were only commas and spaces in the string, just use the
+    // default tabstops.
+    if s.is_empty() {
+        return (RemainingMode::None, vec![DEFAULT_TABSTOP]);
     }
 
-    if let (false, _) = nums
-        .iter()
-        .fold((true, 0), |(acc, last), &n| (acc && last <= n, n))
-    {
-        crash!(1, "{}\n", "tab sizes must be ascending");
-    }
+    let mut nums = vec![];
+    let mut remaining_mode = RemainingMode::None;
+    for word in s.split(is_space_or_comma) {
+        let bytes = word.as_bytes();
+        for i in 0..bytes.len() {
+            match bytes[i] {
+                b'+' => {
+                    remaining_mode = RemainingMode::Plus;
+                }
+                b'/' => {
+                    remaining_mode = RemainingMode::Slash;
+                }
+                _ => {
+                    // Parse a number from the byte sequence.
+                    let num = from_utf8(&bytes[i..]).unwrap().parse::<usize>().unwrap();
 
-    nums
+                    // Tab size must be positive.
+                    if num == 0 {
+                        crash!(1, "{}\n", "tab size cannot be 0");
+                    }
+
+                    // Tab sizes must be ascending.
+                    if let Some(last_stop) = nums.last() {
+                        if *last_stop >= num {
+                            crash!(1, "tab sizes must be ascending");
+                        }
+                    }
+
+                    // Append this tab stop to the list of all tabstops.
+                    nums.push(num);
+                    break;
+                }
+            }
+        }
+    }
+    // If no numbers could be parsed (for example, if `s` were "+,+,+"),
+    // then just use the default tabstops.
+    if nums.is_empty() {
+        nums = vec![DEFAULT_TABSTOP];
+    }
+    (remaining_mode, nums)
 }
 
 struct Options {
@@ -66,13 +125,17 @@ struct Options {
     tspaces: String,
     iflag: bool,
     uflag: bool,
+
+    /// Strategy for expanding tabs for columns beyond those specified
+    /// in `tabstops`.
+    remaining_mode: RemainingMode,
 }
 
 impl Options {
     fn new(matches: &ArgMatches) -> Options {
-        let tabstops = match matches.value_of(options::TABS) {
+        let (remaining_mode, tabstops) = match matches.value_of(options::TABS) {
             Some(s) => tabstops_parse(s.to_string()),
-            None => vec![DEFAULT_TABSTOP],
+            None => (RemainingMode::None, vec![DEFAULT_TABSTOP]),
         };
 
         let iflag = matches.is_present(options::INITIAL);
@@ -102,12 +165,13 @@ impl Options {
             tspaces,
             iflag,
             uflag,
+            remaining_mode,
         }
     }
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     expand(Options::new(&matches));
@@ -115,7 +179,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
@@ -153,19 +217,47 @@ fn open(path: String) -> BufReader<Box<dyn Read + 'static>> {
     } else {
         file_buf = match File::open(&path[..]) {
             Ok(a) => a,
-            Err(e) => crash!(1, "{}: {}\n", &path[..], e),
+            Err(e) => crash!(1, "{}: {}\n", path.maybe_quote(), e),
         };
         BufReader::new(Box::new(file_buf) as Box<dyn Read>)
     }
 }
 
-fn next_tabstop(tabstops: &[usize], col: usize) -> usize {
-    if tabstops.len() == 1 {
-        tabstops[0] - col % tabstops[0]
-    } else {
-        match tabstops.iter().find(|&&t| t > col) {
+/// Compute the number of spaces to the next tabstop.
+///
+/// `tabstops` is the sequence of tabstop locations.
+///
+/// `col` is the index of the current cursor in the line being written.
+///
+/// If `remaining_mode` is [`RemainingMode::Plus`], then the last entry
+/// in the `tabstops` slice is interpreted as a relative number of
+/// spaces, which this function will return for every input value of
+/// `col` beyond the end of the second-to-last element of `tabstops`.
+///
+/// If `remaining_mode` is [`RemainingMode::Plus`], then the last entry
+/// in the `tabstops` slice is interpreted as a relative number of
+/// spaces, which this function will return for every input value of
+/// `col` beyond the end of the second-to-last element of `tabstops`.
+fn next_tabstop(tabstops: &[usize], col: usize, remaining_mode: &RemainingMode) -> usize {
+    let num_tabstops = tabstops.len();
+    match remaining_mode {
+        RemainingMode::Plus => match tabstops[0..num_tabstops - 1].iter().find(|&&t| t > col) {
             Some(t) => t - col,
-            None => 1,
+            None => tabstops[num_tabstops - 1] - 1,
+        },
+        RemainingMode::Slash => match tabstops[0..num_tabstops - 1].iter().find(|&&t| t > col) {
+            Some(t) => t - col,
+            None => tabstops[num_tabstops - 1] - col % tabstops[num_tabstops - 1],
+        },
+        RemainingMode::None => {
+            if num_tabstops == 1 {
+                tabstops[0] - col % tabstops[0]
+            } else {
+                match tabstops.iter().find(|&&t| t > col) {
+                    Some(t) => t - col,
+                    None => 1,
+                }
+            }
         }
     }
 }
@@ -232,14 +324,21 @@ fn expand(options: Options) {
                 match ctype {
                     Tab => {
                         // figure out how many spaces to the next tabstop
-                        let nts = next_tabstop(ts, col);
+                        let nts = next_tabstop(ts, col, &options.remaining_mode);
                         col += nts;
 
                         // now dump out either spaces if we're expanding, or a literal tab if we're not
                         if init || !options.iflag {
-                            safe_unwrap!(output.write_all(options.tspaces[..nts].as_bytes()));
+                            if nts <= options.tspaces.len() {
+                                crash_if_err!(
+                                    1,
+                                    output.write_all(options.tspaces[..nts].as_bytes())
+                                );
+                            } else {
+                                crash_if_err!(1, output.write_all(" ".repeat(nts).as_bytes()));
+                            };
                         } else {
-                            safe_unwrap!(output.write_all(&buf[byte..byte + nbytes]));
+                            crash_if_err!(1, output.write_all(&buf[byte..byte + nbytes]));
                         }
                     }
                     _ => {
@@ -257,15 +356,42 @@ fn expand(options: Options) {
                             init = false;
                         }
 
-                        safe_unwrap!(output.write_all(&buf[byte..byte + nbytes]));
+                        crash_if_err!(1, output.write_all(&buf[byte..byte + nbytes]));
                     }
                 }
 
                 byte += nbytes; // advance the pointer
             }
 
-            safe_unwrap!(output.flush());
+            crash_if_err!(1, output.flush());
             buf.truncate(0); // clear the buffer
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::next_tabstop;
+    use super::RemainingMode;
+
+    #[test]
+    fn test_next_tabstop_remaining_mode_none() {
+        assert_eq!(next_tabstop(&[1, 5], 0, &RemainingMode::None), 1);
+        assert_eq!(next_tabstop(&[1, 5], 3, &RemainingMode::None), 2);
+        assert_eq!(next_tabstop(&[1, 5], 6, &RemainingMode::None), 1);
+    }
+
+    #[test]
+    fn test_next_tabstop_remaining_mode_plus() {
+        assert_eq!(next_tabstop(&[1, 5], 0, &RemainingMode::Plus), 1);
+        assert_eq!(next_tabstop(&[1, 5], 3, &RemainingMode::Plus), 4);
+        assert_eq!(next_tabstop(&[1, 5], 6, &RemainingMode::Plus), 4);
+    }
+
+    #[test]
+    fn test_next_tabstop_remaining_mode_slash() {
+        assert_eq!(next_tabstop(&[1, 5], 0, &RemainingMode::Slash), 1);
+        assert_eq!(next_tabstop(&[1, 5], 3, &RemainingMode::Slash), 2);
+        assert_eq!(next_tabstop(&[1, 5], 6, &RemainingMode::Slash), 4);
+    }
+}
diff --git a/src/uu/expr/Cargo.toml b/src/uu/expr/Cargo.toml
index 65d4fa636..90a53f2ce 100644
--- a/src/uu/expr/Cargo.toml
+++ b/src/uu/expr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_expr"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "expr ~ (uutils) display the value of EXPRESSION"
@@ -20,9 +20,13 @@ libc = "0.2.42"
 num-bigint = "0.4.0"
 num-traits = "0.2.14"
 onig = "~4.3.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "expr"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs
index 92c15565d..6e2a8701a 100644
--- a/src/uu/expr/src/expr.rs
+++ b/src/uu/expr/src/expr.rs
@@ -5,10 +5,8 @@
 //* For the full copyright and license information, please view the LICENSE
 //* file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
+use uucore::error::{UResult, USimpleError};
 use uucore::InvalidEncodingHandling;
 
 mod syntax_tree;
@@ -18,12 +16,13 @@ const VERSION: &str = "version";
 const HELP: &str = "help";
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .arg(Arg::with_name(VERSION).long(VERSION))
         .arg(Arg::with_name(HELP).long(HELP))
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -32,13 +31,13 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     // The following usage should work without escaping hyphens: `expr -15 = 1 +  2 \* \( 3 - -4 \)`
 
     if maybe_handle_help_or_version(&args) {
-        0
+        Ok(())
     } else {
         let token_strings = args[1..].to_vec();
 
         match process_expr(&token_strings) {
             Ok(expr_result) => print_expr_ok(&expr_result),
-            Err(expr_error) => print_expr_error(&expr_error),
+            Err(expr_error) => Err(USimpleError::new(2, &expr_error)),
         }
     }
 }
@@ -49,19 +48,15 @@ fn process_expr(token_strings: &[String]) -> Result<String, String> {
     evaluate_ast(maybe_ast)
 }
 
-fn print_expr_ok(expr_result: &str) -> i32 {
+fn print_expr_ok(expr_result: &str) -> UResult<()> {
     println!("{}", expr_result);
     if expr_result == "0" || expr_result.is_empty() {
-        1
+        Err(1.into())
     } else {
-        0
+        Ok(())
     }
 }
 
-fn print_expr_error(expr_error: &str) -> ! {
-    crash!(2, "{}", expr_error)
-}
-
 fn evaluate_ast(maybe_ast: Result<Box<syntax_tree::AstNode>, String>) -> Result<String, String> {
     maybe_ast.and_then(|ast| ast.evaluate())
 }
@@ -140,5 +135,5 @@ Environment variables:
 }
 
 fn print_version() {
-    println!("{} {}", executable!(), crate_version!());
+    println!("{} {}", uucore::util_name(), crate_version!());
 }
diff --git a/src/uu/factor/Cargo.toml b/src/uu/factor/Cargo.toml
index 76c06a34c..2d2fa236b 100644
--- a/src/uu/factor/Cargo.toml
+++ b/src/uu/factor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_factor"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "factor ~ (uutils) display the prime factors of each NUMBER"
@@ -20,7 +20,7 @@ num-traits = "0.2.13" # Needs at least version 0.2.13 for "OverflowingAdd"
 rand = { version = "0.7", features = ["small_rng"] }
 smallvec = { version = "0.6.14, < 1.0" }
 uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore" }
-uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" }
+uucore_procs = { version=">=0.0.7", package = "uucore_procs", path = "../../uucore_procs" }
 clap = { version = "2.33", features = ["wrap_help"] }
 
 [dev-dependencies]
@@ -34,3 +34,7 @@ path = "src/main.rs"
 
 [lib]
 path = "src/cli.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/factor/src/cli.rs b/src/uu/factor/src/cli.rs
index 0f5d21362..30541c244 100644
--- a/src/uu/factor/src/cli.rs
+++ b/src/uu/factor/src/cli.rs
@@ -10,11 +10,13 @@
 extern crate uucore;
 
 use std::error::Error;
+use std::fmt::Write as FmtWrite;
 use std::io::{self, stdin, stdout, BufRead, Write};
 
 mod factor;
 use clap::{crate_version, App, Arg};
 pub use factor::*;
+use uucore::display::Quotable;
 
 mod miller_rabin;
 pub mod numeric;
@@ -28,22 +30,30 @@ mod options {
     pub static NUMBER: &str = "NUMBER";
 }
 
-fn print_factors_str(num_str: &str, w: &mut impl io::Write) -> Result<(), Box<dyn Error>> {
-    num_str
-        .parse::<u64>()
-        .map_err(|e| e.into())
-        .and_then(|x| writeln!(w, "{}:{}", x, factor(x)).map_err(|e| e.into()))
+fn print_factors_str(
+    num_str: &str,
+    w: &mut io::BufWriter<impl io::Write>,
+    factors_buffer: &mut String,
+) -> Result<(), Box<dyn Error>> {
+    num_str.parse::<u64>().map_err(|e| e.into()).and_then(|x| {
+        factors_buffer.clear();
+        writeln!(factors_buffer, "{}:{}", x, factor(x))?;
+        w.write_all(factors_buffer.as_bytes())?;
+        Ok(())
+    })
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
     let matches = uu_app().get_matches_from(args);
     let stdout = stdout();
-    let mut w = io::BufWriter::new(stdout.lock());
+    // We use a smaller buffer here to pass a gnu test. 4KiB appears to be the default pipe size for bash.
+    let mut w = io::BufWriter::with_capacity(4 * 1024, stdout.lock());
+    let mut factors_buffer = String::new();
 
     if let Some(values) = matches.values_of(options::NUMBER) {
         for number in values {
-            if let Err(e) = print_factors_str(number, &mut w) {
-                show_warning!("{}: {}", number, e);
+            if let Err(e) = print_factors_str(number, &mut w, &mut factors_buffer) {
+                show_warning!("{}: {}", number.maybe_quote(), e);
             }
         }
     } else {
@@ -51,8 +61,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
         for line in stdin.lock().lines() {
             for number in line.unwrap().split_whitespace() {
-                if let Err(e) = print_factors_str(number, &mut w) {
-                    show_warning!("{}: {}", number, e);
+                if let Err(e) = print_factors_str(number, &mut w, &mut factors_buffer) {
+                    show_warning!("{}: {}", number.maybe_quote(), e);
                 }
             }
         }
@@ -66,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
         .arg(Arg::with_name(options::NUMBER).multiple(true))
diff --git a/src/uu/factor/src/table.rs b/src/uu/factor/src/table.rs
index 6d4047e49..0fb338d9d 100644
--- a/src/uu/factor/src/table.rs
+++ b/src/uu/factor/src/table.rs
@@ -86,7 +86,7 @@ mod tests {
             let mut n_c: [u64; CHUNK_SIZE] = rng.gen();
             let mut f_c: [Factors; CHUNK_SIZE] = rng.gen();
 
-            let mut n_i = n_c.clone();
+            let mut n_i = n_c;
             let mut f_i = f_c.clone();
             for (n, f) in n_i.iter_mut().zip(f_i.iter_mut()) {
                 factor(n, f);
diff --git a/src/uu/false/Cargo.toml b/src/uu/false/Cargo.toml
index d6b4b7d6d..2a725e2b0 100644
--- a/src/uu/false/Cargo.toml
+++ b/src/uu/false/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_false"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "false ~ (uutils) do nothing and fail"
@@ -16,8 +16,8 @@ path = "src/false.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "false"
diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs
index 2d64c8376..783c7fa0d 100644
--- a/src/uu/false/src/false.rs
+++ b/src/uu/false/src/false.rs
@@ -5,19 +5,15 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::App;
-use uucore::error::{UError, UResult};
-use uucore::executable;
+use uucore::error::UResult;
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     uu_app().get_matches_from(args);
-    Err(UError::from(1))
+    Err(1.into())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
 }
diff --git a/src/uu/fmt/Cargo.toml b/src/uu/fmt/Cargo.toml
index dea0726a6..a4700cb5e 100644
--- a/src/uu/fmt/Cargo.toml
+++ b/src/uu/fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_fmt"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "fmt ~ (uutils) reformat each paragraph of input"
@@ -18,9 +18,13 @@ path = "src/fmt.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 unicode-width = "0.1.5"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "fmt"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs
index 8c2c8d9d9..669c98b14 100644
--- a/src/uu/fmt/src/fmt.rs
+++ b/src/uu/fmt/src/fmt.rs
@@ -15,6 +15,7 @@ use std::cmp;
 use std::fs::File;
 use std::io::{stdin, stdout, Write};
 use std::io::{BufReader, BufWriter, Read};
+use uucore::display::Quotable;
 
 use self::linebreak::break_lines;
 use self::parasplit::ParagraphStream;
@@ -50,8 +51,8 @@ static OPT_TAB_WIDTH: &str = "tab-width";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 pub type FileOrStdReader = BufReader<Box<dyn Read + 'static>>;
@@ -75,7 +76,7 @@ pub struct FmtOptions {
 
 #[allow(clippy::cognitive_complexity)]
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -132,7 +133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         fmt_opts.width = match s.parse::<usize>() {
             Ok(t) => t,
             Err(e) => {
-                crash!(1, "Invalid WIDTH specification: `{}': {}", s, e);
+                crash!(1, "Invalid WIDTH specification: {}: {}", s.quote(), e);
             }
         };
         if fmt_opts.width > MAX_WIDTH {
@@ -149,7 +150,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         fmt_opts.goal = match s.parse::<usize>() {
             Ok(t) => t,
             Err(e) => {
-                crash!(1, "Invalid GOAL specification: `{}': {}", s, e);
+                crash!(1, "Invalid GOAL specification: {}: {}", s.quote(), e);
             }
         };
         if !matches.is_present(OPT_WIDTH) {
@@ -163,7 +164,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         fmt_opts.tabwidth = match s.parse::<usize>() {
             Ok(t) => t,
             Err(e) => {
-                crash!(1, "Invalid TABWIDTH specification: `{}': {}", s, e);
+                crash!(1, "Invalid TABWIDTH specification: {}: {}", s.quote(), e);
             }
         };
     };
@@ -187,7 +188,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             _ => match File::open(i) {
                 Ok(f) => BufReader::new(Box::new(f) as Box<dyn Read + 'static>),
                 Err(e) => {
-                    show_warning!("{}: {}", i, e);
+                    show_warning!("{}: {}", i.maybe_quote(), e);
                     continue;
                 }
             },
@@ -211,7 +212,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/fold/Cargo.toml b/src/uu/fold/Cargo.toml
index 446be290d..ce2aeead4 100644
--- a/src/uu/fold/Cargo.toml
+++ b/src/uu/fold/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_fold"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "fold ~ (uutils) wrap each line of input"
@@ -16,9 +16,13 @@ path = "src/fold.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "fold"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs
index 1dbc8cdc7..c4cc16469 100644
--- a/src/uu/fold/src/fold.rs
+++ b/src/uu/fold/src/fold.rs
@@ -64,7 +64,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(SYNTAX)
@@ -119,7 +119,7 @@ fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) {
             stdin_buf = stdin();
             &mut stdin_buf as &mut dyn Read
         } else {
-            file_buf = safe_unwrap!(File::open(Path::new(filename)));
+            file_buf = crash_if_err!(1, File::open(Path::new(filename)));
             &mut file_buf as &mut dyn Read
         });
 
diff --git a/src/uu/groups/Cargo.toml b/src/uu/groups/Cargo.toml
index c32153f17..6ac210692 100644
--- a/src/uu/groups/Cargo.toml
+++ b/src/uu/groups/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_groups"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "groups ~ (uutils) display group memberships for USERNAME"
@@ -15,8 +15,8 @@ edition = "2018"
 path = "src/groups.rs"
 
 [dependencies]
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "process"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "process"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 clap = { version = "2.33", features = ["wrap_help"] }
 
 [[bin]]
diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs
index a40d1a490..43e2a2239 100644
--- a/src/uu/groups/src/groups.rs
+++ b/src/uu/groups/src/groups.rs
@@ -17,7 +17,10 @@
 
 #[macro_use]
 extern crate uucore;
-use uucore::entries::{get_groups_gnu, gid2grp, Locate, Passwd};
+use uucore::{
+    display::Quotable,
+    entries::{get_groups_gnu, gid2grp, Locate, Passwd},
+};
 
 use clap::{crate_version, App, Arg};
 
@@ -28,12 +31,12 @@ static ABOUT: &str = "Print group memberships for each USERNAME or, \
                       if no USERNAME is specified, for\nthe current process \
                       (which may differ if the groups data‐base has changed).";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [USERNAME]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [USERNAME]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -77,7 +80,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                     .join(" ")
             );
         } else {
-            show_error!("'{}': no such user", user);
+            show_error!("{}: no such user", user.quote());
             exit_code = 1;
         }
     }
@@ -85,7 +88,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml
index 43d78119b..67b0f9e02 100644
--- a/src/uu/hashsum/Cargo.toml
+++ b/src/uu/hashsum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_hashsum"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "hashsum ~ (uutils) display or check input digests"
@@ -15,10 +15,11 @@ edition = "2018"
 path = "src/hashsum.rs"
 
 [dependencies]
-digest = "0.6.2"
+digest = "0.6.1"
 clap = { version = "2.33", features = ["wrap_help"] }
 hex = "0.2.0"
 libc = "0.2.42"
+memchr = "2"
 md5 = "0.3.5"
 regex = "1.0.1"
 regex-syntax = "0.6.7"
@@ -26,9 +27,13 @@ sha1 = "0.6.0"
 sha2 = "0.6.0"
 sha3 = "0.6.0"
 blake2b_simd = "0.5.11"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "hashsum"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/hashsum/src/digest.rs b/src/uu/hashsum/src/digest.rs
index 9093d94a7..61f425662 100644
--- a/src/uu/hashsum/src/digest.rs
+++ b/src/uu/hashsum/src/digest.rs
@@ -1,10 +1,22 @@
+// spell-checker:ignore memmem
+//! Implementations of digest functions, like md5 and sha1.
+//!
+//! The [`Digest`] trait represents the interface for providing inputs
+//! to these digest functions and accessing the resulting hash. The
+//! [`DigestWriter`] struct provides a wrapper around [`Digest`] that
+//! implements the [`Write`] trait, for use in situations where calling
+//! [`write`] would be useful.
 extern crate digest;
 extern crate md5;
 extern crate sha1;
 extern crate sha2;
 extern crate sha3;
 
+use std::io::Write;
+
 use hex::ToHex;
+#[cfg(windows)]
+use memchr::memmem;
 
 use crate::digest::digest::{ExtendableOutput, Input, XofReader};
 
@@ -158,3 +170,145 @@ impl_digest_sha!(sha3::Sha3_384, 384);
 impl_digest_sha!(sha3::Sha3_512, 512);
 impl_digest_shake!(sha3::Shake128);
 impl_digest_shake!(sha3::Shake256);
+
+/// A struct that writes to a digest.
+///
+/// This struct wraps a [`Digest`] and provides a [`Write`]
+/// implementation that passes input bytes directly to the
+/// [`Digest::input`].
+///
+/// On Windows, if `binary` is `false`, then the [`write`]
+/// implementation replaces instances of "\r\n" with "\n" before passing
+/// the input bytes to the [`digest`].
+pub struct DigestWriter<'a> {
+    digest: &'a mut Box<dyn Digest>,
+
+    /// Whether to write to the digest in binary mode or text mode on Windows.
+    ///
+    /// If this is `false`, then instances of "\r\n" are replaced with
+    /// "\n" before passing input bytes to the [`digest`].
+    #[allow(dead_code)]
+    binary: bool,
+
+    /// Whether the previous
+    #[allow(dead_code)]
+    was_last_character_carriage_return: bool,
+    // TODO These are dead code only on non-Windows operating systems.
+    // It might be better to use a `#[cfg(windows)]` guard here.
+}
+
+impl<'a> DigestWriter<'a> {
+    pub fn new(digest: &'a mut Box<dyn Digest>, binary: bool) -> DigestWriter {
+        let was_last_character_carriage_return = false;
+        DigestWriter {
+            digest,
+            binary,
+            was_last_character_carriage_return,
+        }
+    }
+
+    pub fn finalize(&mut self) -> bool {
+        if self.was_last_character_carriage_return {
+            self.digest.input(&[b'\r']);
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl<'a> Write for DigestWriter<'a> {
+    #[cfg(not(windows))]
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.digest.input(buf);
+        Ok(buf.len())
+    }
+
+    #[cfg(windows)]
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        if self.binary {
+            self.digest.input(buf);
+            return Ok(buf.len());
+        }
+
+        // The remaining code handles Windows text mode, where we must
+        // replace each occurrence of "\r\n" with "\n".
+        //
+        // First, if the last character written was "\r" and the first
+        // character in the current buffer to write is not "\n", then we
+        // need to write the "\r" that we buffered from the previous
+        // call to `write()`.
+        let n = buf.len();
+        if self.was_last_character_carriage_return && n > 0 && buf[0] != b'\n' {
+            self.digest.input(&[b'\r']);
+        }
+
+        // Next, find all occurrences of "\r\n", inputting the slice
+        // just before the "\n" in the previous instance of "\r\n" and
+        // the beginning of this "\r\n".
+        let mut i_prev = 0;
+        for i in memmem::find_iter(buf, b"\r\n") {
+            self.digest.input(&buf[i_prev..i]);
+            i_prev = i + 1;
+        }
+
+        // Finally, check whether the last character is "\r". If so,
+        // buffer it until we know that the next character is not "\n",
+        // which can only be known on the next call to `write()`.
+        //
+        // This all assumes that `write()` will be called on adjacent
+        // blocks of the input.
+        if n > 0 && buf[n - 1] == b'\r' {
+            self.was_last_character_carriage_return = true;
+            self.digest.input(&buf[i_prev..n - 1]);
+        } else {
+            self.was_last_character_carriage_return = false;
+            self.digest.input(&buf[i_prev..n]);
+        }
+
+        // Even though we dropped a "\r" for each "\r\n" we found, we
+        // still report the number of bytes written as `n`. This is
+        // because the meaning of the returned number is supposed to be
+        // the number of bytes consumed by the writer, so that if the
+        // calling code were calling `write()` in a loop, it would know
+        // where the next contiguous slice of the buffer starts.
+        Ok(n)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    /// Test for replacing a "\r\n" sequence with "\n" when the "\r" is
+    /// at the end of one block and the "\n" is at the beginning of the
+    /// next block, when reading in blocks.
+    #[cfg(windows)]
+    #[test]
+    fn test_crlf_across_blocks() {
+        use std::io::Write;
+
+        use crate::digest::Digest;
+        use crate::digest::DigestWriter;
+
+        // Writing "\r" in one call to `write()`, and then "\n" in another.
+        let mut digest = Box::new(md5::Context::new()) as Box<dyn Digest>;
+        let mut writer_crlf = DigestWriter::new(&mut digest, false);
+        writer_crlf.write_all(&[b'\r']).unwrap();
+        writer_crlf.write_all(&[b'\n']).unwrap();
+        writer_crlf.finalize();
+        let result_crlf = digest.result_str();
+
+        // We expect "\r\n" to be replaced with "\n" in text mode on Windows.
+        let mut digest = Box::new(md5::Context::new()) as Box<dyn Digest>;
+        let mut writer_lf = DigestWriter::new(&mut digest, false);
+        writer_lf.write_all(&[b'\n']).unwrap();
+        writer_lf.finalize();
+        let result_lf = digest.result_str();
+
+        assert_eq!(result_crlf, result_lf);
+    }
+}
diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs
index d9feb6648..07070ed1b 100644
--- a/src/uu/hashsum/src/hashsum.rs
+++ b/src/uu/hashsum/src/hashsum.rs
@@ -18,6 +18,7 @@ extern crate uucore;
 mod digest;
 
 use self::digest::Digest;
+use self::digest::DigestWriter;
 
 use clap::{App, Arg, ArgMatches};
 use hex::ToHex;
@@ -33,6 +34,7 @@ use std::io::{self, stdin, BufRead, BufReader, Read};
 use std::iter;
 use std::num::ParseIntError;
 use std::path::Path;
+use uucore::display::Quotable;
 
 const NAME: &str = "hashsum";
 
@@ -342,7 +344,7 @@ pub fn uu_app_common() -> App<'static, 'static> {
     const TEXT_HELP: &str = "read in text mode";
     #[cfg(not(windows))]
     const TEXT_HELP: &str = "read in text mode (default)";
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about("Compute and check message digests.")
         .arg(
@@ -468,25 +470,42 @@ where
             stdin_buf = stdin();
             Box::new(stdin_buf) as Box<dyn Read>
         } else {
-            file_buf = safe_unwrap!(File::open(filename));
+            file_buf = crash_if_err!(1, File::open(filename));
             Box::new(file_buf) as Box<dyn Read>
         });
         if options.check {
             // Set up Regexes for line validation and parsing
+            //
+            // First, we compute the number of bytes we expect to be in
+            // the digest string. If the algorithm has a variable number
+            // of output bits, then we use the `+` modifier in the
+            // regular expression, otherwise we use the `{n}` modifier,
+            // where `n` is the number of bytes.
             let bytes = options.digest.output_bits() / 4;
-            let gnu_re = safe_unwrap!(Regex::new(&format!(
-                r"^(?P<digest>[a-fA-F0-9]{{{}}}) (?P<binary>[ \*])(?P<fileName>.*)",
-                bytes
-            )));
-            let bsd_re = safe_unwrap!(Regex::new(&format!(
-                r"^{algorithm} \((?P<fileName>.*)\) = (?P<digest>[a-fA-F0-9]{{{digest_size}}})",
-                algorithm = options.algoname,
-                digest_size = bytes
-            )));
+            let modifier = if bytes > 0 {
+                format!("{{{}}}", bytes)
+            } else {
+                "+".to_string()
+            };
+            let gnu_re = crash_if_err!(
+                1,
+                Regex::new(&format!(
+                    r"^(?P<digest>[a-fA-F0-9]{}) (?P<binary>[ \*])(?P<fileName>.*)",
+                    modifier,
+                ))
+            );
+            let bsd_re = crash_if_err!(
+                1,
+                Regex::new(&format!(
+                    r"^{algorithm} \((?P<fileName>.*)\) = (?P<digest>[a-fA-F0-9]{digest_size})",
+                    algorithm = options.algoname,
+                    digest_size = modifier,
+                ))
+            );
 
             let buffer = file;
             for (i, line) in buffer.lines().enumerate() {
-                let line = safe_unwrap!(line);
+                let line = crash_if_err!(1, line);
                 let (ck_filename, sum, binary_check) = match gnu_re.captures(&line) {
                     Some(caps) => (
                         caps.name("fileName").unwrap().as_str(),
@@ -507,7 +526,7 @@ where
                             if options.warn {
                                 show_warning!(
                                     "{}: {}: improperly formatted {} checksum line",
-                                    filename.display(),
+                                    filename.maybe_quote(),
                                     i + 1,
                                     options.algoname
                                 );
@@ -516,15 +535,27 @@ where
                         }
                     },
                 };
-                let f = safe_unwrap!(File::open(ck_filename));
+                let f = crash_if_err!(1, File::open(ck_filename));
                 let mut ckf = BufReader::new(Box::new(f) as Box<dyn Read>);
-                let real_sum = safe_unwrap!(digest_reader(
-                    &mut *options.digest,
-                    &mut ckf,
-                    binary_check,
-                    options.output_bits
-                ))
+                let real_sum = crash_if_err!(
+                    1,
+                    digest_reader(
+                        &mut options.digest,
+                        &mut ckf,
+                        binary_check,
+                        options.output_bits
+                    )
+                )
                 .to_ascii_lowercase();
+                // FIXME: Filenames with newlines should be treated specially.
+                // GNU appears to replace newlines by \n and backslashes by
+                // \\ and prepend a backslash (to the hash or filename) if it did
+                // this escaping.
+                // Different sorts of output (checking vs outputting hashes) may
+                // handle this differently. Compare carefully to GNU.
+                // If you can, try to preserve invalid unicode using OsStr(ing)Ext
+                // and display it using uucore::display::print_verbatim(). This is
+                // easier (and more important) on Unix than on Windows.
                 if sum == real_sum {
                     if !options.quiet {
                         println!("{}: OK", ck_filename);
@@ -537,12 +568,15 @@ where
                 }
             }
         } else {
-            let sum = safe_unwrap!(digest_reader(
-                &mut *options.digest,
-                &mut file,
-                options.binary,
-                options.output_bits
-            ));
+            let sum = crash_if_err!(
+                1,
+                digest_reader(
+                    &mut options.digest,
+                    &mut file,
+                    options.binary,
+                    options.output_bits
+                )
+            );
             if options.tag {
                 println!("{} ({}) = {}", options.algoname, filename.display(), sum);
             } else {
@@ -564,55 +598,29 @@ where
     Ok(())
 }
 
-fn digest_reader<'a, T: Read>(
-    digest: &mut (dyn Digest + 'a),
+fn digest_reader<T: Read>(
+    digest: &mut Box<dyn Digest>,
     reader: &mut BufReader<T>,
     binary: bool,
     output_bits: usize,
 ) -> io::Result<String> {
     digest.reset();
 
-    // Digest file, do not hold too much in memory at any given moment
-    let windows = cfg!(windows);
-    let mut buffer = Vec::with_capacity(524_288);
-    let mut vec = Vec::with_capacity(524_288);
-    let mut looking_for_newline = false;
-    loop {
-        match reader.read_to_end(&mut buffer) {
-            Ok(0) => {
-                break;
-            }
-            Ok(nread) => {
-                if windows && !binary {
-                    // Windows text mode returns '\n' when reading '\r\n'
-                    for &b in buffer.iter().take(nread) {
-                        if looking_for_newline {
-                            if b != b'\n' {
-                                vec.push(b'\r');
-                            }
-                            if b != b'\r' {
-                                vec.push(b);
-                                looking_for_newline = false;
-                            }
-                        } else if b != b'\r' {
-                            vec.push(b);
-                        } else {
-                            looking_for_newline = true;
-                        }
-                    }
-                    digest.input(&vec);
-                    vec.clear();
-                } else {
-                    digest.input(&buffer[..nread]);
-                }
-            }
-            Err(e) => return Err(e),
-        }
-    }
-    if windows && looking_for_newline {
-        vec.push(b'\r');
-        digest.input(&vec);
-    }
+    // Read bytes from `reader` and write those bytes to `digest`.
+    //
+    // If `binary` is `false` and the operating system is Windows, then
+    // `DigestWriter` replaces "\r\n" with "\n" before it writes the
+    // bytes into `digest`. Otherwise, it just inserts the bytes as-is.
+    //
+    // In order to support replacing "\r\n", we must call `finalize()`
+    // in order to support the possibility that the last character read
+    // from the reader was "\r". (This character gets buffered by
+    // `DigestWriter` and only written if the following character is
+    // "\n". But when "\r" is the last character read, we need to force
+    // it to be written.)
+    let mut digest_writer = DigestWriter::new(digest, binary);
+    std::io::copy(reader, &mut digest_writer)?;
+    digest_writer.finalize();
 
     if digest.output_bits() > 0 {
         Ok(digest.result_str())
diff --git a/src/uu/head/BENCHMARKING.md b/src/uu/head/BENCHMARKING.md
new file mode 100644
index 000000000..49574eb79
--- /dev/null
+++ b/src/uu/head/BENCHMARKING.md
@@ -0,0 +1,41 @@
+# Benchmarking to measure performance
+
+To compare the performance of the `uutils` version of `head` with the
+GNU version of `head`, you can use a benchmarking tool like
+[hyperfine][0]. On Ubuntu 18.04 or later, you can install `hyperfine` by
+running
+
+    sudo apt-get install hyperfine
+
+Next, build the `head` binary under the release profile:
+
+    cargo build --release -p uu_head
+
+Now, get a text file to test `head` on. I used the *Complete Works of
+William Shakespeare*, which is in the public domain in the United States
+and most other parts of the world.
+
+    wget -O shakespeare.txt https://www.gutenberg.org/files/100/100-0.txt
+
+This particular file has about 170,000 lines, each of which is no longer
+than 96 characters:
+
+    $ wc -lL shakespeare.txt 
+    170592      96 shakespeare.txt
+
+You could use files of different shapes and sizes to test the
+performance of `head` in different situations. For a larger file, you
+could download a [database dump of Wikidata][1] or some related files
+that the Wikimedia project provides. For example, [this file][2]
+contains about 130 million lines.
+
+Finally, you can compare the performance of the two versions of `head`
+by running, for example,
+
+    hyperfine \
+        "head -n 100000 shakespeare.txt" \
+        "target/release/head -n 100000 shakespeare.txt"
+
+[0]: https://github.com/sharkdp/hyperfine
+[1]: https://www.wikidata.org/wiki/Wikidata:Database_download
+[2]: https://dumps.wikimedia.org/wikidatawiki/20211001/wikidatawiki-20211001-pages-logging.xml.gz
diff --git a/src/uu/head/Cargo.toml b/src/uu/head/Cargo.toml
index 1019ac74f..aa32a899a 100644
--- a/src/uu/head/Cargo.toml
+++ b/src/uu/head/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_head"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "head ~ (uutils) display the first lines of input"
@@ -16,9 +16,14 @@ path = "src/head.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["ringbuffer"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+memchr = "2"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["ringbuffer"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "head"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs
index e17e17034..e3325d084 100644
--- a/src/uu/head/src/head.rs
+++ b/src/uu/head/src/head.rs
@@ -3,22 +3,24 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-// spell-checker:ignore (vars) zlines
+// spell-checker:ignore (vars) zlines BUFWRITER
 
 use clap::{crate_version, App, Arg};
 use std::convert::TryFrom;
 use std::ffi::OsString;
-use std::io::{self, ErrorKind, Read, Seek, SeekFrom, Write};
-use uucore::{crash, executable, show_error, show_error_custom_description};
+use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write};
+use uucore::display::Quotable;
+use uucore::error::{UResult, USimpleError};
+use uucore::show_error_custom_description;
 
-const EXIT_FAILURE: i32 = 1;
-const EXIT_SUCCESS: i32 = 0;
 const BUF_SIZE: usize = 65536;
 
+/// The capacity in bytes for buffered writers.
+const BUFWRITER_CAPACITY: usize = 16_384; // 16 kilobytes
+
 const ABOUT: &str = "\
                      Print the first 10 lines of each FILE to standard output.\n\
                      With more than one FILE, precede each with a header giving the file name.\n\
-                     \n\
                      With no FILE, or when FILE is -, read standard input.\n\
                      \n\
                      Mandatory arguments to long flags are mandatory for short flags too.\
@@ -35,13 +37,13 @@ mod options {
 }
 mod lines;
 mod parse;
-mod split;
 mod take;
 use lines::zlines;
 use take::take_all_but;
+use take::take_lines;
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .usage(USAGE)
@@ -107,6 +109,12 @@ enum Modes {
     Bytes(usize),
 }
 
+impl Default for Modes {
+    fn default() -> Self {
+        Modes::Lines(10)
+    }
+}
+
 fn parse_mode<F>(src: &str, closure: F) -> Result<(Modes, bool), String>
 where
     F: FnOnce(usize) -> Modes,
@@ -127,10 +135,10 @@ fn arg_iterate<'a>(
             match parse::parse_obsolete(s) {
                 Some(Ok(iter)) => Ok(Box::new(vec![first].into_iter().chain(iter).chain(args))),
                 Some(Err(e)) => match e {
-                    parse::ParseError::Syntax => Err(format!("bad argument format: '{}'", s)),
+                    parse::ParseError::Syntax => Err(format!("bad argument format: {}", s.quote())),
                     parse::ParseError::Overflow => Err(format!(
-                        "invalid argument: '{}' Value too large for defined datatype",
-                        s
+                        "invalid argument: {} Value too large for defined datatype",
+                        s.quote()
                     )),
                 },
                 None => Ok(Box::new(vec![first, second].into_iter().chain(args))),
@@ -143,7 +151,7 @@ fn arg_iterate<'a>(
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Default)]
 struct HeadOptions {
     pub quiet: bool,
     pub verbose: bool,
@@ -154,22 +162,11 @@ struct HeadOptions {
 }
 
 impl HeadOptions {
-    pub fn new() -> HeadOptions {
-        HeadOptions {
-            quiet: false,
-            verbose: false,
-            zeroed: false,
-            all_but_last: false,
-            mode: Modes::Lines(10),
-            files: Vec::new(),
-        }
-    }
-
     ///Construct options from matches
     pub fn get_from(args: impl uucore::Args) -> Result<Self, String> {
         let matches = uu_app().get_matches_from(arg_iterate(args)?);
 
-        let mut options = HeadOptions::new();
+        let mut options: HeadOptions = Default::default();
 
         options.quiet = matches.is_present(options::QUIET_NAME);
         options.verbose = matches.is_present(options::VERBOSE_NAME);
@@ -196,12 +193,6 @@ impl HeadOptions {
         Ok(options)
     }
 }
-// to make clippy shut up
-impl Default for HeadOptions {
-    fn default() -> Self {
-        Self::new()
-    }
-}
 
 fn read_n_bytes<R>(input: R, n: usize) -> std::io::Result<()>
 where
@@ -220,26 +211,18 @@ where
 }
 
 fn read_n_lines(input: &mut impl std::io::BufRead, n: usize, zero: bool) -> std::io::Result<()> {
-    if n == 0 {
-        return Ok(());
-    }
+    // Read the first `n` lines from the `input` reader.
+    let separator = if zero { b'\0' } else { b'\n' };
+    let mut reader = take_lines(input, n, separator);
+
+    // Write those bytes to `stdout`.
     let stdout = std::io::stdout();
-    let mut stdout = stdout.lock();
-    let mut lines = 0usize;
-    split::walk_lines(input, zero, |e| match e {
-        split::Event::Data(dat) => {
-            stdout.write_all(dat)?;
-            Ok(true)
-        }
-        split::Event::Line => {
-            lines += 1;
-            if lines == n {
-                Ok(false)
-            } else {
-                Ok(true)
-            }
-        }
-    })
+    let stdout = stdout.lock();
+    let mut writer = BufWriter::with_capacity(BUFWRITER_CAPACITY, stdout);
+
+    io::copy(&mut reader, &mut writer)?;
+
+    Ok(())
 }
 
 fn read_but_last_n_bytes(input: &mut impl std::io::BufRead, n: usize) -> std::io::Result<()> {
@@ -383,7 +366,7 @@ fn head_file(input: &mut std::fs::File, options: &HeadOptions) -> std::io::Resul
     }
 }
 
-fn uu_head(options: &HeadOptions) -> Result<(), u32> {
+fn uu_head(options: &HeadOptions) -> UResult<()> {
     let mut error_count = 0;
     let mut first = true;
     for file in &options.files {
@@ -418,7 +401,7 @@ fn uu_head(options: &HeadOptions) -> Result<(), u32> {
                 let mut file = match std::fs::File::open(name) {
                     Ok(f) => f,
                     Err(err) => {
-                        let prefix = format!("cannot open '{}' for reading", name);
+                        let prefix = format!("cannot open {} for reading", name.quote());
                         match err.kind() {
                             ErrorKind::NotFound => {
                                 show_error_custom_description!(prefix, "No such file or directory");
@@ -456,23 +439,21 @@ fn uu_head(options: &HeadOptions) -> Result<(), u32> {
         first = false;
     }
     if error_count > 0 {
-        Err(error_count)
+        Err(USimpleError::new(1, ""))
     } else {
         Ok(())
     }
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = match HeadOptions::get_from(args) {
         Ok(o) => o,
         Err(s) => {
-            crash!(EXIT_FAILURE, "{}", s);
+            return Err(USimpleError::new(1, s));
         }
     };
-    match uu_head(&args) {
-        Ok(_) => EXIT_SUCCESS,
-        Err(_) => EXIT_FAILURE,
-    }
+    uu_head(&args)
 }
 
 #[cfg(test)]
@@ -483,7 +464,7 @@ mod tests {
     fn options(args: &str) -> Result<HeadOptions, String> {
         let combined = "head ".to_owned() + args;
         let args = combined.split_whitespace();
-        HeadOptions::get_from(args.map(|s| OsString::from(s)))
+        HeadOptions::get_from(args.map(OsString::from))
     }
     #[test]
     fn test_args_modes() {
@@ -523,15 +504,12 @@ mod tests {
     }
     #[test]
     fn test_options_correct_defaults() {
-        let opts = HeadOptions::new();
-        let opts2: HeadOptions = Default::default();
+        let opts: HeadOptions = Default::default();
 
-        assert_eq!(opts, opts2);
-
-        assert!(opts.verbose == false);
-        assert!(opts.quiet == false);
-        assert!(opts.zeroed == false);
-        assert!(opts.all_but_last == false);
+        assert!(!opts.verbose);
+        assert!(!opts.quiet);
+        assert!(!opts.zeroed);
+        assert!(!opts.all_but_last);
         assert_eq!(opts.mode, Modes::Lines(10));
         assert!(opts.files.is_empty());
     }
@@ -552,7 +530,7 @@ mod tests {
         assert!(parse_mode("1T", Modes::Bytes).is_err());
     }
     fn arg_outputs(src: &str) -> Result<String, String> {
-        let split = src.split_whitespace().map(|x| OsString::from(x));
+        let split = src.split_whitespace().map(OsString::from);
         match arg_iterate(split) {
             Ok(args) => {
                 let vec = args
diff --git a/src/uu/head/src/split.rs b/src/uu/head/src/split.rs
deleted file mode 100644
index 9e9a0c685..000000000
--- a/src/uu/head/src/split.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-#[derive(Debug)]
-pub enum Event<'a> {
-    Data(&'a [u8]),
-    Line,
-}
-/// Loops over the lines read from a BufRead.
-/// # Arguments
-/// * `input` the ReadBuf to read from
-/// * `zero` whether to use 0u8 as a line delimiter
-/// * `on_event` a closure receiving some bytes read in a slice, or
-///     event signalling a line was just read.
-///     this is guaranteed to be signalled *directly* after the
-///     slice containing the (CR on win)LF / 0 is passed
-///
-///     Return whether to continue
-pub fn walk_lines<F>(
-    input: &mut impl std::io::BufRead,
-    zero: bool,
-    mut on_event: F,
-) -> std::io::Result<()>
-where
-    F: FnMut(Event) -> std::io::Result<bool>,
-{
-    let mut buffer = [0u8; super::BUF_SIZE];
-    loop {
-        let read = loop {
-            match input.read(&mut buffer) {
-                Ok(n) => break n,
-                Err(e) => match e.kind() {
-                    std::io::ErrorKind::Interrupted => {}
-                    _ => return Err(e),
-                },
-            }
-        };
-        if read == 0 {
-            return Ok(());
-        }
-        let mut base = 0usize;
-        for (i, byte) in buffer[..read].iter().enumerate() {
-            match byte {
-                b'\n' if !zero => {
-                    on_event(Event::Data(&buffer[base..=i]))?;
-                    base = i + 1;
-                    if !on_event(Event::Line)? {
-                        return Ok(());
-                    }
-                }
-                0u8 if zero => {
-                    on_event(Event::Data(&buffer[base..=i]))?;
-                    base = i + 1;
-                    if !on_event(Event::Line)? {
-                        return Ok(());
-                    }
-                }
-                _ => {}
-            }
-        }
-        on_event(Event::Data(&buffer[base..read]))?;
-    }
-}
diff --git a/src/uu/head/src/take.rs b/src/uu/head/src/take.rs
index 94fa012be..5f4c29b65 100644
--- a/src/uu/head/src/take.rs
+++ b/src/uu/head/src/take.rs
@@ -1,4 +1,8 @@
 //! Take all but the last elements of an iterator.
+use std::io::Read;
+
+use memchr::memchr_iter;
+
 use uucore::ringbuffer::RingBuffer;
 
 /// Create an iterator over all but the last `n` elements of `iter`.
@@ -58,10 +62,63 @@ where
     }
 }
 
+/// Like `std::io::Take`, but for lines instead of bytes.
+///
+/// This struct is generally created by calling [`take_lines`] on a
+/// reader. Please see the documentation of [`take`] for more
+/// details.
+pub struct TakeLines<T> {
+    inner: T,
+    limit: usize,
+    separator: u8,
+}
+
+impl<T: Read> Read for TakeLines<T> {
+    /// Read bytes from a buffer up to the requested number of lines.
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        if self.limit == 0 {
+            return Ok(0);
+        }
+        match self.inner.read(buf) {
+            Ok(0) => Ok(0),
+            Ok(n) => {
+                for i in memchr_iter(self.separator, &buf[..n]) {
+                    self.limit -= 1;
+                    if self.limit == 0 {
+                        return Ok(i + 1);
+                    }
+                }
+                Ok(n)
+            }
+            Err(e) => Err(e),
+        }
+    }
+}
+
+/// Create an adaptor that will read at most `limit` lines from a given reader.
+///
+/// This function returns a new instance of `Read` that will read at
+/// most `limit` lines, after which it will always return EOF
+/// (`Ok(0)`).
+///
+/// The `separator` defines the character to interpret as the line
+/// ending. For the usual notion of "line", set this to `b'\n'`.
+pub fn take_lines<R>(reader: R, limit: usize, separator: u8) -> TakeLines<R> {
+    TakeLines {
+        inner: reader,
+        limit,
+        separator,
+    }
+}
+
 #[cfg(test)]
 mod tests {
 
+    use std::io::BufRead;
+    use std::io::BufReader;
+
     use crate::take::take_all_but;
+    use crate::take::take_lines;
 
     #[test]
     fn test_fewer_elements() {
@@ -90,4 +147,33 @@ mod tests {
         assert_eq!(Some(&2), iter.next());
         assert_eq!(None, iter.next());
     }
+
+    #[test]
+    fn test_zero_lines() {
+        let input_reader = std::io::Cursor::new("a\nb\nc\n");
+        let output_reader = BufReader::new(take_lines(input_reader, 0, b'\n'));
+        let mut iter = output_reader.lines().map(|l| l.unwrap());
+        assert_eq!(None, iter.next());
+    }
+
+    #[test]
+    fn test_fewer_lines() {
+        let input_reader = std::io::Cursor::new("a\nb\nc\n");
+        let output_reader = BufReader::new(take_lines(input_reader, 2, b'\n'));
+        let mut iter = output_reader.lines().map(|l| l.unwrap());
+        assert_eq!(Some(String::from("a")), iter.next());
+        assert_eq!(Some(String::from("b")), iter.next());
+        assert_eq!(None, iter.next());
+    }
+
+    #[test]
+    fn test_more_lines() {
+        let input_reader = std::io::Cursor::new("a\nb\nc\n");
+        let output_reader = BufReader::new(take_lines(input_reader, 4, b'\n'));
+        let mut iter = output_reader.lines().map(|l| l.unwrap());
+        assert_eq!(Some(String::from("a")), iter.next());
+        assert_eq!(Some(String::from("b")), iter.next());
+        assert_eq!(Some(String::from("c")), iter.next());
+        assert_eq!(None, iter.next());
+    }
 }
diff --git a/src/uu/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml
index 45ced472f..c56649742 100644
--- a/src/uu/hostid/Cargo.toml
+++ b/src/uu/hostid/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_hostid"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "hostid ~ (uutils) display the numeric identifier of the current host"
@@ -17,8 +17,8 @@ path = "src/hostid.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "hostid"
diff --git a/src/uu/hostid/src/hostid.rs b/src/uu/hostid/src/hostid.rs
index b0f68968d..309e15990 100644
--- a/src/uu/hostid/src/hostid.rs
+++ b/src/uu/hostid/src/hostid.rs
@@ -7,9 +7,6 @@
 
 // spell-checker:ignore (ToDO) gethostid
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App};
 use libc::c_long;
 use uucore::error::UResult;
@@ -29,7 +26,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .usage(SYNTAX)
 }
diff --git a/src/uu/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml
index afd402f24..daaeb48f7 100644
--- a/src/uu/hostname/Cargo.toml
+++ b/src/uu/hostname/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_hostname"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "hostname ~ (uutils) display or set the host name of the current host"
@@ -18,8 +18,8 @@ path = "src/hostname.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 hostname = { version = "0.3", features = ["set"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["wide"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["wide"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 winapi = { version="0.3", features=["sysinfoapi", "winsock2"] }
 
 [[bin]]
diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs
index 045e43045..9c8504027 100644
--- a/src/uu/hostname/src/hostname.rs
+++ b/src/uu/hostname/src/hostname.rs
@@ -7,21 +7,13 @@
 
 // spell-checker:ignore (ToDO) MAKEWORD addrs hashset
 
-#[macro_use]
-extern crate uucore;
-
-use clap::{crate_version, App, Arg, ArgMatches};
 use std::collections::hash_set::HashSet;
 use std::net::ToSocketAddrs;
 use std::str;
-#[cfg(windows)]
-use uucore::error::UUsageError;
-use uucore::error::{UResult, USimpleError};
 
-#[cfg(windows)]
-use winapi::shared::minwindef::MAKEWORD;
-#[cfg(windows)]
-use winapi::um::winsock2::{WSACleanup, WSAStartup};
+use clap::{crate_version, App, Arg, ArgMatches};
+
+use uucore::error::{FromIo, UResult};
 
 static ABOUT: &str = "Display or set the system's host name.";
 
@@ -31,113 +23,125 @@ static OPT_FQDN: &str = "fqdn";
 static OPT_SHORT: &str = "short";
 static OPT_HOST: &str = "host";
 
-#[uucore_procs::gen_uumain]
-pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    #![allow(clippy::let_and_return)]
-    #[cfg(windows)]
-    unsafe {
-        #[allow(deprecated)]
-        let mut data = std::mem::uninitialized();
-        if WSAStartup(MAKEWORD(2, 2), &mut data as *mut _) != 0 {
-            return Err(UUsageError::new(
-                1,
-                "Failed to start Winsock 2.2".to_string(),
-            ));
+#[cfg(windows)]
+mod wsa {
+    use std::io;
+
+    use winapi::shared::minwindef::MAKEWORD;
+    use winapi::um::winsock2::{WSACleanup, WSAStartup, WSADATA};
+
+    pub(super) struct WsaHandle(());
+
+    pub(super) fn start() -> io::Result<WsaHandle> {
+        let err = unsafe {
+            let mut data = std::mem::MaybeUninit::<WSADATA>::uninit();
+            WSAStartup(MAKEWORD(2, 2), data.as_mut_ptr())
+        };
+        if err != 0 {
+            Err(io::Error::from_raw_os_error(err))
+        } else {
+            Ok(WsaHandle(()))
         }
     }
-    let result = execute(args);
-    #[cfg(windows)]
-    unsafe {
-        WSACleanup();
-    }
-    result
-}
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [HOSTNAME]", executable!())
-}
-fn execute(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
-    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
-
-    match matches.value_of(OPT_HOST) {
-        None => display_hostname(&matches),
-        Some(host) => {
-            if let Err(err) = hostname::set(host) {
-                return Err(USimpleError::new(1, format!("{}", err)));
-            } else {
-                Ok(())
+    impl Drop for WsaHandle {
+        fn drop(&mut self) {
+            unsafe {
+                // This possibly returns an error but we can't handle it
+                let _err = WSACleanup();
             }
         }
     }
 }
 
+fn usage() -> String {
+    format!("{0} [OPTION]... [HOSTNAME]", uucore::execution_phrase())
+}
+
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
+    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
+
+    #[cfg(windows)]
+    let _handle = wsa::start().map_err_context(|| "failed to start Winsock".to_owned())?;
+
+    match matches.value_of_os(OPT_HOST) {
+        None => display_hostname(&matches),
+        Some(host) => hostname::set(host).map_err_context(|| "failed to set hostname".to_owned()),
+    }
+}
+
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
             Arg::with_name(OPT_DOMAIN)
                 .short("d")
                 .long("domain")
+                .overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
                 .help("Display the name of the DNS domain if possible"),
         )
         .arg(
             Arg::with_name(OPT_IP_ADDRESS)
                 .short("i")
                 .long("ip-address")
+                .overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
                 .help("Display the network address(es) of the host"),
         )
-        // TODO: support --long
         .arg(
             Arg::with_name(OPT_FQDN)
                 .short("f")
                 .long("fqdn")
+                .overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
                 .help("Display the FQDN (Fully Qualified Domain Name) (default)"),
         )
-        .arg(Arg::with_name(OPT_SHORT).short("s").long("short").help(
-            "Display the short hostname (the portion before the first dot) if \
-             possible",
-        ))
+        .arg(
+            Arg::with_name(OPT_SHORT)
+                .short("s")
+                .long("short")
+                .overrides_with_all(&[OPT_DOMAIN, OPT_IP_ADDRESS, OPT_FQDN, OPT_SHORT])
+                .help("Display the short hostname (the portion before the first dot) if possible"),
+        )
         .arg(Arg::with_name(OPT_HOST))
 }
 
 fn display_hostname(matches: &ArgMatches) -> UResult<()> {
-    let hostname = hostname::get().unwrap().into_string().unwrap();
+    let hostname = hostname::get()
+        .map_err_context(|| "failed to get hostname".to_owned())?
+        .to_string_lossy()
+        .into_owned();
 
     if matches.is_present(OPT_IP_ADDRESS) {
         // XXX: to_socket_addrs needs hostname:port so append a dummy port and remove it later.
         // This was originally supposed to use std::net::lookup_host, but that seems to be
         // deprecated.  Perhaps we should use the dns-lookup crate?
         let hostname = hostname + ":1";
-        match hostname.to_socket_addrs() {
-            Ok(addresses) => {
-                let mut hashset = HashSet::new();
-                let mut output = String::new();
-                for addr in addresses {
-                    // XXX: not sure why this is necessary...
-                    if !hashset.contains(&addr) {
-                        let mut ip = format!("{}", addr);
-                        if ip.ends_with(":1") {
-                            let len = ip.len();
-                            ip.truncate(len - 2);
-                        }
-                        output.push_str(&ip);
-                        output.push(' ');
-                        hashset.insert(addr);
-                    }
+        let addresses = hostname
+            .to_socket_addrs()
+            .map_err_context(|| "failed to resolve socket addresses".to_owned())?;
+        let mut hashset = HashSet::new();
+        let mut output = String::new();
+        for addr in addresses {
+            // XXX: not sure why this is necessary...
+            if !hashset.contains(&addr) {
+                let mut ip = addr.to_string();
+                if ip.ends_with(":1") {
+                    let len = ip.len();
+                    ip.truncate(len - 2);
                 }
-                let len = output.len();
-                if len > 0 {
-                    println!("{}", &output[0..len - 1]);
-                }
-
-                Ok(())
-            }
-            Err(f) => {
-                return Err(USimpleError::new(1, format!("{}", f)));
+                output.push_str(&ip);
+                output.push(' ');
+                hashset.insert(addr);
             }
         }
+        let len = output.len();
+        if len > 0 {
+            println!("{}", &output[0..len - 1]);
+        }
+
+        Ok(())
     } else {
         if matches.is_present(OPT_SHORT) || matches.is_present(OPT_DOMAIN) {
             let mut it = hostname.char_indices().filter(|&ci| ci.1 == '.');
diff --git a/src/uu/id/Cargo.toml b/src/uu/id/Cargo.toml
index 367fb553c..0039cfc8e 100644
--- a/src/uu/id/Cargo.toml
+++ b/src/uu/id/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_id"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "id ~ (uutils) display user and group information for USER"
@@ -16,9 +16,13 @@ path = "src/id.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "process"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "process"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+selinux = { version="0.2.1", optional = true }
 
 [[bin]]
 name = "id"
 path = "src/main.rs"
+
+[features]
+feat_selinux = ["selinux"]
diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs
index d5acc97f3..1229b577e 100644
--- a/src/uu/id/src/id.rs
+++ b/src/uu/id/src/id.rs
@@ -5,7 +5,10 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
+
+// spell-checker:ignore (ToDO) asid auditid auditinfo auid cstr egid emod euid getaudit getlogin gflag nflag pline rflag termid uflag gsflag zflag cflag
+
+// README:
 // This was originally based on BSD's `id`
 // (noticeable in functionality, usage text, options text, etc.)
 // and synced with:
@@ -25,8 +28,10 @@
 //
 // * Help text based on BSD's `id` manpage and GNU's `id` manpage.
 //
-
-// spell-checker:ignore (ToDO) asid auditid auditinfo auid cstr egid emod euid getaudit getlogin gflag nflag pline rflag termid uflag gsflag zflag
+// * This passes GNU's coreutils Test suite (8.32) for "tests/id/context.sh" if compiled with
+//   `--features feat_selinux`. It should also pass "tests/id/no-context.sh", but that depends on
+//   `uu_ls -Z` being implemented and therefore fails at the moment
+//
 
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
@@ -36,7 +41,10 @@ extern crate uucore;
 
 use clap::{crate_version, App, Arg};
 use std::ffi::CStr;
+use uucore::display::Quotable;
 use uucore::entries::{self, Group, Locate, Passwd};
+use uucore::error::UResult;
+use uucore::error::{set_exit_code, USimpleError};
 pub use uucore::libc;
 use uucore::libc::{getlogin, uid_t};
 use uucore::process::{getegid, geteuid, getgid, getuid};
@@ -50,6 +58,11 @@ macro_rules! cstr2cow {
 static ABOUT: &str = "Print user and group information for each specified USER,
 or (when USER omitted) for the current user.";
 
+#[cfg(not(feature = "selinux"))]
+static CONTEXT_HELP_TEXT: &str = "print only the security context of the process (not enabled)";
+#[cfg(feature = "selinux")]
+static CONTEXT_HELP_TEXT: &str = "print only the security context of the process";
+
 mod options {
     pub const OPT_AUDIT: &str = "audit"; // GNU's id does not have this
     pub const OPT_CONTEXT: &str = "context";
@@ -64,8 +77,8 @@ mod options {
     pub const ARG_USERS: &str = "USER";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [USER]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [USER]...", uucore::execution_phrase())
 }
 
 fn get_description() -> String {
@@ -93,6 +106,8 @@ struct State {
     gsflag: bool, // --groups
     rflag: bool,  // --real
     zflag: bool,  // --zero
+    cflag: bool,  // --context
+    selinux_supported: bool,
     ids: Option<Ids>,
     // The behavior for calling GNU's `id` and calling GNU's `id $USER` is similar but different.
     // * The SELinux context is only displayed without a specified user.
@@ -111,8 +126,9 @@ struct State {
     user_specified: bool,
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let after_help = get_description();
 
     let matches = uu_app()
@@ -132,6 +148,18 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         gsflag: matches.is_present(options::OPT_GROUPS),
         rflag: matches.is_present(options::OPT_REAL_ID),
         zflag: matches.is_present(options::OPT_ZERO),
+        cflag: matches.is_present(options::OPT_CONTEXT),
+
+        selinux_supported: {
+            #[cfg(feature = "selinux")]
+            {
+                selinux::kernel_support() != selinux::KernelSupport::Unsupported
+            }
+            #[cfg(not(feature = "selinux"))]
+            {
+                false
+            }
+        },
         user_specified: !users.is_empty(),
         ids: None,
     };
@@ -141,12 +169,24 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         !(state.uflag || state.gflag || state.gsflag)
     };
 
-    if (state.nflag || state.rflag) && default_format {
-        crash!(1, "cannot print only names or real IDs in default format");
+    if (state.nflag || state.rflag) && default_format && !state.cflag {
+        return Err(USimpleError::new(
+            1,
+            "cannot print only names or real IDs in default format",
+        ));
     }
-    if (state.zflag) && default_format {
+    if state.zflag && default_format && !state.cflag {
         // NOTE: GNU test suite "id/zero.sh" needs this stderr output:
-        crash!(1, "option --zero not permitted in default format");
+        return Err(USimpleError::new(
+            1,
+            "option --zero not permitted in default format",
+        ));
+    }
+    if state.user_specified && state.cflag {
+        return Err(USimpleError::new(
+            1,
+            "cannot print security context when user specified",
+        ));
     }
 
     let delimiter = {
@@ -163,7 +203,26 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             '\n'
         }
     };
-    let mut exit_code = 0;
+
+    if state.cflag {
+        if state.selinux_supported {
+            // print SElinux context and exit
+            #[cfg(all(target_os = "linux", feature = "selinux"))]
+            if let Ok(context) = selinux::SecurityContext::current(false) {
+                let bytes = context.as_bytes();
+                print!("{}{}", String::from_utf8_lossy(bytes), line_ending);
+            } else {
+                // print error because `cflag` was explicitly requested
+                return Err(USimpleError::new(1, "can't get process context"));
+            }
+            return Ok(());
+        } else {
+            return Err(USimpleError::new(
+                1,
+                "--context (-Z) works only on an SELinux-enabled kernel",
+            ));
+        }
+    }
 
     for i in 0..=users.len() {
         let possible_pw = if !state.user_specified {
@@ -172,8 +231,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             match Passwd::locate(users[i].as_str()) {
                 Ok(p) => Some(p),
                 Err(_) => {
-                    show_error!("'{}': no such user", users[i]);
-                    exit_code = 1;
+                    show_error!("{}: no such user", users[i].quote());
+                    set_exit_code(1);
                     if i + 1 >= users.len() {
                         break;
                     } else {
@@ -187,17 +246,17 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         if matches.is_present(options::OPT_PASSWORD) {
             // BSD's `id` ignores all but the first specified user
             pline(possible_pw.map(|v| v.uid()));
-            return exit_code;
+            return Ok(());
         };
         if matches.is_present(options::OPT_HUMAN_READABLE) {
             // BSD's `id` ignores all but the first specified user
             pretty(possible_pw);
-            return exit_code;
+            return Ok(());
         }
         if matches.is_present(options::OPT_AUDIT) {
             // BSD's `id` ignores specified users
             auditid();
-            return exit_code;
+            return Ok(());
         }
 
         let (uid, gid) = possible_pw.map(|p| (p.uid(), p.gid())).unwrap_or((
@@ -217,7 +276,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 if state.nflag {
                     entries::gid2grp(gid).unwrap_or_else(|_| {
                         show_error!("cannot find name for group ID {}", gid);
-                        exit_code = 1;
+                        set_exit_code(1);
                         gid.to_string()
                     })
                 } else {
@@ -232,7 +291,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 if state.nflag {
                     entries::uid2usr(uid).unwrap_or_else(|_| {
                         show_error!("cannot find name for user ID {}", uid);
-                        exit_code = 1;
+                        set_exit_code(1);
                         uid.to_string()
                     })
                 } else {
@@ -257,7 +316,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                         if state.nflag {
                             entries::gid2grp(id).unwrap_or_else(|_| {
                                 show_error!("cannot find name for group ID {}", id);
-                                exit_code = 1;
+                                set_exit_code(1);
                                 id.to_string()
                             })
                         } else {
@@ -276,7 +335,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         }
 
         if default_format {
-            id_print(&state, groups);
+            id_print(&mut state, groups);
         }
         print!("{}", line_ending);
 
@@ -285,11 +344,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         }
     }
 
-    exit_code
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -319,6 +378,7 @@ pub fn uu_app() -> App<'static, 'static> {
             Arg::with_name(options::OPT_GROUP)
                 .short("g")
                 .long(options::OPT_GROUP)
+                .conflicts_with(options::OPT_EFFECTIVE_USER)
                 .help("Display only the effective group ID as a number"),
         )
         .arg(
@@ -328,6 +388,7 @@ pub fn uu_app() -> App<'static, 'static> {
                 .conflicts_with_all(&[
                     options::OPT_GROUP,
                     options::OPT_EFFECTIVE_USER,
+                    options::OPT_CONTEXT,
                     options::OPT_HUMAN_READABLE,
                     options::OPT_PASSWORD,
                     options::OPT_AUDIT,
@@ -379,7 +440,8 @@ pub fn uu_app() -> App<'static, 'static> {
             Arg::with_name(options::OPT_CONTEXT)
                 .short("Z")
                 .long(options::OPT_CONTEXT)
-                .help("NotImplemented: print only the security context of the process"),
+                .conflicts_with_all(&[options::OPT_GROUP, options::OPT_EFFECTIVE_USER])
+                .help(CONTEXT_HELP_TEXT),
         )
         .arg(
             Arg::with_name(options::ARG_USERS)
@@ -499,34 +561,80 @@ fn auditid() {
     println!("asid={}", auditinfo.ai_asid);
 }
 
-fn id_print(state: &State, groups: Vec<u32>) {
+fn id_print(state: &mut State, groups: Vec<u32>) {
     let uid = state.ids.as_ref().unwrap().uid;
     let gid = state.ids.as_ref().unwrap().gid;
     let euid = state.ids.as_ref().unwrap().euid;
     let egid = state.ids.as_ref().unwrap().egid;
 
-    print!("uid={}({})", uid, entries::uid2usr(uid).unwrap());
-    print!(" gid={}({})", gid, entries::gid2grp(gid).unwrap());
+    print!(
+        "uid={}({})",
+        uid,
+        entries::uid2usr(uid).unwrap_or_else(|_| {
+            show_error!("cannot find name for user ID {}", uid);
+            set_exit_code(1);
+            uid.to_string()
+        })
+    );
+    print!(
+        " gid={}({})",
+        gid,
+        entries::gid2grp(gid).unwrap_or_else(|_| {
+            show_error!("cannot find name for group ID {}", gid);
+            set_exit_code(1);
+            gid.to_string()
+        })
+    );
     if !state.user_specified && (euid != uid) {
-        print!(" euid={}({})", euid, entries::uid2usr(euid).unwrap());
+        print!(
+            " euid={}({})",
+            euid,
+            entries::uid2usr(euid).unwrap_or_else(|_| {
+                show_error!("cannot find name for user ID {}", euid);
+                set_exit_code(1);
+                euid.to_string()
+            })
+        );
     }
     if !state.user_specified && (egid != gid) {
-        print!(" egid={}({})", euid, entries::gid2grp(egid).unwrap());
+        print!(
+            " egid={}({})",
+            euid,
+            entries::gid2grp(egid).unwrap_or_else(|_| {
+                show_error!("cannot find name for group ID {}", egid);
+                set_exit_code(1);
+                egid.to_string()
+            })
+        );
     }
     print!(
         " groups={}",
         groups
             .iter()
-            .map(|&gr| format!("{}({})", gr, entries::gid2grp(gr).unwrap()))
+            .map(|&gr| format!(
+                "{}({})",
+                gr,
+                entries::gid2grp(gr).unwrap_or_else(|_| {
+                    show_error!("cannot find name for group ID {}", gr);
+                    set_exit_code(1);
+                    gr.to_string()
+                })
+            ))
             .collect::<Vec<_>>()
             .join(",")
     );
 
-    // NOTE: (SELinux NotImplemented) placeholder:
-    // if !state.user_specified {
-    //     // print SElinux context (does not depend on "-Z")
-    //     print!(" context={}", get_selinux_contexts().join(":"));
-    // }
+    #[cfg(all(target_os = "linux", feature = "selinux"))]
+    if state.selinux_supported
+        && !state.user_specified
+        && std::env::var_os("POSIXLY_CORRECT").is_none()
+    {
+        // print SElinux context (does not depend on "-Z")
+        if let Ok(context) = selinux::SecurityContext::current(false) {
+            let bytes = context.as_bytes();
+            print!(" context={}", String::from_utf8_lossy(bytes));
+        }
+    }
 }
 
 #[cfg(not(target_os = "linux"))]
diff --git a/src/uu/install/Cargo.toml b/src/uu/install/Cargo.toml
index d930b2fbd..0ae11b3c4 100644
--- a/src/uu/install/Cargo.toml
+++ b/src/uu/install/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_install"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
     "Ben Eills <ben@beneills.com>",
     "uutils developers",
@@ -22,8 +22,8 @@ clap = { version = "2.33", features = ["wrap_help"] }
 filetime = "0.2"
 file_diff = "1.0.0"
 libc = ">= 0.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["mode", "perms", "entries"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs", "mode", "perms", "entries"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [dev-dependencies]
 time = "0.1.40"
diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs
index 81d44bb6c..a93add322 100644
--- a/src/uu/install/src/install.rs
+++ b/src/uu/install/src/install.rs
@@ -5,7 +5,7 @@
 //  * For the full copyright and license information, please view the LICENSE file
 //  * that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) rwxr sourcepath targetpath
+// spell-checker:ignore (ToDO) rwxr sourcepath targetpath Isnt uioerror
 
 mod mode;
 
@@ -16,16 +16,20 @@ use clap::{crate_version, App, Arg, ArgMatches};
 use file_diff::diff;
 use filetime::{set_file_times, FileTime};
 use uucore::backup_control::{self, BackupMode};
+use uucore::display::Quotable;
 use uucore::entries::{grp2gid, usr2uid};
-use uucore::perms::{wrap_chgrp, wrap_chown, Verbosity};
+use uucore::error::{FromIo, UError, UIoError, UResult};
+use uucore::mode::get_umask;
+use uucore::perms::{wrap_chown, Verbosity, VerbosityLevel};
 
 use libc::{getegid, geteuid};
+use std::error::Error;
+use std::fmt::{Debug, Display};
 use std::fs;
 use std::fs::File;
 use std::os::unix::fs::MetadataExt;
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use std::result::Result;
 
 const DEFAULT_MODE: u32 = 0o755;
 const DEFAULT_STRIP_PROGRAM: &str = "strip";
@@ -47,6 +51,79 @@ pub struct Behavior {
     target_dir: Option<String>,
 }
 
+#[derive(Debug)]
+enum InstallError {
+    Unimplemented(String),
+    DirNeedsArg(),
+    CreateDirFailed(PathBuf, std::io::Error),
+    ChmodFailed(PathBuf),
+    InvalidTarget(PathBuf),
+    TargetDirIsntDir(PathBuf),
+    BackupFailed(PathBuf, PathBuf, std::io::Error),
+    InstallFailed(PathBuf, PathBuf, std::io::Error),
+    StripProgramFailed(String),
+    MetadataFailed(std::io::Error),
+    NoSuchUser(String),
+    NoSuchGroup(String),
+    OmittingDirectory(PathBuf),
+}
+
+impl UError for InstallError {
+    fn code(&self) -> i32 {
+        match self {
+            InstallError::Unimplemented(_) => 2,
+            _ => 1,
+        }
+    }
+
+    fn usage(&self) -> bool {
+        false
+    }
+}
+
+impl Error for InstallError {}
+
+impl Display for InstallError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use InstallError as IE;
+        match self {
+            IE::Unimplemented(opt) => write!(f, "Unimplemented feature: {}", opt),
+            IE::DirNeedsArg() => {
+                write!(
+                    f,
+                    "{} with -d requires at least one argument.",
+                    uucore::util_name()
+                )
+            }
+            IE::CreateDirFailed(dir, e) => {
+                Display::fmt(&uio_error!(e, "failed to create {}", dir.quote()), f)
+            }
+            IE::ChmodFailed(file) => write!(f, "failed to chmod {}", file.quote()),
+            IE::InvalidTarget(target) => write!(
+                f,
+                "invalid target {}: No such file or directory",
+                target.quote()
+            ),
+            IE::TargetDirIsntDir(target) => {
+                write!(f, "target {} is not a directory", target.quote())
+            }
+            IE::BackupFailed(from, to, e) => Display::fmt(
+                &uio_error!(e, "cannot backup {} to {}", from.quote(), to.quote()),
+                f,
+            ),
+            IE::InstallFailed(from, to, e) => Display::fmt(
+                &uio_error!(e, "cannot install {} to {}", from.quote(), to.quote()),
+                f,
+            ),
+            IE::StripProgramFailed(msg) => write!(f, "strip program failed: {}", msg),
+            IE::MetadataFailed(e) => Display::fmt(&uio_error!(e, ""), f),
+            IE::NoSuchUser(user) => write!(f, "no such user: {}", user.maybe_quote()),
+            IE::NoSuchGroup(group) => write!(f, "no such group: {}", group.maybe_quote()),
+            IE::OmittingDirectory(dir) => write!(f, "omitting directory {}", dir.quote()),
+        }
+    }
+}
+
 #[derive(Clone, Eq, PartialEq)]
 pub enum MainFunction {
     /// Create directories
@@ -69,8 +146,6 @@ static ABOUT: &str = "Copy SOURCE to DEST or multiple SOURCE(s) to the existing
  DIRECTORY, while setting permission modes and owner/group";
 
 static OPT_COMPARE: &str = "compare";
-static OPT_BACKUP: &str = "backup";
-static OPT_BACKUP_NO_ARG: &str = "backup2";
 static OPT_DIRECTORY: &str = "directory";
 static OPT_IGNORED: &str = "ignored";
 static OPT_CREATE_LEADING: &str = "create-leading";
@@ -80,7 +155,6 @@ static OPT_OWNER: &str = "owner";
 static OPT_PRESERVE_TIMESTAMPS: &str = "preserve-timestamps";
 static OPT_STRIP: &str = "strip";
 static OPT_STRIP_PROGRAM: &str = "strip-program";
-static OPT_SUFFIX: &str = "suffix";
 static OPT_TARGET_DIRECTORY: &str = "target-directory";
 static OPT_NO_TARGET_DIRECTORY: &str = "no-target-directory";
 static OPT_VERBOSE: &str = "verbose";
@@ -89,16 +163,17 @@ static OPT_CONTEXT: &str = "context";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 /// Main install utility function, called from main.rs.
 ///
 /// Returns a program return code.
 ///
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -107,17 +182,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .map(|v| v.map(ToString::to_string).collect())
         .unwrap_or_default();
 
-    if let Err(s) = check_unimplemented(&matches) {
-        show_error!("Unimplemented feature: {}", s);
-        return 2;
-    }
+    check_unimplemented(&matches)?;
 
-    let behavior = match behavior(&matches) {
-        Ok(x) => x,
-        Err(ret) => {
-            return ret;
-        }
-    };
+    let behavior = behavior(&matches)?;
 
     match behavior.main_function {
         MainFunction::Directory => directory(paths, behavior),
@@ -126,23 +193,14 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
-                Arg::with_name(OPT_BACKUP)
-                .long(OPT_BACKUP)
-                .help("make a backup of each existing destination file")
-                .takes_value(true)
-                .require_equals(true)
-                .min_values(0)
-                .value_name("CONTROL")
+            backup_control::arguments::backup()
         )
         .arg(
-            // TODO implement flag
-            Arg::with_name(OPT_BACKUP_NO_ARG)
-            .short("b")
-            .help("like --backup but does not accept an argument")
+            backup_control::arguments::backup_no_args()
         )
         .arg(
             Arg::with_name(OPT_IGNORED)
@@ -200,9 +258,9 @@ pub fn uu_app() -> App<'static, 'static> {
         )
         .arg(
             Arg::with_name(OPT_STRIP)
-            .short("s")
-            .long(OPT_STRIP)
-            .help("strip symbol tables (no action Windows)")
+                .short("s")
+                .long(OPT_STRIP)
+                .help("strip symbol tables (no action Windows)")
         )
         .arg(
             Arg::with_name(OPT_STRIP_PROGRAM)
@@ -211,14 +269,7 @@ pub fn uu_app() -> App<'static, 'static> {
                 .value_name("PROGRAM")
         )
         .arg(
-            // TODO implement flag
-            Arg::with_name(OPT_SUFFIX)
-                .short("S")
-                .long(OPT_SUFFIX)
-                .help("override the usual backup suffix")
-                .value_name("SUFFIX")
-                .takes_value(true)
-                .min_values(1)
+            backup_control::arguments::suffix()
         )
         .arg(
             // TODO implement flag
@@ -269,13 +320,13 @@ pub fn uu_app() -> App<'static, 'static> {
 /// Error datum is a string of the unimplemented argument.
 ///
 ///
-fn check_unimplemented<'a>(matches: &ArgMatches) -> Result<(), &'a str> {
+fn check_unimplemented(matches: &ArgMatches) -> UResult<()> {
     if matches.is_present(OPT_NO_TARGET_DIRECTORY) {
-        Err("--no-target-directory, -T")
+        Err(InstallError::Unimplemented(String::from("--no-target-directory, -T")).into())
     } else if matches.is_present(OPT_PRESERVE_CONTEXT) {
-        Err("--preserve-context, -P")
+        Err(InstallError::Unimplemented(String::from("--preserve-context, -P")).into())
     } else if matches.is_present(OPT_CONTEXT) {
-        Err("--context, -Z")
+        Err(InstallError::Unimplemented(String::from("--context, -Z")).into())
     } else {
         Ok(())
     }
@@ -289,7 +340,7 @@ fn check_unimplemented<'a>(matches: &ArgMatches) -> Result<(), &'a str> {
 ///
 /// In event of failure, returns an integer intended as a program return code.
 ///
-fn behavior(matches: &ArgMatches) -> Result<Behavior, i32> {
+fn behavior(matches: &ArgMatches) -> UResult<Behavior> {
     let main_function = if matches.is_present(OPT_DIRECTORY) {
         MainFunction::Directory
     } else {
@@ -300,7 +351,7 @@ fn behavior(matches: &ArgMatches) -> Result<Behavior, i32> {
 
     let specified_mode: Option<u32> = if matches.is_present(OPT_MODE) {
         let x = matches.value_of(OPT_MODE).ok_or(1)?;
-        Some(mode::parse(x, considering_dir).map_err(|err| {
+        Some(mode::parse(x, considering_dir, get_umask()).map_err(|err| {
             show_error!("Invalid mode string: {}", err);
             1
         })?)
@@ -308,26 +359,14 @@ fn behavior(matches: &ArgMatches) -> Result<Behavior, i32> {
         None
     };
 
-    let backup_mode = backup_control::determine_backup_mode(
-        matches.is_present(OPT_BACKUP_NO_ARG),
-        matches.is_present(OPT_BACKUP),
-        matches.value_of(OPT_BACKUP),
-    );
-    let backup_mode = match backup_mode {
-        Err(err) => {
-            show_usage_error!("{}", err);
-            return Err(1);
-        }
-        Ok(mode) => mode,
-    };
-
+    let backup_mode = backup_control::determine_backup_mode(matches)?;
     let target_dir = matches.value_of(OPT_TARGET_DIRECTORY).map(|d| d.to_owned());
 
     Ok(Behavior {
         main_function,
         specified_mode,
         backup_mode,
-        suffix: backup_control::determine_backup_suffix(matches.value_of(OPT_SUFFIX)),
+        suffix: backup_control::determine_backup_suffix(matches),
         owner: matches.value_of(OPT_OWNER).unwrap_or("").to_string(),
         group: matches.value_of(OPT_GROUP).unwrap_or("").to_string(),
         verbose: matches.is_present(OPT_VERBOSE),
@@ -349,45 +388,46 @@ fn behavior(matches: &ArgMatches) -> Result<Behavior, i32> {
 /// GNU man pages describe this functionality as creating 'all components of
 /// the specified directories'.
 ///
-/// Returns an integer intended as a program return code.
+/// Returns a Result type with the Err variant containing the error message.
 ///
-fn directory(paths: Vec<String>, b: Behavior) -> i32 {
+fn directory(paths: Vec<String>, b: Behavior) -> UResult<()> {
     if paths.is_empty() {
-        println!("{} with -d requires at least one argument.", executable!());
-        1
+        Err(InstallError::DirNeedsArg().into())
     } else {
-        let mut all_successful = true;
-
         for path in paths.iter().map(Path::new) {
             // if the path already exist, don't try to create it again
             if !path.exists() {
-                // Differently than the primary functionality (MainFunction::Standard), the directory
-                // functionality should create all ancestors (or components) of a directory regardless
-                // of the presence of the "-D" flag.
-                // NOTE: the GNU "install" sets the expected mode only for the target directory. All
-                // created ancestor directories will have the default mode. Hence it is safe to use
-                // fs::create_dir_all and then only modify the target's dir mode.
-                if let Err(e) = fs::create_dir_all(path) {
-                    show_error!("{}: {}", path.display(), e);
-                    all_successful = false;
+                // Differently than the primary functionality
+                // (MainFunction::Standard), the directory functionality should
+                // create all ancestors (or components) of a directory
+                // regardless of the presence of the "-D" flag.
+                //
+                // NOTE: the GNU "install" sets the expected mode only for the
+                // target directory. All created ancestor directories will have
+                // the default mode. Hence it is safe to use fs::create_dir_all
+                // and then only modify the target's dir mode.
+                if let Err(e) =
+                    fs::create_dir_all(path).map_err_context(|| path.maybe_quote().to_string())
+                {
+                    show!(e);
                     continue;
                 }
 
                 if b.verbose {
-                    show_error!("creating directory '{}'", path.display());
+                    println!("creating directory {}", path.quote());
                 }
             }
 
             if mode::chmod(path, b.mode()).is_err() {
-                all_successful = false;
+                // Error messages are printed by the mode::chmod function!
+                uucore::error::set_exit_code(1);
                 continue;
             }
         }
-        if all_successful {
-            0
-        } else {
-            1
-        }
+        // If the exit code was set, or show! has been called at least once
+        // (which sets the exit code as well), function execution will end after
+        // this return.
+        Ok(())
     }
 }
 
@@ -396,14 +436,14 @@ fn directory(paths: Vec<String>, b: Behavior) -> i32 {
 fn is_new_file_path(path: &Path) -> bool {
     !path.exists()
         && (path.parent().map(Path::is_dir).unwrap_or(true)
-            || path.parent().unwrap().to_string_lossy().is_empty()) // In case of a simple file
+            || path.parent().unwrap().as_os_str().is_empty()) // In case of a simple file
 }
 
 /// Perform an install, given a list of paths and behavior.
 ///
-/// Returns an integer intended as a program return code.
+/// Returns a Result type with the Err variant containing the error message.
 ///
-fn standard(mut paths: Vec<String>, b: Behavior) -> i32 {
+fn standard(mut paths: Vec<String>, b: Behavior) -> UResult<()> {
     let target: PathBuf = b
         .target_dir
         .clone()
@@ -418,25 +458,21 @@ fn standard(mut paths: Vec<String>, b: Behavior) -> i32 {
         if let Some(parent) = target.parent() {
             if !parent.exists() && b.create_leading {
                 if let Err(e) = fs::create_dir_all(parent) {
-                    show_error!("failed to create {}: {}", parent.display(), e);
-                    return 1;
+                    return Err(InstallError::CreateDirFailed(parent.to_path_buf(), e).into());
                 }
 
+                // Silent the warning as we want to the error message
+                #[allow(clippy::question_mark)]
                 if mode::chmod(parent, b.mode()).is_err() {
-                    show_error!("failed to chmod {}", parent.display());
-                    return 1;
+                    return Err(InstallError::ChmodFailed(parent.to_path_buf()).into());
                 }
             }
         }
 
         if target.is_file() || is_new_file_path(&target) {
-            copy_file_to_file(&sources[0], &target, &b)
+            copy(&sources[0], &target, &b)
         } else {
-            show_error!(
-                "invalid target {}: No such file or directory",
-                target.display()
-            );
-            1
+            Err(InstallError::InvalidTarget(target).into())
         }
     }
 }
@@ -444,34 +480,29 @@ fn standard(mut paths: Vec<String>, b: Behavior) -> i32 {
 /// Copy some files into a directory.
 ///
 /// Prints verbose information and error messages.
-/// Returns an integer intended as a program return code.
+/// Returns a Result type with the Err variant containing the error message.
 ///
 /// # Parameters
 ///
 /// _files_ must all exist as non-directories.
 /// _target_dir_ must be a directory.
 ///
-fn copy_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> i32 {
+fn copy_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> UResult<()> {
     if !target_dir.is_dir() {
-        show_error!("target '{}' is not a directory", target_dir.display());
-        return 1;
+        return Err(InstallError::TargetDirIsntDir(target_dir.to_path_buf()).into());
     }
-
-    let mut all_successful = true;
     for sourcepath in files.iter() {
-        if !sourcepath.exists() {
-            show_error!(
-                "cannot stat '{}': No such file or directory",
-                sourcepath.display()
-            );
-
-            all_successful = false;
+        if let Err(err) = sourcepath
+            .metadata()
+            .map_err_context(|| format!("cannot stat {}", sourcepath.quote()))
+        {
+            show!(err);
             continue;
         }
 
         if sourcepath.is_dir() {
-            show_error!("omitting directory '{}'", sourcepath.display());
-            all_successful = false;
+            let err = InstallError::OmittingDirectory(sourcepath.to_path_buf());
+            show!(err);
             continue;
         }
 
@@ -479,37 +510,18 @@ fn copy_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> i3
         let filename = sourcepath.components().last().unwrap();
         targetpath.push(filename);
 
-        if copy(sourcepath, &targetpath, b).is_err() {
-            all_successful = false;
-        }
-    }
-    if all_successful {
-        0
-    } else {
-        1
-    }
-}
-
-/// Copy a file to another file.
-///
-/// Prints verbose information and error messages.
-/// Returns an integer intended as a program return code.
-///
-/// # Parameters
-///
-/// _file_ must exist as a non-directory.
-/// _target_ must be a non-directory
-///
-fn copy_file_to_file(file: &Path, target: &Path, b: &Behavior) -> i32 {
-    if copy(file, target, b).is_err() {
-        1
-    } else {
-        0
+        show_if_err!(copy(sourcepath, &targetpath, b));
     }
+    // If the exit code was set, or show! has been called at least once
+    // (which sets the exit code as well), function execution will end after
+    // this return.
+    Ok(())
 }
 
 /// Copy one file to a new location, changing metadata.
 ///
+/// Returns a Result type with the Err variant containing the error message.
+///
 /// # Parameters
 ///
 /// _from_ must exist as a non-directory.
@@ -520,8 +532,8 @@ fn copy_file_to_file(file: &Path, target: &Path, b: &Behavior) -> i32 {
 /// If the copy system call fails, we print a verbose error and return an empty error value.
 ///
 #[allow(clippy::cognitive_complexity)]
-fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
-    if b.compare && !need_copy(from, to, b) {
+fn copy(from: &Path, to: &Path, b: &Behavior) -> UResult<()> {
+    if b.compare && !need_copy(from, to, b)? {
         return Ok(());
     }
     // Declare the path here as we may need it for the verbose output below.
@@ -536,68 +548,58 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
         if let Some(ref backup_path) = backup_path {
             // TODO!!
             if let Err(err) = fs::rename(to, backup_path) {
-                show_error!(
-                    "install: cannot backup file '{}' to '{}': {}",
-                    to.display(),
-                    backup_path.display(),
-                    err
-                );
-                return Err(());
+                return Err(InstallError::BackupFailed(
+                    to.to_path_buf(),
+                    backup_path.to_path_buf(),
+                    err,
+                )
+                .into());
             }
         }
     }
 
-    if from.to_string_lossy() == "/dev/null" {
+    if from.as_os_str() == "/dev/null" {
         /* workaround a limitation of fs::copy
          * https://github.com/rust-lang/rust/issues/79390
          */
         if let Err(err) = File::create(to) {
-            show_error!(
-                "install: cannot install '{}' to '{}': {}",
-                from.display(),
-                to.display(),
-                err
+            return Err(
+                InstallError::InstallFailed(from.to_path_buf(), to.to_path_buf(), err).into(),
             );
-            return Err(());
         }
     } else if let Err(err) = fs::copy(from, to) {
-        show_error!(
-            "cannot install '{}' to '{}': {}",
-            from.display(),
-            to.display(),
-            err
-        );
-        return Err(());
+        return Err(InstallError::InstallFailed(from.to_path_buf(), to.to_path_buf(), err).into());
     }
 
     if b.strip && cfg!(not(windows)) {
         match Command::new(&b.strip_program).arg(to).output() {
             Ok(o) => {
                 if !o.status.success() {
-                    crash!(
-                        1,
-                        "strip program failed: {}",
-                        String::from_utf8(o.stderr).unwrap_or_default()
-                    );
+                    return Err(InstallError::StripProgramFailed(
+                        String::from_utf8(o.stderr).unwrap_or_default(),
+                    )
+                    .into());
                 }
             }
-            Err(e) => crash!(1, "strip program execution failed: {}", e),
+            Err(e) => return Err(InstallError::StripProgramFailed(e.to_string()).into()),
         }
     }
 
+    // Silent the warning as we want to the error message
+    #[allow(clippy::question_mark)]
     if mode::chmod(to, b.mode()).is_err() {
-        return Err(());
+        return Err(InstallError::ChmodFailed(to.to_path_buf()).into());
     }
 
     if !b.owner.is_empty() {
         let meta = match fs::metadata(to) {
             Ok(meta) => meta,
-            Err(f) => crash!(1, "{}", f.to_string()),
+            Err(e) => return Err(InstallError::MetadataFailed(e).into()),
         };
 
         let owner_id = match usr2uid(&b.owner) {
             Ok(g) => g,
-            _ => crash!(1, "no such user: {}", b.owner),
+            _ => return Err(InstallError::NoSuchUser(b.owner.clone()).into()),
         };
         let gid = meta.gid();
         match wrap_chown(
@@ -606,7 +608,10 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
             Some(owner_id),
             Some(gid),
             false,
-            Verbosity::Normal,
+            Verbosity {
+                groups_only: false,
+                level: VerbosityLevel::Normal,
+            },
         ) {
             Ok(n) => {
                 if !n.is_empty() {
@@ -620,14 +625,24 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
     if !b.group.is_empty() {
         let meta = match fs::metadata(to) {
             Ok(meta) => meta,
-            Err(f) => crash!(1, "{}", f.to_string()),
+            Err(e) => return Err(InstallError::MetadataFailed(e).into()),
         };
 
         let group_id = match grp2gid(&b.group) {
             Ok(g) => g,
-            _ => crash!(1, "no such group: {}", b.group),
+            _ => return Err(InstallError::NoSuchGroup(b.group.clone()).into()),
         };
-        match wrap_chgrp(to, &meta, group_id, false, Verbosity::Normal) {
+        match wrap_chown(
+            to,
+            &meta,
+            Some(group_id),
+            None,
+            false,
+            Verbosity {
+                groups_only: true,
+                level: VerbosityLevel::Normal,
+            },
+        ) {
             Ok(n) => {
                 if !n.is_empty() {
                     show_error!("{}", n);
@@ -640,7 +655,7 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
     if b.preserve_timestamps {
         let meta = match fs::metadata(from) {
             Ok(meta) => meta,
-            Err(f) => crash!(1, "{}", f.to_string()),
+            Err(e) => return Err(InstallError::MetadataFailed(e).into()),
         };
 
         let modified_time = FileTime::from_last_modification_time(&meta);
@@ -653,9 +668,9 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
     }
 
     if b.verbose {
-        print!("'{}' -> '{}'", from.display(), to.display());
+        print!("{} -> {}", from.quote(), to.quote());
         match backup_path {
-            Some(path) => println!(" (backup: '{}')", path.display()),
+            Some(path) => println!(" (backup: {})", path.quote()),
             None => println!(),
         }
     }
@@ -664,6 +679,7 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
 }
 
 /// Return true if a file is necessary to copy. This is the case when:
+///
 /// - _from_ or _to_ is nonexistent;
 /// - either file has a sticky bit or set[ug]id bit, or the user specified one;
 /// - either file isn't a regular file;
@@ -679,14 +695,14 @@ fn copy(from: &Path, to: &Path, b: &Behavior) -> Result<(), ()> {
 ///
 /// Crashes the program if a nonexistent owner or group is specified in _b_.
 ///
-fn need_copy(from: &Path, to: &Path, b: &Behavior) -> bool {
+fn need_copy(from: &Path, to: &Path, b: &Behavior) -> UResult<bool> {
     let from_meta = match fs::metadata(from) {
         Ok(meta) => meta,
-        Err(_) => return true,
+        Err(_) => return Ok(true),
     };
     let to_meta = match fs::metadata(to) {
         Ok(meta) => meta,
-        Err(_) => return true,
+        Err(_) => return Ok(true),
     };
 
     // setuid || setgid || sticky
@@ -696,15 +712,15 @@ fn need_copy(from: &Path, to: &Path, b: &Behavior) -> bool {
         || from_meta.mode() & extra_mode != 0
         || to_meta.mode() & extra_mode != 0
     {
-        return true;
+        return Ok(true);
     }
 
     if !from_meta.is_file() || !to_meta.is_file() {
-        return true;
+        return Ok(true);
     }
 
     if from_meta.len() != to_meta.len() {
-        return true;
+        return Ok(true);
     }
 
     // TODO: if -P (#1809) and from/to contexts mismatch, return true.
@@ -712,31 +728,31 @@ fn need_copy(from: &Path, to: &Path, b: &Behavior) -> bool {
     if !b.owner.is_empty() {
         let owner_id = match usr2uid(&b.owner) {
             Ok(id) => id,
-            _ => crash!(1, "no such user: {}", b.owner),
+            _ => return Err(InstallError::NoSuchUser(b.owner.clone()).into()),
         };
         if owner_id != to_meta.uid() {
-            return true;
+            return Ok(true);
         }
     } else if !b.group.is_empty() {
         let group_id = match grp2gid(&b.group) {
             Ok(id) => id,
-            _ => crash!(1, "no such group: {}", b.group),
+            _ => return Err(InstallError::NoSuchGroup(b.group.clone()).into()),
         };
         if group_id != to_meta.gid() {
-            return true;
+            return Ok(true);
         }
     } else {
         #[cfg(not(target_os = "windows"))]
         unsafe {
             if to_meta.uid() != geteuid() || to_meta.gid() != getegid() {
-                return true;
+                return Ok(true);
             }
         }
     }
 
     if !diff(from.to_str().unwrap(), to.to_str().unwrap()) {
-        return true;
+        return Ok(true);
     }
 
-    false
+    Ok(false)
 }
diff --git a/src/uu/install/src/mode.rs b/src/uu/install/src/mode.rs
index b8d5cd839..310e1fb43 100644
--- a/src/uu/install/src/mode.rs
+++ b/src/uu/install/src/mode.rs
@@ -4,14 +4,14 @@ use std::path::Path;
 use uucore::mode;
 
 /// Takes a user-supplied string and tries to parse to u16 mode bitmask.
-pub fn parse(mode_string: &str, considering_dir: bool) -> Result<u32, String> {
+pub fn parse(mode_string: &str, considering_dir: bool, umask: u32) -> Result<u32, String> {
     let numbers: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
 
     // Passing 000 as the existing permissions seems to mirror GNU behavior.
     if mode_string.contains(numbers) {
-        mode::parse_numeric(0, mode_string)
+        mode::parse_numeric(0, mode_string, considering_dir)
     } else {
-        mode::parse_symbolic(0, mode_string, considering_dir)
+        mode::parse_symbolic(0, mode_string, umask, considering_dir)
     }
 }
 
@@ -22,8 +22,9 @@ pub fn parse(mode_string: &str, considering_dir: bool) -> Result<u32, String> {
 #[cfg(any(unix, target_os = "redox"))]
 pub fn chmod(path: &Path, mode: u32) -> Result<(), ()> {
     use std::os::unix::fs::PermissionsExt;
+    use uucore::display::Quotable;
     fs::set_permissions(path, fs::Permissions::from_mode(mode)).map_err(|err| {
-        show_error!("{}: chmod failed with error {}", path.display(), err);
+        show_error!("{}: chmod failed with error {}", path.maybe_quote(), err);
     })
 }
 
diff --git a/src/uu/join/Cargo.toml b/src/uu/join/Cargo.toml
index f108d5a4e..1c140f544 100644
--- a/src/uu/join/Cargo.toml
+++ b/src/uu/join/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_join"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "join ~ (uutils) merge lines from inputs with matching join fields"
@@ -16,9 +16,13 @@ path = "src/join.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "join"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/join/src/join.rs b/src/uu/join/src/join.rs
index 60721f212..51dfeec6f 100644
--- a/src/uu/join/src/join.rs
+++ b/src/uu/join/src/join.rs
@@ -11,15 +11,15 @@
 extern crate uucore;
 
 use clap::{crate_version, App, Arg};
-use std::cmp::{min, Ordering};
+use std::cmp::Ordering;
 use std::fs::File;
 use std::io::{stdin, BufRead, BufReader, Lines, Stdin};
+use uucore::display::Quotable;
 
 static NAME: &str = "join";
 
 #[derive(Copy, Clone, PartialEq)]
 enum FileNum {
-    None,
     File1,
     File2,
 }
@@ -41,7 +41,8 @@ enum CheckOrder {
 struct Settings {
     key1: usize,
     key2: usize,
-    print_unpaired: FileNum,
+    print_unpaired1: bool,
+    print_unpaired2: bool,
     print_joined: bool,
     ignore_case: bool,
     separator: Sep,
@@ -57,7 +58,8 @@ impl Default for Settings {
         Settings {
             key1: 0,
             key2: 0,
-            print_unpaired: FileNum::None,
+            print_unpaired1: false,
+            print_unpaired2: false,
             print_joined: true,
             ignore_case: false,
             separator: Sep::Whitespaces,
@@ -101,17 +103,12 @@ impl<'a> Repr<'a> {
     }
 
     /// Print each field except the one at the index.
-    fn print_fields(&self, line: &Line, index: usize, max_fields: Option<usize>) {
-        for i in 0..min(max_fields.unwrap_or(usize::max_value()), line.fields.len()) {
+    fn print_fields(&self, line: &Line, index: usize) {
+        for i in 0..line.fields.len() {
             if i != index {
                 print!("{}{}", self.separator, line.fields[i]);
             }
         }
-        if let Some(n) = max_fields {
-            for _ in line.fields.len()..n {
-                print!("{}", self.separator)
-            }
-        }
     }
 
     /// Print each field or the empty filler if the field is not set.
@@ -185,18 +182,18 @@ impl Spec {
                     return Spec::Key;
                 }
 
-                crash!(1, "invalid field specifier: '{}'", format);
+                crash!(1, "invalid field specifier: {}", format.quote());
             }
             Some('1') => FileNum::File1,
             Some('2') => FileNum::File2,
-            _ => crash!(1, "invalid file number in field spec: '{}'", format),
+            _ => crash!(1, "invalid file number in field spec: {}", format.quote()),
         };
 
         if let Some('.') = chars.next() {
             return Spec::Field(file_num, parse_field_number(chars.as_str()));
         }
 
-        crash!(1, "invalid field specifier: '{}'", format);
+        crash!(1, "invalid field specifier: {}", format.quote());
     }
 }
 
@@ -232,7 +229,6 @@ struct State<'a> {
     print_unpaired: bool,
     lines: Lines<Box<dyn BufRead + 'a>>,
     seq: Vec<Line>,
-    max_fields: Option<usize>,
     line_num: usize,
     has_failed: bool,
 }
@@ -243,14 +239,14 @@ impl<'a> State<'a> {
         name: &'a str,
         stdin: &'a Stdin,
         key: usize,
-        print_unpaired: FileNum,
+        print_unpaired: bool,
     ) -> State<'a> {
         let f = if name == "-" {
             Box::new(stdin.lock()) as Box<dyn BufRead>
         } else {
             match File::open(name) {
                 Ok(file) => Box::new(BufReader::new(file)) as Box<dyn BufRead>,
-                Err(err) => crash!(1, "{}: {}", name, err),
+                Err(err) => crash!(1, "{}: {}", name.maybe_quote(), err),
             }
         };
 
@@ -258,10 +254,9 @@ impl<'a> State<'a> {
             key,
             file_name: name,
             file_num,
-            print_unpaired: print_unpaired == file_num,
+            print_unpaired,
             lines: f.lines(),
             seq: Vec::new(),
-            max_fields: None,
             line_num: 0,
             has_failed: false,
         }
@@ -328,8 +323,8 @@ impl<'a> State<'a> {
                     });
                 } else {
                     repr.print_field(key);
-                    repr.print_fields(line1, self.key, self.max_fields);
-                    repr.print_fields(line2, other.key, other.max_fields);
+                    repr.print_fields(line1, self.key);
+                    repr.print_fields(line2, other.key);
                 }
 
                 println!();
@@ -360,14 +355,15 @@ impl<'a> State<'a> {
         !self.seq.is_empty()
     }
 
-    fn initialize(&mut self, read_sep: Sep, autoformat: bool) {
+    fn initialize(&mut self, read_sep: Sep, autoformat: bool) -> usize {
         if let Some(line) = self.read_line(read_sep) {
-            if autoformat {
-                self.max_fields = Some(line.fields.len());
-            }
-
             self.seq.push(line);
+
+            if autoformat {
+                return self.seq[0].fields.len();
+            }
         }
+        0
     }
 
     fn finalize(&mut self, input: &Input, repr: &Repr) {
@@ -398,7 +394,11 @@ impl<'a> State<'a> {
         let diff = input.compare(self.get_current_key(), line.get_field(self.key));
 
         if diff == Ordering::Greater {
-            eprintln!("{}:{}: is not sorted", self.file_name, self.line_num);
+            eprintln!(
+                "{}:{}: is not sorted",
+                self.file_name.maybe_quote(),
+                self.line_num
+            );
 
             // This is fatal if the check is enabled.
             if input.check_order == CheckOrder::Enabled {
@@ -430,7 +430,7 @@ impl<'a> State<'a> {
             });
         } else {
             repr.print_field(line.get_field(self.key));
-            repr.print_fields(line, self.key, self.max_fields);
+            repr.print_fields(line, self.key);
         }
 
         println!();
@@ -450,11 +450,19 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let mut settings: Settings = Default::default();
 
-    if let Some(value) = matches.value_of("v") {
-        settings.print_unpaired = parse_file_number(value);
+    let v_values = matches.values_of("v");
+    if v_values.is_some() {
         settings.print_joined = false;
-    } else if let Some(value) = matches.value_of("a") {
-        settings.print_unpaired = parse_file_number(value);
+    }
+
+    let unpaired = v_values
+        .unwrap_or_default()
+        .chain(matches.values_of("a").unwrap_or_default());
+    for file_num in unpaired {
+        match parse_file_number(file_num) {
+            FileNum::File1 => settings.print_unpaired1 = true,
+            FileNum::File2 => settings.print_unpaired2 = true,
+        }
     }
 
     settings.ignore_case = matches.is_present("i");
@@ -503,7 +511,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         crash!(1, "both files cannot be standard input");
     }
 
-    exec(file1, file2, &settings)
+    exec(file1, file2, settings)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
@@ -520,7 +528,8 @@ When FILE1 or FILE2 (not both) is -, read standard input.",
         .arg(
             Arg::with_name("a")
                 .short("a")
-                .takes_value(true)
+                .multiple(true)
+                .number_of_values(1)
                 .possible_values(&["1", "2"])
                 .value_name("FILENUM")
                 .help(
@@ -531,6 +540,9 @@ FILENUM is 1 or 2, corresponding to FILE1 or FILE2",
         .arg(
             Arg::with_name("v")
                 .short("v")
+                .multiple(true)
+                .number_of_values(1)
+                .possible_values(&["1", "2"])
                 .value_name("FILENUM")
                 .help("like -a FILENUM, but suppress joined output lines"),
         )
@@ -609,7 +621,7 @@ FILENUM is 1 or 2, corresponding to FILE1 or FILE2",
         )
 }
 
-fn exec(file1: &str, file2: &str, settings: &Settings) -> i32 {
+fn exec(file1: &str, file2: &str, settings: Settings) -> i32 {
     let stdin = stdin();
 
     let mut state1 = State::new(
@@ -617,7 +629,7 @@ fn exec(file1: &str, file2: &str, settings: &Settings) -> i32 {
         file1,
         &stdin,
         settings.key1,
-        settings.print_unpaired,
+        settings.print_unpaired1,
     );
 
     let mut state2 = State::new(
@@ -625,7 +637,7 @@ fn exec(file1: &str, file2: &str, settings: &Settings) -> i32 {
         file2,
         &stdin,
         settings.key2,
-        settings.print_unpaired,
+        settings.print_unpaired2,
     );
 
     let input = Input::new(
@@ -634,18 +646,34 @@ fn exec(file1: &str, file2: &str, settings: &Settings) -> i32 {
         settings.check_order,
     );
 
+    let format = if settings.autoformat {
+        let mut format = vec![Spec::Key];
+        let mut initialize = |state: &mut State| {
+            let max_fields = state.initialize(settings.separator, settings.autoformat);
+            for i in 0..max_fields {
+                if i != state.key {
+                    format.push(Spec::Field(state.file_num, i));
+                }
+            }
+        };
+        initialize(&mut state1);
+        initialize(&mut state2);
+        format
+    } else {
+        state1.initialize(settings.separator, settings.autoformat);
+        state2.initialize(settings.separator, settings.autoformat);
+        settings.format
+    };
+
     let repr = Repr::new(
         match settings.separator {
             Sep::Char(sep) => sep,
             _ => ' ',
         },
-        &settings.format,
+        &format,
         &settings.empty,
     );
 
-    state1.initialize(settings.separator, settings.autoformat);
-    state2.initialize(settings.separator, settings.autoformat);
-
     if settings.headers {
         state1.print_headers(&state2, &repr);
         state1.reset_read_line(&input);
@@ -704,7 +732,7 @@ fn get_field_number(keys: Option<usize>, key: Option<usize>) -> usize {
 fn parse_field_number(value: &str) -> usize {
     match value.parse::<usize>() {
         Ok(result) if result > 0 => result - 1,
-        _ => crash!(1, "invalid field number: '{}'", value),
+        _ => crash!(1, "invalid field number: {}", value.quote()),
     }
 }
 
@@ -712,7 +740,7 @@ fn parse_file_number(value: &str) -> FileNum {
     match value {
         "1" => FileNum::File1,
         "2" => FileNum::File2,
-        value => crash!(1, "invalid file number: '{}'", value),
+        value => crash!(1, "invalid file number: {}", value.quote()),
     }
 }
 
diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml
index 82a8a4fd0..452b0f407 100644
--- a/src/uu/kill/Cargo.toml
+++ b/src/uu/kill/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_kill"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "kill ~ (uutils) send a signal to a process"
@@ -17,8 +17,8 @@ path = "src/kill.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["signals"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["signals"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "kill"
diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs
index b3f5010ca..e9b7ee349 100644
--- a/src/uu/kill/src/kill.rs
+++ b/src/uu/kill/src/kill.rs
@@ -13,8 +13,9 @@ extern crate uucore;
 use clap::{crate_version, App, Arg};
 use libc::{c_int, pid_t};
 use std::io::Error;
+use uucore::display::Quotable;
 use uucore::error::{UResult, USimpleError};
-use uucore::signals::ALL_SIGNALS;
+use uucore::signals::{signal_by_name_or_value, ALL_SIGNALS};
 use uucore::InvalidEncodingHandling;
 
 static ABOUT: &str = "Send signal to processes or list information about signals.";
@@ -36,12 +37,12 @@ pub enum Mode {
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let args = args
+    let mut args = args
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
-    let (args, obs_signal) = handle_obsolete(args);
+    let obs_signal = handle_obsolete(&mut args);
 
-    let usage = format!("{} [OPTIONS]... PID...", executable!());
+    let usage = format!("{} [OPTIONS]... PID...", uucore::execution_phrase());
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let mode = if matches.is_present(options::TABLE) || matches.is_present(options::TABLE_OLD) {
@@ -59,13 +60,15 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     match mode {
         Mode::Kill => {
-            let sig = match (obs_signal, matches.value_of(options::SIGNAL)) {
-                (Some(s), Some(_)) => s, // -s takes precedence
-                (Some(s), None) => s,
-                (None, Some(s)) => s.to_owned(),
-                (None, None) => "TERM".to_owned(),
+            let sig = if let Some(signal) = obs_signal {
+                signal
+            } else if let Some(signal) = matches.value_of(options::SIGNAL) {
+                parse_signal_value(signal)?
+            } else {
+                15_usize //SIGTERM
             };
-            kill(&sig, &pids_or_signals)
+            let pids = parse_pids(&pids_or_signals)?;
+            kill(sig, &pids)
         }
         Mode::Table => {
             table();
@@ -76,7 +79,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -108,26 +111,22 @@ pub fn uu_app() -> App<'static, 'static> {
         )
 }
 
-fn handle_obsolete(mut args: Vec<String>) -> (Vec<String>, Option<String>) {
-    let mut i = 0;
-    while i < args.len() {
-        // this is safe because slice is valid when it is referenced
-        let slice = &args[i].clone();
-        if slice.starts_with('-') && slice.chars().nth(1).map_or(false, |c| c.is_digit(10)) {
-            let val = &slice[1..];
-            match val.parse() {
-                Ok(num) => {
-                    if uucore::signals::is_signal(num) {
-                        args.remove(i);
-                        return (args, Some(val.to_owned()));
-                    }
-                }
-                Err(_) => break, /* getopts will error out for us */
+fn handle_obsolete(args: &mut Vec<String>) -> Option<usize> {
+    // Sanity check
+    if args.len() > 2 {
+        // Old signal can only be in the first argument position
+        let slice = args[1].as_str();
+        if let Some(signal) = slice.strip_prefix('-') {
+            // Check if it is a valid signal
+            let opt_signal = signal_by_name_or_value(signal);
+            if opt_signal.is_some() {
+                // remove the signal before return
+                args.remove(1);
+                return opt_signal;
             }
         }
-        i += 1;
     }
-    (args, None)
+    None
 }
 
 fn table() {
@@ -154,23 +153,18 @@ fn print_signal(signal_name_or_value: &str) -> UResult<()> {
     }
     Err(USimpleError::new(
         1,
-        format!("unknown signal name {}", signal_name_or_value),
+        format!("unknown signal name {}", signal_name_or_value.quote()),
     ))
 }
 
 fn print_signals() {
-    let mut pos = 0;
     for (idx, signal) in ALL_SIGNALS.iter().enumerate() {
-        pos += signal.len();
-        print!("{}", signal);
-        if idx > 0 && pos > 73 {
-            println!();
-            pos = 0;
-        } else {
-            pos += 1;
+        if idx > 0 {
             print!(" ");
         }
+        print!("{}", signal);
     }
+    println!();
 }
 
 fn list(arg: Option<String>) -> UResult<()> {
@@ -183,31 +177,32 @@ fn list(arg: Option<String>) -> UResult<()> {
     }
 }
 
-fn kill(signalname: &str, pids: &[String]) -> UResult<()> {
-    let optional_signal_value = uucore::signals::signal_by_name_or_value(signalname);
-    let signal_value = match optional_signal_value {
-        Some(x) => x,
-        None => {
-            return Err(USimpleError::new(
-                1,
-                format!("unknown signal name {}", signalname),
-            ));
+fn parse_signal_value(signal_name: &str) -> UResult<usize> {
+    let optional_signal_value = signal_by_name_or_value(signal_name);
+    match optional_signal_value {
+        Some(x) => Ok(x),
+        None => Err(USimpleError::new(
+            1,
+            format!("unknown signal name {}", signal_name.quote()),
+        )),
+    }
+}
+
+fn parse_pids(pids: &[String]) -> UResult<Vec<usize>> {
+    pids.iter()
+        .map(|x| {
+            x.parse::<usize>().map_err(|e| {
+                USimpleError::new(1, format!("failed to parse argument {}: {}", x.quote(), e))
+            })
+        })
+        .collect()
+}
+
+fn kill(signal_value: usize, pids: &[usize]) -> UResult<()> {
+    for &pid in pids {
+        if unsafe { libc::kill(pid as pid_t, signal_value as c_int) } != 0 {
+            show!(USimpleError::new(1, format!("{}", Error::last_os_error())));
         }
-    };
-    for pid in pids {
-        match pid.parse::<usize>() {
-            Ok(x) => {
-                if unsafe { libc::kill(x as pid_t, signal_value as c_int) } != 0 {
-                    show!(USimpleError::new(1, format!("{}", Error::last_os_error())));
-                }
-            }
-            Err(e) => {
-                return Err(USimpleError::new(
-                    1,
-                    format!("failed to parse argument {}: {}", pid, e),
-                ));
-            }
-        };
     }
     Ok(())
 }
diff --git a/src/uu/link/Cargo.toml b/src/uu/link/Cargo.toml
index 025ac7554..275d3b5cc 100644
--- a/src/uu/link/Cargo.toml
+++ b/src/uu/link/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_link"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "link ~ (uutils) create a hard (file system) link to FILE"
@@ -16,10 +16,14 @@ path = "src/link.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 clap = { version = "2.33", features = ["wrap_help"] }
 
 [[bin]]
 name = "link"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs
index ad7702044..73e81b107 100644
--- a/src/uu/link/src/link.rs
+++ b/src/uu/link/src/link.rs
@@ -19,8 +19,8 @@ pub mod options {
     pub static FILES: &str = "FILES";
 }
 
-fn get_usage() -> String {
-    format!("{0} FILE1 FILE2", executable!())
+fn usage() -> String {
+    format!("{0} FILE1 FILE2", uucore::execution_phrase())
 }
 
 pub fn normalize_error_message(e: Error) -> String {
@@ -31,7 +31,7 @@ pub fn normalize_error_message(e: Error) -> String {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let files: Vec<_> = matches
@@ -51,7 +51,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/ln/Cargo.toml b/src/uu/ln/Cargo.toml
index 476e13771..ba2c8de96 100644
--- a/src/uu/ln/Cargo.toml
+++ b/src/uu/ln/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_ln"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "ln ~ (uutils) create a (file system) link to TARGET"
@@ -17,8 +17,8 @@ path = "src/ln.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "ln"
diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs
index d354acce9..e480d8f13 100644
--- a/src/uu/ln/src/ln.rs
+++ b/src/uu/ln/src/ln.rs
@@ -11,9 +11,13 @@
 extern crate uucore;
 
 use clap::{crate_version, App, Arg};
+use uucore::display::Quotable;
+use uucore::error::{UError, UResult};
 
 use std::borrow::Cow;
-use std::ffi::OsStr;
+use std::error::Error;
+use std::ffi::{OsStr, OsString};
+use std::fmt::Display;
 use std::fs;
 
 use std::io::{stdin, Result};
@@ -23,7 +27,7 @@ use std::os::unix::fs::symlink;
 use std::os::windows::fs::{symlink_dir, symlink_file};
 use std::path::{Path, PathBuf};
 use uucore::backup_control::{self, BackupMode};
-use uucore::fs::{canonicalize, CanonicalizeMode};
+use uucore::fs::{canonicalize, MissingHandling, ResolveMode};
 
 pub struct Settings {
     overwrite: OverwriteMode,
@@ -44,17 +48,59 @@ pub enum OverwriteMode {
     Force,
 }
 
-fn get_usage() -> String {
+#[derive(Debug)]
+enum LnError {
+    TargetIsDirectory(PathBuf),
+    SomeLinksFailed,
+    FailedToLink(String),
+    MissingDestination(PathBuf),
+    ExtraOperand(OsString),
+}
+
+impl Display for LnError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::TargetIsDirectory(s) => write!(f, "target {} is not a directory", s.quote()),
+            Self::FailedToLink(e) => write!(f, "failed to link: {}", e),
+            Self::SomeLinksFailed => write!(f, "some links failed to create"),
+            Self::MissingDestination(s) => {
+                write!(f, "missing destination file operand after {}", s.quote())
+            }
+            Self::ExtraOperand(s) => write!(
+                f,
+                "extra operand {}\nTry '{} --help' for more information.",
+                s.quote(),
+                uucore::execution_phrase()
+            ),
+        }
+    }
+}
+
+impl Error for LnError {}
+
+impl UError for LnError {
+    fn code(&self) -> i32 {
+        match self {
+            Self::TargetIsDirectory(_) => 1,
+            Self::SomeLinksFailed => 1,
+            Self::FailedToLink(_) => 1,
+            Self::MissingDestination(_) => 1,
+            Self::ExtraOperand(_) => 1,
+        }
+    }
+}
+
+fn usage() -> String {
     format!(
         "{0} [OPTION]... [-T] TARGET LINK_NAME   (1st form)
        {0} [OPTION]... TARGET                  (2nd form)
        {0} [OPTION]... TARGET... DIRECTORY     (3rd form)
        {0} [OPTION]... -t DIRECTORY TARGET...  (4th form)",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
-fn get_long_usage() -> String {
+fn long_usage() -> String {
     String::from(
         " In the 1st form, create a link to TARGET with the name LINK_NAME.
         In the 2nd form, create a link to TARGET in the current directory.
@@ -71,13 +117,10 @@ fn get_long_usage() -> String {
 static ABOUT: &str = "change file owner and group";
 
 mod options {
-    pub const BACKUP_NO_ARG: &str = "b";
-    pub const BACKUP: &str = "backup";
     pub const FORCE: &str = "force";
     pub const INTERACTIVE: &str = "interactive";
     pub const NO_DEREFERENCE: &str = "no-dereference";
     pub const SYMBOLIC: &str = "symbolic";
-    pub const SUFFIX: &str = "suffix";
     pub const TARGET_DIRECTORY: &str = "target-directory";
     pub const NO_TARGET_DIRECTORY: &str = "no-target-directory";
     pub const RELATIVE: &str = "relative";
@@ -86,9 +129,10 @@ mod options {
 
 static ARG_FILES: &str = "files";
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
-    let long_usage = get_long_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
+    let long_usage = long_usage();
 
     let matches = uu_app()
         .usage(&usage[..])
@@ -115,20 +159,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         OverwriteMode::NoClobber
     };
 
-    let backup_mode = backup_control::determine_backup_mode(
-        matches.is_present(options::BACKUP_NO_ARG),
-        matches.is_present(options::BACKUP),
-        matches.value_of(options::BACKUP),
-    );
-    let backup_mode = match backup_mode {
-        Err(err) => {
-            show_usage_error!("{}", err);
-            return 1;
-        }
-        Ok(mode) => mode,
-    };
-
-    let backup_suffix = backup_control::determine_backup_suffix(matches.value_of(options::SUFFIX));
+    let backup_mode = backup_control::determine_backup_mode(&matches)?;
+    let backup_suffix = backup_control::determine_backup_suffix(&matches);
 
     let settings = Settings {
         overwrite: overwrite_mode,
@@ -148,23 +180,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
-        .arg(
-            Arg::with_name(options::BACKUP)
-                .long(options::BACKUP)
-                .help("make a backup of each existing destination file")
-                .takes_value(true)
-                .require_equals(true)
-                .min_values(0)
-                .value_name("CONTROL"),
-        )
-        .arg(
-            Arg::with_name(options::BACKUP_NO_ARG)
-                .short(options::BACKUP_NO_ARG)
-                .help("like --backup but does not accept an argument"),
-        )
+        .arg(backup_control::arguments::backup())
+        .arg(backup_control::arguments::backup_no_args())
         // TODO: opts.arg(
         //    Arg::with_name(("d", "directory", "allow users with appropriate privileges to attempt \
         //                                       to make hard links to directories");
@@ -202,14 +222,7 @@ pub fn uu_app() -> App<'static, 'static> {
                 // override added for https://github.com/uutils/coreutils/issues/2359
                 .overrides_with(options::SYMBOLIC),
         )
-        .arg(
-            Arg::with_name(options::SUFFIX)
-                .short("S")
-                .long(options::SUFFIX)
-                .help("override the usual backup suffix")
-                .value_name("SUFFIX")
-                .takes_value(true),
-        )
+        .arg(backup_control::arguments::suffix())
         .arg(
             Arg::with_name(options::TARGET_DIRECTORY)
                 .short("t")
@@ -246,7 +259,7 @@ pub fn uu_app() -> App<'static, 'static> {
         )
 }
 
-fn exec(files: &[PathBuf], settings: &Settings) -> i32 {
+fn exec(files: &[PathBuf], settings: &Settings) -> UResult<()> {
     // Handle cases where we create links in a directory first.
     if let Some(ref name) = settings.target_dir {
         // 4th form: a directory is specified by -t.
@@ -267,35 +280,22 @@ fn exec(files: &[PathBuf], settings: &Settings) -> i32 {
     // 1st form. Now there should be only two operands, but if -T is
     // specified we may have a wrong number of operands.
     if files.len() == 1 {
-        show_error!(
-            "missing destination file operand after '{}'",
-            files[0].to_string_lossy()
-        );
-        return 1;
+        return Err(LnError::MissingDestination(files[0].clone()).into());
     }
     if files.len() > 2 {
-        show_error!(
-            "extra operand '{}'\nTry '{} --help' for more information.",
-            files[2].display(),
-            executable!()
-        );
-        return 1;
+        return Err(LnError::ExtraOperand(files[2].clone().into()).into());
     }
     assert!(!files.is_empty());
 
     match link(&files[0], &files[1], settings) {
-        Ok(_) => 0,
-        Err(e) => {
-            show_error!("{}", e);
-            1
-        }
+        Ok(_) => Ok(()),
+        Err(e) => Err(LnError::FailedToLink(e.to_string()).into()),
     }
 }
 
-fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings) -> i32 {
+fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings) -> UResult<()> {
     if !target_dir.is_dir() {
-        show_error!("target '{}' is not a directory", target_dir.display());
-        return 1;
+        return Err(LnError::TargetIsDirectory(target_dir.to_owned()).into());
     }
 
     let mut all_successful = true;
@@ -307,7 +307,7 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings)
                 if is_symlink(target_dir) {
                     if target_dir.is_file() {
                         if let Err(e) = fs::remove_file(target_dir) {
-                            show_error!("Could not update {}: {}", target_dir.display(), e)
+                            show_error!("Could not update {}: {}", target_dir.quote(), e)
                         };
                     }
                     if target_dir.is_dir() {
@@ -315,7 +315,7 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings)
                         // considered as a dir
                         // See test_ln::test_symlink_no_deref_dir
                         if let Err(e) = fs::remove_dir(target_dir) {
-                            show_error!("Could not update {}: {}", target_dir.display(), e)
+                            show_error!("Could not update {}: {}", target_dir.quote(), e)
                         };
                     }
                 }
@@ -333,10 +333,7 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings)
                         }
                     }
                     None => {
-                        show_error!(
-                            "cannot stat '{}': No such file or directory",
-                            srcpath.display()
-                        );
+                        show_error!("cannot stat {}: No such file or directory", srcpath.quote());
                         all_successful = false;
                         continue;
                     }
@@ -345,24 +342,28 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings)
 
         if let Err(e) = link(srcpath, &targetpath, settings) {
             show_error!(
-                "cannot link '{}' to '{}': {}",
-                targetpath.display(),
-                srcpath.display(),
+                "cannot link {} to {}: {}",
+                targetpath.quote(),
+                srcpath.quote(),
                 e
             );
             all_successful = false;
         }
     }
     if all_successful {
-        0
+        Ok(())
     } else {
-        1
+        Err(LnError::SomeLinksFailed.into())
     }
 }
 
 fn relative_path<'a>(src: &Path, dst: &Path) -> Result<Cow<'a, Path>> {
-    let src_abs = canonicalize(src, CanonicalizeMode::Normal)?;
-    let mut dst_abs = canonicalize(dst.parent().unwrap(), CanonicalizeMode::Normal)?;
+    let src_abs = canonicalize(src, MissingHandling::Normal, ResolveMode::Logical)?;
+    let mut dst_abs = canonicalize(
+        dst.parent().unwrap(),
+        MissingHandling::Normal,
+        ResolveMode::Logical,
+    )?;
     dst_abs.push(dst.components().last().unwrap());
     let suffix_pos = src_abs
         .components()
@@ -396,7 +397,7 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> Result<()> {
         match settings.overwrite {
             OverwriteMode::NoClobber => {}
             OverwriteMode::Interactive => {
-                print!("{}: overwrite '{}'? ", executable!(), dst.display());
+                print!("{}: overwrite {}? ", uucore::util_name(), dst.quote());
                 if !read_yes() {
                     return Ok(());
                 }
@@ -423,9 +424,9 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> Result<()> {
     }
 
     if settings.verbose {
-        print!("'{}' -> '{}'", dst.display(), &source.display());
+        print!("{} -> {}", dst.quote(), source.quote());
         match backup_path {
-            Some(path) => println!(" (backup: '{}')", path.display()),
+            Some(path) => println!(" (backup: {})", path.quote()),
             None => println!(),
         }
     }
diff --git a/src/uu/logname/Cargo.toml b/src/uu/logname/Cargo.toml
index 3c5f9afab..ed19ff887 100644
--- a/src/uu/logname/Cargo.toml
+++ b/src/uu/logname/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_logname"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "logname ~ (uutils) display the login name of the current user"
@@ -17,8 +17,8 @@ path = "src/logname.rs"
 [dependencies]
 libc = "0.2.42"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "logname"
diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs
index 4a6f43418..56866ff62 100644
--- a/src/uu/logname/src/logname.rs
+++ b/src/uu/logname/src/logname.rs
@@ -35,8 +35,8 @@ fn get_userlogin() -> Option<String> {
 
 static SUMMARY: &str = "Print user's login name";
 
-fn get_usage() -> String {
-    String::from(executable!())
+fn usage() -> &'static str {
+    uucore::execution_phrase()
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
@@ -44,8 +44,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
-    let _ = uu_app().usage(&usage[..]).get_matches_from(args);
+    let _ = uu_app().usage(usage()).get_matches_from(args);
 
     match get_userlogin() {
         Some(userlogin) => println!("{}", userlogin),
@@ -56,7 +55,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(SUMMARY)
 }
diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
index dbe6bacaa..b918f6501 100644
--- a/src/uu/ls/Cargo.toml
+++ b/src/uu/ls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_ls"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "ls ~ (uutils) display directory contents"
@@ -15,7 +15,6 @@ edition = "2018"
 path = "src/ls.rs"
 
 [dependencies]
-locale = "0.2.2"
 chrono = "0.4.19"
 clap = { version = "2.33", features = ["wrap_help"] }
 unicode-width = "0.1.8"
@@ -25,9 +24,10 @@ termsize = "0.1.6"
 globset = "0.4.6"
 lscolors = { version = "0.7.1", features = ["ansi_term"] }
 uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore", features = ["entries", "fs"] }
-uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" }
+uucore_procs = { version=">=0.0.7", package = "uucore_procs", path = "../../uucore_procs" }
 once_cell = "1.7.2"
 atty = "0.2"
+selinux = { version="0.2.1", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 lazy_static = "1.4.0"
@@ -35,3 +35,10 @@ lazy_static = "1.4.0"
 [[bin]]
 name = "ls"
 path = "src/main.rs"
+
+[features]
+feat_selinux = ["selinux"]
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
index 8fcd34bed..1b6a73b39 100644
--- a/src/uu/ls/src/ls.rs
+++ b/src/uu/ls/src/ls.rs
@@ -21,6 +21,7 @@ use lscolors::LsColors;
 use number_prefix::NumberPrefix;
 use once_cell::unsync::OnceCell;
 use quoting_style::{escape_name, QuotingStyle};
+use std::ffi::OsString;
 #[cfg(windows)]
 use std::os::windows::fs::MetadataExt;
 use std::{
@@ -39,15 +40,23 @@ use std::{
     time::Duration,
 };
 use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
-use uucore::error::{set_exit_code, FromIo, UCustomError, UResult};
+use uucore::{
+    display::Quotable,
+    error::{set_exit_code, UError, UResult},
+};
 
 use unicode_width::UnicodeWidthStr;
 #[cfg(unix)]
 use uucore::libc::{S_IXGRP, S_IXOTH, S_IXUSR};
 use uucore::{fs::display_permissions, version_cmp::version_cmp};
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+#[cfg(not(feature = "selinux"))]
+static CONTEXT_HELP_TEXT: &str = "print any security context of each file (not enabled)";
+#[cfg(feature = "selinux")]
+static CONTEXT_HELP_TEXT: &str = "print any security context of each file";
+
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 pub mod options {
@@ -125,15 +134,18 @@ pub mod options {
     pub static FULL_TIME: &str = "full-time";
     pub static HIDE: &str = "hide";
     pub static IGNORE: &str = "ignore";
+    pub static CONTEXT: &str = "context";
 }
 
+const DEFAULT_TERM_WIDTH: u16 = 80;
+
 #[derive(Debug)]
 enum LsError {
     InvalidLineWidth(String),
     NoMetadata(PathBuf),
 }
 
-impl UCustomError for LsError {
+impl UError for LsError {
     fn code(&self) -> i32 {
         match self {
             LsError::InvalidLineWidth(_) => 2,
@@ -147,8 +159,8 @@ impl Error for LsError {}
 impl Display for LsError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            LsError::InvalidLineWidth(s) => write!(f, "invalid line width: '{}'", s),
-            LsError::NoMetadata(p) => write!(f, "could not open file: '{}'", p.display()),
+            LsError::InvalidLineWidth(s) => write!(f, "invalid line width: {}", s.quote()),
+            LsError::NoMetadata(p) => write!(f, "could not open file: {}", p.quote()),
         }
     }
 }
@@ -229,10 +241,12 @@ struct Config {
     inode: bool,
     color: Option<LsColors>,
     long: LongFormat,
-    width: Option<u16>,
+    width: u16,
     quoting_style: QuotingStyle,
     indicator_style: IndicatorStyle,
     time_style: TimeStyle,
+    context: bool,
+    selinux_supported: bool,
 }
 
 // Fields that can be removed or added to the long format
@@ -244,9 +258,18 @@ struct LongFormat {
     numeric_uid_gid: bool,
 }
 
+struct PaddingCollection {
+    longest_link_count_len: usize,
+    longest_uname_len: usize,
+    longest_group_len: usize,
+    longest_context_len: usize,
+    longest_size_len: usize,
+}
+
 impl Config {
     #[allow(clippy::cognitive_complexity)]
-    fn from(options: clap::ArgMatches) -> UResult<Config> {
+    fn from(options: &clap::ArgMatches) -> UResult<Config> {
+        let context = options.is_present(options::CONTEXT);
         let (mut format, opt) = if let Some(format_) = options.value_of(options::FORMAT) {
             (
                 match format_ {
@@ -258,16 +281,20 @@ impl Config {
                     // below should never happen as clap already restricts the values.
                     _ => unreachable!("Invalid field for --format"),
                 },
-                options::FORMAT,
+                Some(options::FORMAT),
             )
         } else if options.is_present(options::format::LONG) {
-            (Format::Long, options::format::LONG)
+            (Format::Long, Some(options::format::LONG))
         } else if options.is_present(options::format::ACROSS) {
-            (Format::Across, options::format::ACROSS)
+            (Format::Across, Some(options::format::ACROSS))
         } else if options.is_present(options::format::COMMAS) {
-            (Format::Commas, options::format::COMMAS)
+            (Format::Commas, Some(options::format::COMMAS))
+        } else if options.is_present(options::format::COLUMNS) {
+            (Format::Columns, Some(options::format::COLUMNS))
+        } else if atty::is(atty::Stream::Stdout) {
+            (Format::Columns, None)
         } else {
-            (Format::Columns, options::format::COLUMNS)
+            (Format::OneLine, None)
         };
 
         // The -o, -n and -g options are tricky. They cannot override with each
@@ -286,9 +313,8 @@ impl Config {
         // options, but manually whether they have an index that's greater than
         // the other format options. If so, we set the appropriate format.
         if format != Format::Long {
-            let idx = options
-                .indices_of(opt)
-                .map(|x| x.max().unwrap())
+            let idx = opt
+                .and_then(|opt| options.indices_of(opt).map(|x| x.max().unwrap()))
                 .unwrap_or(0);
             if [
                 options::format::LONG_NO_OWNER,
@@ -399,20 +425,34 @@ impl Config {
 
         let width = match options.value_of(options::WIDTH) {
             Some(x) => match x.parse::<u16>() {
-                Ok(u) => Some(u),
+                Ok(u) => u,
                 Err(_) => return Err(LsError::InvalidLineWidth(x.into()).into()),
             },
-            None => termsize::get().map(|s| s.cols),
+            None => match termsize::get() {
+                Some(size) => size.cols,
+                None => match std::env::var_os("COLUMNS") {
+                    Some(columns) => match columns.to_str().and_then(|s| s.parse().ok()) {
+                        Some(columns) => columns,
+                        None => {
+                            show_error!(
+                                "ignoring invalid width in environment variable COLUMNS: {}",
+                                columns.quote()
+                            );
+                            DEFAULT_TERM_WIDTH
+                        }
+                    },
+                    None => DEFAULT_TERM_WIDTH,
+                },
+            },
         };
 
         #[allow(clippy::needless_bool)]
         let show_control = if options.is_present(options::HIDE_CONTROL_CHARS) {
             false
-        } else if options.is_present(options::SHOW_CONTROL_CHARS) || atty::is(atty::Stream::Stdout)
-        {
+        } else if options.is_present(options::SHOW_CONTROL_CHARS) {
             true
         } else {
-            false
+            !atty::is(atty::Stream::Stdout)
         };
 
         let quoting_style = if let Some(style) = options.value_of(options::QUOTING_STYLE) {
@@ -518,7 +558,7 @@ impl Config {
                 Ok(p) => {
                     ignore_patterns.add(p);
                 }
-                Err(_) => show_warning!("Invalid pattern for ignore: '{}'", pattern),
+                Err(_) => show_warning!("Invalid pattern for ignore: {}", pattern.quote()),
             }
         }
 
@@ -528,7 +568,7 @@ impl Config {
                     Ok(p) => {
                         ignore_patterns.add(p);
                     }
-                    Err(_) => show_warning!("Invalid pattern for hide: '{}'", pattern),
+                    Err(_) => show_warning!("Invalid pattern for hide: {}", pattern.quote()),
                 }
             }
         }
@@ -573,32 +613,40 @@ impl Config {
             quoting_style,
             indicator_style,
             time_style,
+            context,
+            selinux_supported: {
+                #[cfg(feature = "selinux")]
+                {
+                    selinux::kernel_support() != selinux::KernelSupport::Unsupported
+                }
+                #[cfg(not(feature = "selinux"))]
+                {
+                    false
+                }
+            },
         })
     }
 }
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let args = args
-        .collect_str(InvalidEncodingHandling::Ignore)
-        .accept_any();
-
-    let usage = get_usage();
+    let usage = usage();
 
     let app = uu_app().usage(&usage[..]);
 
     let matches = app.get_matches_from(args);
 
+    let config = Config::from(&matches)?;
     let locs = matches
-        .values_of(options::PATHS)
-        .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_else(|| vec![String::from(".")]);
+        .values_of_os(options::PATHS)
+        .map(|v| v.map(Path::new).collect())
+        .unwrap_or_else(|| vec![Path::new(".")]);
 
-    list(locs, Config::from(matches)?)
+    list(locs, config)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(
             "By default, ls will list the files and contents of any directories on \
@@ -1137,6 +1185,12 @@ only ignore '.' and '..'.",
                 .overrides_with(options::FULL_TIME)
                 .help("like -l --time-style=full-iso"),
         )
+        .arg(
+            Arg::with_name(options::CONTEXT)
+                .short("Z")
+                .long(options::CONTEXT)
+                .help(CONTEXT_HELP_TEXT),
+        )
         // Positional arguments
         .arg(
             Arg::with_name(options::PATHS)
@@ -1157,17 +1211,18 @@ struct PathData {
     md: OnceCell<Option<Metadata>>,
     ft: OnceCell<Option<FileType>>,
     // Name of the file - will be empty for . or ..
-    display_name: String,
+    display_name: OsString,
     // PathBuf that all above data corresponds to
     p_buf: PathBuf,
     must_dereference: bool,
+    security_context: String,
 }
 
 impl PathData {
     fn new(
         p_buf: PathBuf,
         file_type: Option<std::io::Result<FileType>>,
-        file_name: Option<String>,
+        file_name: Option<OsString>,
         config: &Config,
         command_line: bool,
     ) -> Self {
@@ -1175,16 +1230,13 @@ impl PathData {
         // For '..', the filename is None
         let display_name = if let Some(name) = file_name {
             name
+        } else if command_line {
+            p_buf.clone().into()
         } else {
-            let display_os_str = if command_line {
-                p_buf.as_os_str()
-            } else {
-                p_buf
-                    .file_name()
-                    .unwrap_or_else(|| p_buf.iter().next_back().unwrap())
-            };
-
-            display_os_str.to_string_lossy().into_owned()
+            p_buf
+                .file_name()
+                .unwrap_or_else(|| p_buf.iter().next_back().unwrap())
+                .to_owned()
         };
         let must_dereference = match &config.dereference {
             Dereference::All => true,
@@ -1207,12 +1259,19 @@ impl PathData {
             None => OnceCell::new(),
         };
 
+        let security_context = if config.context {
+            get_security_context(config, &p_buf, must_dereference)
+        } else {
+            String::new()
+        };
+
         Self {
             md: OnceCell::new(),
             ft,
             display_name,
             p_buf,
             must_dereference,
+            security_context,
         }
     }
 
@@ -1229,19 +1288,24 @@ impl PathData {
     }
 }
 
-fn list(locs: Vec<String>, config: Config) -> UResult<()> {
+fn list(locs: Vec<&Path>, config: Config) -> UResult<()> {
     let mut files = Vec::<PathData>::new();
     let mut dirs = Vec::<PathData>::new();
 
     let mut out = BufWriter::new(stdout());
 
     for loc in &locs {
-        let p = PathBuf::from(&loc);
+        let p = PathBuf::from(loc);
         let path_data = PathData::new(p, None, None, &config, true);
 
         if path_data.md().is_none() {
-            show!(std::io::ErrorKind::NotFound
-                .map_err_context(|| format!("cannot access '{}'", path_data.p_buf.display())));
+            // FIXME: Would be nice to use the actual error instead of hardcoding it
+            // Presumably other errors can happen too?
+            show_error!(
+                "cannot access {}: No such file or directory",
+                path_data.p_buf.quote()
+            );
+            set_exit_code(1);
             // We found an error, no need to continue the execution
             continue;
         }
@@ -1266,6 +1330,7 @@ fn list(locs: Vec<String>, config: Config) -> UResult<()> {
     sort_entries(&mut dirs, &config);
     for dir in dirs {
         if locs.len() > 1 || config.recursive {
+            // FIXME: This should use the quoting style and propagate errors
             let _ = writeln!(out, "\n{}:", dir.p_buf.display());
         }
         enter_directory(&dir, &config, &mut out);
@@ -1342,8 +1407,8 @@ fn enter_directory(dir: &PathData, config: &Config, out: &mut BufWriter<Stdout>)
         vec![]
     };
 
-    let mut temp: Vec<_> = safe_unwrap!(fs::read_dir(&dir.p_buf))
-        .map(|res| safe_unwrap!(res))
+    let mut temp: Vec<_> = crash_if_err!(1, fs::read_dir(&dir.p_buf))
+        .map(|res| crash_if_err!(1, res))
         .filter(|e| should_display(e, config))
         .map(|e| PathData::new(DirEntry::path(&e), Some(e.file_type()), None, config, false))
         .collect();
@@ -1374,30 +1439,55 @@ fn get_metadata(entry: &Path, dereference: bool) -> std::io::Result<Metadata> {
     }
 }
 
-fn display_dir_entry_size(entry: &PathData, config: &Config) -> (usize, usize) {
+fn display_dir_entry_size(entry: &PathData, config: &Config) -> (usize, usize, usize, usize) {
+    // TODO: Cache/memorize the display_* results so we don't have to recalculate them.
     if let Some(md) = entry.md() {
         (
             display_symlink_count(md).len(),
+            display_uname(md, config).len(),
+            display_group(md, config).len(),
             display_size_or_rdev(md, config).len(),
         )
     } else {
-        (0, 0)
+        (0, 0, 0, 0)
     }
 }
 
-fn pad_left(string: String, count: usize) -> String {
+fn pad_left(string: &str, count: usize) -> String {
     format!("{:>width$}", string, width = count)
 }
 
+fn pad_right(string: &str, count: usize) -> String {
+    format!("{:<width$}", string, width = count)
+}
+
 fn display_items(items: &[PathData], config: &Config, out: &mut BufWriter<Stdout>) {
+    // `-Z`, `--context`:
+    // Display the SELinux security context or '?' if none is found. When used with the `-l`
+    // option, print the security context to the left of the size column.
+
     if config.format == Format::Long {
-        let (mut max_links, mut max_width) = (1, 1);
+        let (
+            mut longest_link_count_len,
+            mut longest_uname_len,
+            mut longest_group_len,
+            mut longest_context_len,
+            mut longest_size_len,
+        ) = (1, 1, 1, 1, 1);
         let mut total_size = 0;
 
         for item in items {
-            let (links, width) = display_dir_entry_size(item, config);
-            max_links = links.max(max_links);
-            max_width = width.max(max_width);
+            let context_len = item.security_context.len();
+            let (link_count_len, uname_len, group_len, size_len) =
+                display_dir_entry_size(item, config);
+            longest_link_count_len = link_count_len.max(longest_link_count_len);
+            longest_size_len = size_len.max(longest_size_len);
+            longest_uname_len = uname_len.max(longest_uname_len);
+            longest_group_len = group_len.max(longest_group_len);
+            if config.context {
+                longest_context_len = context_len.max(longest_context_len);
+            }
+            longest_size_len = size_len.max(longest_size_len);
             total_size += item.md().map_or(0, |md| get_block_size(md, config));
         }
 
@@ -1406,20 +1496,38 @@ fn display_items(items: &[PathData], config: &Config, out: &mut BufWriter<Stdout
         }
 
         for item in items {
-            display_item_long(item, max_links, max_width, config, out);
+            display_item_long(
+                item,
+                PaddingCollection {
+                    longest_link_count_len,
+                    longest_uname_len,
+                    longest_group_len,
+                    longest_context_len,
+                    longest_size_len,
+                },
+                config,
+                out,
+            );
         }
     } else {
-        let names = items.iter().filter_map(|i| display_file_name(i, config));
+        let mut longest_context_len = 1;
+        let prefix_context = if config.context {
+            for item in items {
+                let context_len = item.security_context.len();
+                longest_context_len = context_len.max(longest_context_len);
+            }
+            Some(longest_context_len)
+        } else {
+            None
+        };
+        let names = items
+            .iter()
+            .filter_map(|i| display_file_name(i, config, prefix_context));
 
-        match (&config.format, config.width) {
-            (Format::Columns, Some(width)) => {
-                display_grid(names, width, Direction::TopToBottom, out)
-            }
-            (Format::Across, Some(width)) => {
-                display_grid(names, width, Direction::LeftToRight, out)
-            }
-            (Format::Commas, width_opt) => {
-                let term_width = width_opt.unwrap_or(1);
+        match config.format {
+            Format::Columns => display_grid(names, config.width, Direction::TopToBottom, out),
+            Format::Across => display_grid(names, config.width, Direction::LeftToRight, out),
+            Format::Commas => {
                 let mut current_col = 0;
                 let mut names = names;
                 if let Some(name) = names.next() {
@@ -1428,7 +1536,8 @@ fn display_items(items: &[PathData], config: &Config, out: &mut BufWriter<Stdout
                 }
                 for name in names {
                     let name_width = name.width as u16;
-                    if current_col + name_width + 1 > term_width {
+                    // If the width is 0 we print one single line
+                    if config.width != 0 && current_col + name_width + 1 > config.width {
                         current_col = name_width + 2;
                         let _ = write!(out, ",\n{}", name.contents);
                     } else {
@@ -1480,30 +1589,71 @@ fn display_grid(
     direction: Direction,
     out: &mut BufWriter<Stdout>,
 ) {
-    let mut grid = Grid::new(GridOptions {
-        filling: Filling::Spaces(2),
-        direction,
-    });
-
-    for name in names {
-        grid.add(name);
-    }
-
-    match grid.fit_into_width(width as usize) {
-        Some(output) => {
-            let _ = write!(out, "{}", output);
+    if width == 0 {
+        // If the width is 0 we print one single line
+        let mut printed_something = false;
+        for name in names {
+            if printed_something {
+                let _ = write!(out, "  ");
+            }
+            printed_something = true;
+            let _ = write!(out, "{}", name.contents);
         }
-        // Width is too small for the grid, so we fit it in one column
-        None => {
-            let _ = write!(out, "{}", grid.fit_into_columns(1));
+        if printed_something {
+            let _ = writeln!(out);
+        }
+    } else {
+        let mut grid = Grid::new(GridOptions {
+            filling: Filling::Spaces(2),
+            direction,
+        });
+
+        for name in names {
+            grid.add(name);
+        }
+
+        match grid.fit_into_width(width as usize) {
+            Some(output) => {
+                let _ = write!(out, "{}", output);
+            }
+            // Width is too small for the grid, so we fit it in one column
+            None => {
+                let _ = write!(out, "{}", grid.fit_into_columns(1));
+            }
         }
     }
 }
 
+/// This writes to the BufWriter out a single string of the output of `ls -l`.
+///
+/// It writes the following keys, in order:
+/// * `inode` ([`get_inode`], config-optional)
+/// * `permissions` ([`display_permissions`])
+/// * `symlink_count` ([`display_symlink_count`])
+/// * `owner` ([`display_uname`], config-optional)
+/// * `group` ([`display_group`], config-optional)
+/// * `author` ([`display_uname`], config-optional)
+/// * `size / rdev` ([`display_size_or_rdev`])
+/// * `system_time` ([`get_system_time`])
+/// * `file_name` ([`display_file_name`])
+///
+/// This function needs to display information in columns:
+/// * permissions and system_time are already guaranteed to be pre-formatted in fixed length.
+/// * file_name is the last column and is left-aligned.
+/// * Everything else needs to be padded using [`pad_left`].
+///
+/// That's why we have the parameters:
+/// ```txt
+///    longest_link_count_len: usize,
+///    longest_uname_len: usize,
+///    longest_group_len: usize,
+///    longest_context_len: usize,
+///    longest_size_len: usize,
+/// ```
+/// that decide the maximum possible character count of each field.
 fn display_item_long(
     item: &PathData,
-    max_links: usize,
-    max_size: usize,
+    padding: PaddingCollection,
     config: &Config,
     out: &mut BufWriter<Stdout>,
 ) {
@@ -1524,34 +1674,61 @@ fn display_item_long(
 
     let _ = write!(
         out,
-        "{} {}",
+        "{}{} {}",
         display_permissions(md, true),
-        pad_left(display_symlink_count(md), max_links),
+        if item.security_context.len() > 1 {
+            // GNU `ls` uses a "." character to indicate a file with a security context,
+            // but not other alternate access method.
+            "."
+        } else {
+            ""
+        },
+        pad_left(&display_symlink_count(md), padding.longest_link_count_len),
     );
 
     if config.long.owner {
-        let _ = write!(out, " {}", display_uname(md, config));
+        let _ = write!(
+            out,
+            " {}",
+            pad_right(&display_uname(md, config), padding.longest_uname_len)
+        );
     }
 
     if config.long.group {
-        let _ = write!(out, " {}", display_group(md, config));
+        let _ = write!(
+            out,
+            " {}",
+            pad_right(&display_group(md, config), padding.longest_group_len)
+        );
+    }
+
+    if config.context {
+        let _ = write!(
+            out,
+            " {}",
+            pad_right(&item.security_context, padding.longest_context_len)
+        );
     }
 
     // Author is only different from owner on GNU/Hurd, so we reuse
     // the owner, since GNU/Hurd is not currently supported by Rust.
     if config.long.author {
-        let _ = write!(out, " {}", display_uname(md, config));
+        let _ = write!(
+            out,
+            " {}",
+            pad_right(&display_uname(md, config), padding.longest_uname_len)
+        );
     }
 
     let _ = writeln!(
         out,
         " {} {} {}",
-        pad_left(display_size_or_rdev(md, config), max_size),
+        pad_left(&display_size_or_rdev(md, config), padding.longest_size_len),
         display_date(md, config),
         // unwrap is fine because it fails when metadata is not available
         // but we already know that it is because it's checked at the
         // start of the function.
-        display_file_name(item, config).unwrap().contents,
+        display_file_name(item, config, None).unwrap().contents,
     );
 }
 
@@ -1566,7 +1743,6 @@ fn get_inode(metadata: &Metadata) -> String {
 use std::sync::Mutex;
 #[cfg(unix)]
 use uucore::entries;
-use uucore::InvalidEncodingHandling;
 
 #[cfg(unix)]
 fn cached_uid2usr(uid: u32) -> String {
@@ -1590,7 +1766,7 @@ fn display_uname(metadata: &Metadata, config: &Config) -> String {
     }
 }
 
-#[cfg(unix)]
+#[cfg(all(unix, not(target_os = "redox")))]
 fn cached_gid2grp(gid: u32) -> String {
     lazy_static! {
         static ref GID_CACHE: Mutex<HashMap<u32, String>> = Mutex::new(HashMap::new());
@@ -1603,7 +1779,7 @@ fn cached_gid2grp(gid: u32) -> String {
         .clone()
 }
 
-#[cfg(unix)]
+#[cfg(all(unix, not(target_os = "redox")))]
 fn display_group(metadata: &Metadata, config: &Config) -> String {
     if config.long.numeric_uid_gid {
         metadata.gid().to_string()
@@ -1612,6 +1788,11 @@ fn display_group(metadata: &Metadata, config: &Config) -> String {
     }
 }
 
+#[cfg(target_os = "redox")]
+fn display_group(metadata: &Metadata, config: &Config) -> String {
+    metadata.gid().to_string()
+}
+
 #[cfg(not(unix))]
 fn display_uname(_metadata: &Metadata, _config: &Config) -> String {
     "somebody".to_string()
@@ -1762,17 +1943,31 @@ fn classify_file(path: &PathData) -> Option<char> {
     }
 }
 
-fn display_file_name(path: &PathData, config: &Config) -> Option<Cell> {
+/// Takes a [`PathData`] struct and returns a cell with a name ready for displaying.
+///
+/// This function relies on the following parameters in the provided `&Config`:
+/// * `config.quoting_style` to decide how we will escape `name` using [`escape_name`].
+/// * `config.inode` decides whether to display inode numbers beside names using [`get_inode`].
+/// * `config.color` decides whether it's going to color `name` using [`color_name`].
+/// * `config.indicator_style` to append specific characters to `name` using [`classify_file`].
+/// * `config.format` to display symlink targets if `Format::Long`. This function is also
+///   responsible for coloring symlink target names if `config.color` is specified.
+/// * `config.context` to prepend security context to `name` if compiled with `feat_selinux`.
+///
+/// Note that non-unicode sequences in symlink targets are dealt with using
+/// [`std::path::Path::to_string_lossy`].
+fn display_file_name(
+    path: &PathData,
+    config: &Config,
+    prefix_context: Option<usize>,
+) -> Option<Cell> {
+    // This is our return value. We start by `&path.display_name` and modify it along the way.
     let mut name = escape_name(&path.display_name, &config.quoting_style);
 
     #[cfg(unix)]
     {
         if config.format != Format::Long && config.inode {
-            name = path
-                .md()
-                .map_or_else(|| "?".to_string(), |md| get_inode(md))
-                + " "
-                + &name;
+            name = path.md().map_or_else(|| "?".to_string(), get_inode) + " " + &name;
         }
     }
 
@@ -1815,7 +2010,55 @@ fn display_file_name(path: &PathData, config: &Config) -> Option<Cell> {
     if config.format == Format::Long && path.file_type()?.is_symlink() {
         if let Ok(target) = path.p_buf.read_link() {
             name.push_str(" -> ");
-            name.push_str(&target.to_string_lossy());
+
+            // We might as well color the symlink output after the arrow.
+            // This makes extra system calls, but provides important information that
+            // people run `ls -l --color` are very interested in.
+            if let Some(ls_colors) = &config.color {
+                // We get the absolute path to be able to construct PathData with valid Metadata.
+                // This is because relative symlinks will fail to get_metadata.
+                let mut absolute_target = target.clone();
+                if target.is_relative() {
+                    if let Some(parent) = path.p_buf.parent() {
+                        absolute_target = parent.join(absolute_target);
+                    }
+                }
+
+                let target_data = PathData::new(absolute_target, None, None, config, false);
+
+                // If we have a symlink to a valid file, we use the metadata of said file.
+                // Because we use an absolute path, we can assume this is guaranteed to exist.
+                // Otherwise, we use path.md(), which will guarantee we color to the same
+                // color of non-existent symlinks according to style_for_path_with_metadata.
+                let target_metadata = match target_data.md() {
+                    Some(md) => md,
+                    None => path.md()?,
+                };
+
+                name.push_str(&color_name(
+                    ls_colors,
+                    &target_data.p_buf,
+                    target.to_string_lossy().into_owned(),
+                    target_metadata,
+                ));
+            } else {
+                // If no coloring is required, we just use target as is.
+                name.push_str(&target.to_string_lossy());
+            }
+        }
+    }
+
+    // Prepend the security context to the `name` and adjust `width` in order
+    // to get correct alignment from later calls to`display_grid()`.
+    if config.context {
+        if let Some(pad_count) = prefix_context {
+            let security_context = if !matches!(config.format, Format::Commas) {
+                pad_left(&path.security_context, pad_count)
+            } else {
+                path.security_context.to_owned()
+            };
+            name = format!("{} {}", security_context, name);
+            width += security_context.len() + 1;
         }
     }
 
@@ -1843,3 +2086,42 @@ fn display_symlink_count(_metadata: &Metadata) -> String {
 fn display_symlink_count(metadata: &Metadata) -> String {
     metadata.nlink().to_string()
 }
+
+// This returns the SELinux security context as UTF8 `String`.
+// In the long term this should be changed to `OsStr`, see discussions at #2621/#2656
+#[allow(unused_variables)]
+fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -> String {
+    let substitute_string = "?".to_string();
+    if config.selinux_supported {
+        #[cfg(feature = "selinux")]
+        {
+            match selinux::SecurityContext::of_path(p_buf, must_dereference, false) {
+                Err(_r) => {
+                    // TODO: show the actual reason why it failed
+                    show_warning!("failed to get security context of: {}", p_buf.quote());
+                    substitute_string
+                }
+                Ok(None) => substitute_string,
+                Ok(Some(context)) => {
+                    let context = context.as_bytes();
+
+                    let context = context.strip_suffix(&[0]).unwrap_or(context);
+                    String::from_utf8(context.to_vec()).unwrap_or_else(|e| {
+                        show_warning!(
+                            "getting security context of: {}: {}",
+                            p_buf.quote(),
+                            e.to_string()
+                        );
+                        String::from_utf8_lossy(context).into_owned()
+                    })
+                }
+            }
+        }
+        #[cfg(not(feature = "selinux"))]
+        {
+            substitute_string
+        }
+    } else {
+        substitute_string
+    }
+}
diff --git a/src/uu/ls/src/quoting_style.rs b/src/uu/ls/src/quoting_style.rs
index f9ba55f7b..149733cf9 100644
--- a/src/uu/ls/src/quoting_style.rs
+++ b/src/uu/ls/src/quoting_style.rs
@@ -1,6 +1,10 @@
 use std::char::from_digit;
+use std::ffi::OsStr;
 
-const SPECIAL_SHELL_CHARS: &str = "~`#$&*()|[]{};\\'\"<>?! ";
+// These are characters with special meaning in the shell (e.g. bash).
+// The first const contains characters that only have a special meaning when they appear at the beginning of a name.
+const SPECIAL_SHELL_CHARS_START: &[char] = &['~', '#'];
+const SPECIAL_SHELL_CHARS: &str = "`$&*()|[]{};\\'\"<>?! ";
 
 pub(super) enum QuotingStyle {
     Shell {
@@ -198,6 +202,8 @@ fn shell_without_escape(name: &str, quotes: Quotes, show_control_chars: bool) ->
             }
         }
     }
+
+    must_quote = must_quote || name.starts_with(SPECIAL_SHELL_CHARS_START);
     (escaped_str, must_quote)
 }
 
@@ -246,22 +252,25 @@ fn shell_with_escape(name: &str, quotes: Quotes) -> (String, bool) {
             }
         }
     }
+    must_quote = must_quote || name.starts_with(SPECIAL_SHELL_CHARS_START);
     (escaped_str, must_quote)
 }
 
-pub(super) fn escape_name(name: &str, style: &QuotingStyle) -> String {
+pub(super) fn escape_name(name: &OsStr, style: &QuotingStyle) -> String {
     match style {
         QuotingStyle::Literal { show_control } => {
             if !show_control {
-                name.chars()
+                name.to_string_lossy()
+                    .chars()
                     .flat_map(|c| EscapedChar::new_literal(c).hide_control())
                     .collect()
             } else {
-                name.into()
+                name.to_string_lossy().into_owned()
             }
         }
         QuotingStyle::C { quotes } => {
             let escaped_str: String = name
+                .to_string_lossy()
                 .chars()
                 .flat_map(|c| EscapedChar::new_c(c, *quotes))
                 .collect();
@@ -277,7 +286,8 @@ pub(super) fn escape_name(name: &str, style: &QuotingStyle) -> String {
             always_quote,
             show_control,
         } => {
-            let (quotes, must_quote) = if name.contains('"') {
+            let name = name.to_string_lossy();
+            let (quotes, must_quote) = if name.contains(&['"', '`', '$', '\\'][..]) {
                 (Quotes::Single, true)
             } else if name.contains('\'') {
                 (Quotes::Double, true)
@@ -288,9 +298,9 @@ pub(super) fn escape_name(name: &str, style: &QuotingStyle) -> String {
             };
 
             let (escaped_str, contains_quote_chars) = if *escape {
-                shell_with_escape(name, quotes)
+                shell_with_escape(&name, quotes)
             } else {
-                shell_without_escape(name, quotes, *show_control)
+                shell_without_escape(&name, quotes, *show_control)
             };
 
             match (must_quote | contains_quote_chars, quotes) {
@@ -356,7 +366,7 @@ mod tests {
     fn check_names(name: &str, map: Vec<(&str, &str)>) {
         assert_eq!(
             map.iter()
-                .map(|(_, style)| escape_name(name, &get_style(style)))
+                .map(|(_, style)| escape_name(name.as_ref(), &get_style(style)))
                 .collect::<Vec<String>>(),
             map.iter()
                 .map(|(correct, _)| correct.to_string())
@@ -659,4 +669,62 @@ mod tests {
             ],
         );
     }
+
+    #[test]
+    fn test_tilde_and_hash() {
+        check_names("~", vec![("'~'", "shell"), ("'~'", "shell-escape")]);
+        check_names(
+            "~name",
+            vec![("'~name'", "shell"), ("'~name'", "shell-escape")],
+        );
+        check_names(
+            "some~name",
+            vec![("some~name", "shell"), ("some~name", "shell-escape")],
+        );
+        check_names("name~", vec![("name~", "shell"), ("name~", "shell-escape")]);
+
+        check_names("#", vec![("'#'", "shell"), ("'#'", "shell-escape")]);
+        check_names(
+            "#name",
+            vec![("'#name'", "shell"), ("'#name'", "shell-escape")],
+        );
+        check_names(
+            "some#name",
+            vec![("some#name", "shell"), ("some#name", "shell-escape")],
+        );
+        check_names("name#", vec![("name#", "shell"), ("name#", "shell-escape")]);
+    }
+
+    #[test]
+    fn test_special_chars_in_double_quotes() {
+        check_names(
+            "can'$t",
+            vec![
+                ("'can'\\''$t'", "shell"),
+                ("'can'\\''$t'", "shell-always"),
+                ("'can'\\''$t'", "shell-escape"),
+                ("'can'\\''$t'", "shell-escape-always"),
+            ],
+        );
+
+        check_names(
+            "can'`t",
+            vec![
+                ("'can'\\''`t'", "shell"),
+                ("'can'\\''`t'", "shell-always"),
+                ("'can'\\''`t'", "shell-escape"),
+                ("'can'\\''`t'", "shell-escape-always"),
+            ],
+        );
+
+        check_names(
+            "can'\\t",
+            vec![
+                ("'can'\\''\\t'", "shell"),
+                ("'can'\\''\\t'", "shell-always"),
+                ("'can'\\''\\t'", "shell-escape"),
+                ("'can'\\''\\t'", "shell-escape-always"),
+            ],
+        );
+    }
 }
diff --git a/src/uu/mkdir/Cargo.toml b/src/uu/mkdir/Cargo.toml
index 011d70af0..c0e6586ab 100644
--- a/src/uu/mkdir/Cargo.toml
+++ b/src/uu/mkdir/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_mkdir"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "mkdir ~ (uutils) create DIRECTORY"
@@ -17,8 +17,8 @@ path = "src/mkdir.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs", "mode"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs", "mode"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "mkdir"
diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs
index a99867570..9ff816dcb 100644
--- a/src/uu/mkdir/src/mkdir.rs
+++ b/src/uu/mkdir/src/mkdir.rs
@@ -5,14 +5,22 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
+// spell-checker:ignore (ToDO) ugoa cmode
+
 #[macro_use]
 extern crate uucore;
 
 use clap::OsValues;
-use clap::{crate_version, App, Arg};
+use clap::{crate_version, App, Arg, ArgMatches};
 use std::fs;
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult, USimpleError};
+#[cfg(not(windows))]
+use uucore::mode;
+use uucore::InvalidEncodingHandling;
+
+static DEFAULT_PERM: u32 = 0o755;
 
 static ABOUT: &str = "Create the given DIRECTORY(ies) if they do not exist";
 mod options {
@@ -22,36 +30,88 @@ mod options {
     pub const DIRS: &str = "dirs";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [USER]", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [USER]", uucore::execution_phrase())
+}
+fn get_long_usage() -> String {
+    String::from("Each MODE is of the form '[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=]?[0-7]+'.")
+}
+
+#[cfg(windows)]
+fn get_mode(_matches: &ArgMatches, _mode_had_minus_prefix: bool) -> Result<u32, String> {
+    Ok(DEFAULT_PERM)
+}
+
+#[cfg(not(windows))]
+fn get_mode(matches: &ArgMatches, mode_had_minus_prefix: bool) -> Result<u32, String> {
+    let digits: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+    // Translate a ~str in octal form to u16, default to 755
+    // Not tested on Windows
+    let mut new_mode = DEFAULT_PERM;
+    match matches.value_of(options::MODE) {
+        Some(m) => {
+            for mode in m.split(',') {
+                if mode.contains(digits) {
+                    new_mode = mode::parse_numeric(new_mode, m, true)?;
+                } else {
+                    let cmode = if mode_had_minus_prefix {
+                        // clap parsing is finished, now put prefix back
+                        format!("-{}", mode)
+                    } else {
+                        mode.to_string()
+                    };
+                    new_mode = mode::parse_symbolic(new_mode, &cmode, mode::get_umask(), true)?;
+                }
+            }
+            Ok(new_mode)
+        }
+        None => Ok(DEFAULT_PERM),
+    }
+}
+
+#[cfg(windows)]
+fn strip_minus_from_mode(_args: &mut Vec<String>) -> bool {
+    false
+}
+
+#[cfg(not(windows))]
+fn strip_minus_from_mode(args: &mut Vec<String>) -> bool {
+    mode::strip_minus_from_mode(args)
 }
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
+    let mut args = args
+        .collect_str(InvalidEncodingHandling::ConvertLossy)
+        .accept_any();
+
+    // Before we can parse 'args' with clap (and previously getopts),
+    // a possible MODE prefix '-' needs to be removed (e.g. "chmod -x FILE").
+    let mode_had_minus_prefix = strip_minus_from_mode(&mut args);
+
+    let usage = usage();
+    let after_help = get_long_usage();
 
     // Linux-specific options, not implemented
     // opts.optflag("Z", "context", "set SELinux security context" +
     // " of each created directory to CTX"),
-    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
+    let matches = uu_app()
+        .usage(&usage[..])
+        .after_help(&after_help[..])
+        .get_matches_from(args);
 
     let dirs = matches.values_of_os(options::DIRS).unwrap_or_default();
     let verbose = matches.is_present(options::VERBOSE);
     let recursive = matches.is_present(options::PARENTS);
 
-    // Translate a ~str in octal form to u16, default to 755
-    // Not tested on Windows
-    let mode: u16 = match matches.value_of(options::MODE) {
-        Some(m) => u16::from_str_radix(m, 8)
-            .map_err(|_| USimpleError::new(1, format!("invalid mode '{}'", m)))?,
-        None => 0o755_u16,
-    };
-
-    exec(dirs, recursive, mode, verbose)
+    match get_mode(&matches, mode_had_minus_prefix) {
+        Ok(mode) => exec(dirs, recursive, mode, verbose),
+        Err(f) => Err(USimpleError::new(1, f)),
+    }
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -85,7 +145,7 @@ pub fn uu_app() -> App<'static, 'static> {
 /**
  * Create the list of new directories
  */
-fn exec(dirs: OsValues, recursive: bool, mode: u16, verbose: bool) -> UResult<()> {
+fn exec(dirs: OsValues, recursive: bool, mode: u32, verbose: bool) -> UResult<()> {
     for dir in dirs {
         let path = Path::new(dir);
         show_if_err!(mkdir(path, recursive, mode, verbose));
@@ -93,35 +153,39 @@ fn exec(dirs: OsValues, recursive: bool, mode: u16, verbose: bool) -> UResult<()
     Ok(())
 }
 
-fn mkdir(path: &Path, recursive: bool, mode: u16, verbose: bool) -> UResult<()> {
+fn mkdir(path: &Path, recursive: bool, mode: u32, verbose: bool) -> UResult<()> {
     let create_dir = if recursive {
         fs::create_dir_all
     } else {
         fs::create_dir
     };
 
-    create_dir(path).map_err_context(|| format!("cannot create directory '{}'", path.display()))?;
+    create_dir(path).map_err_context(|| format!("cannot create directory {}", path.quote()))?;
 
     if verbose {
-        println!("{}: created directory '{}'", executable!(), path.display());
+        println!(
+            "{}: created directory {}",
+            uucore::util_name(),
+            path.quote()
+        );
     }
 
     chmod(path, mode)
 }
 
 #[cfg(any(unix, target_os = "redox"))]
-fn chmod(path: &Path, mode: u16) -> UResult<()> {
+fn chmod(path: &Path, mode: u32) -> UResult<()> {
     use std::fs::{set_permissions, Permissions};
     use std::os::unix::fs::PermissionsExt;
 
-    let mode = Permissions::from_mode(u32::from(mode));
+    let mode = Permissions::from_mode(mode);
 
     set_permissions(path, mode)
-        .map_err_context(|| format!("cannot set permissions '{}'", path.display()))
+        .map_err_context(|| format!("cannot set permissions {}", path.quote()))
 }
 
 #[cfg(windows)]
-fn chmod(_path: &Path, _mode: u16) -> UResult<()> {
+fn chmod(_path: &Path, _mode: u32) -> UResult<()> {
     // chmod on Windows only sets the readonly flag, which isn't even honored on directories
     Ok(())
 }
diff --git a/src/uu/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml
index 01d6bad64..acf38f6bc 100644
--- a/src/uu/mkfifo/Cargo.toml
+++ b/src/uu/mkfifo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_mkfifo"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "mkfifo ~ (uutils) create FIFOs (named pipes)"
@@ -17,8 +17,8 @@ path = "src/mkfifo.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "mkfifo"
diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs
index ea0906567..66c3f7bb6 100644
--- a/src/uu/mkfifo/src/mkfifo.rs
+++ b/src/uu/mkfifo/src/mkfifo.rs
@@ -11,7 +11,7 @@ extern crate uucore;
 use clap::{crate_version, App, Arg};
 use libc::mkfifo;
 use std::ffi::CString;
-use uucore::InvalidEncodingHandling;
+use uucore::{display::Quotable, InvalidEncodingHandling};
 
 static NAME: &str = "mkfifo";
 static USAGE: &str = "mkfifo [OPTION]... NAME...";
@@ -61,7 +61,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             mkfifo(name.as_ptr(), mode as libc::mode_t)
         };
         if err == -1 {
-            show_error!("cannot create fifo '{}': File exists", f);
+            show_error!("cannot create fifo {}: File exists", f.quote());
             exit_code = 1;
         }
     }
@@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(USAGE)
diff --git a/src/uu/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml
index e6073d50c..046e4b8d0 100644
--- a/src/uu/mknod/Cargo.toml
+++ b/src/uu/mknod/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_mknod"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "mknod ~ (uutils) create special file NAME of TYPE"
@@ -18,8 +18,8 @@ path = "src/mknod.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "^0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["mode"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["mode"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "mknod"
diff --git a/src/uu/mknod/src/mknod.rs b/src/uu/mknod/src/mknod.rs
index 8cc7db908..dd529c3ba 100644
--- a/src/uu/mknod/src/mknod.rs
+++ b/src/uu/mknod/src/mknod.rs
@@ -16,9 +16,9 @@ use clap::{crate_version, App, Arg, ArgMatches};
 use libc::{dev_t, mode_t};
 use libc::{S_IFBLK, S_IFCHR, S_IFIFO, S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR};
 
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
-static NAME: &str = "mknod";
 static ABOUT: &str = "Create the special file NAME of the given TYPE.";
 static USAGE: &str = "mknod [OPTION]... NAME TYPE [MAJOR MINOR]";
 static LONG_HELP: &str = "Mandatory arguments to long options are mandatory for short options too.
@@ -72,7 +72,8 @@ fn _mknod(file_name: &str, mode: mode_t, dev: dev_t) -> i32 {
         }
 
         if errno == -1 {
-            let c_str = CString::new(NAME).expect("Failed to convert to CString");
+            let c_str = CString::new(uucore::execution_phrase().as_bytes())
+                .expect("Failed to convert to CString");
             // shows the error from the mknod syscall
             libc::perror(c_str.as_ptr());
         }
@@ -113,7 +114,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     if ch == 'p' {
         if matches.is_present("major") || matches.is_present("minor") {
             eprintln!("Fifos do not have major and minor device numbers.");
-            eprintln!("Try '{} --help' for more information.", NAME);
+            eprintln!(
+                "Try '{} --help' for more information.",
+                uucore::execution_phrase()
+            );
             1
         } else {
             _mknod(file_name, S_IFIFO | mode, 0)
@@ -122,7 +126,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         match (matches.value_of("major"), matches.value_of("minor")) {
             (None, None) | (_, None) | (None, _) => {
                 eprintln!("Special files require major and minor device numbers.");
-                eprintln!("Try '{} --help' for more information.", NAME);
+                eprintln!(
+                    "Try '{} --help' for more information.",
+                    uucore::execution_phrase()
+                );
                 1
             }
             (Some(major), Some(minor)) => {
@@ -145,7 +152,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .usage(USAGE)
         .after_help(LONG_HELP)
@@ -213,7 +220,7 @@ fn valid_type(tpe: String) -> Result<(), String> {
             if vec!['b', 'c', 'u', 'p'].contains(&first_char) {
                 Ok(())
             } else {
-                Err(format!("invalid device type '{}'", tpe))
+                Err(format!("invalid device type {}", tpe.quote()))
             }
         })
 }
diff --git a/src/uu/mktemp/Cargo.toml b/src/uu/mktemp/Cargo.toml
index 4c9a8d29c..de896dba7 100644
--- a/src/uu/mktemp/Cargo.toml
+++ b/src/uu/mktemp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_mktemp"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "mktemp ~ (uutils) create and display a temporary file or directory from TEMPLATE"
@@ -18,8 +18,8 @@ path = "src/mktemp.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 rand = "0.5"
 tempfile = "3.1"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "mktemp"
diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs
index 8a4b472aa..4318f0ad6 100644
--- a/src/uu/mktemp/src/mktemp.rs
+++ b/src/uu/mktemp/src/mktemp.rs
@@ -8,11 +8,9 @@
 
 // spell-checker:ignore (paths) GPGHome
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
-use uucore::error::{FromIo, UCustomError, UResult};
+use uucore::display::{println_verbatim, Quotable};
+use uucore::error::{FromIo, UError, UResult};
 
 use std::env;
 use std::error::Error;
@@ -36,8 +34,8 @@ static OPT_T: &str = "t";
 
 static ARG_TEMPLATE: &str = "template";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [TEMPLATE]", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [TEMPLATE]", uucore::execution_phrase())
 }
 
 #[derive(Debug)]
@@ -49,7 +47,7 @@ enum MkTempError {
     InvalidTemplate(String),
 }
 
-impl UCustomError for MkTempError {}
+impl UError for MkTempError {}
 
 impl Error for MkTempError {}
 
@@ -57,16 +55,20 @@ impl Display for MkTempError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         use MkTempError::*;
         match self {
-            PersistError(p) => write!(f, "could not persist file '{}'", p.display()),
-            MustEndInX(s) => write!(f, "with --suffix, template '{}' must end in X", s),
-            TooFewXs(s) => write!(f, "too few X's in template '{}'", s),
+            PersistError(p) => write!(f, "could not persist file {}", p.quote()),
+            MustEndInX(s) => write!(f, "with --suffix, template {} must end in X", s.quote()),
+            TooFewXs(s) => write!(f, "too few X's in template {}", s.quote()),
             ContainsDirSeparator(s) => {
-                write!(f, "invalid suffix '{}', contains directory separator", s)
+                write!(
+                    f,
+                    "invalid suffix {}, contains directory separator",
+                    s.quote()
+                )
             }
             InvalidTemplate(s) => write!(
                 f,
-                "invalid template, '{}'; with --tmpdir, it may not be absolute",
-                s
+                "invalid template, {}; with --tmpdir, it may not be absolute",
+                s.quote()
             ),
         }
     }
@@ -74,7 +76,7 @@ impl Display for MkTempError {
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -134,7 +136,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -224,28 +226,26 @@ fn parse_template<'a>(
 
 pub fn dry_exec(mut tmpdir: PathBuf, prefix: &str, rand: usize, suffix: &str) -> UResult<()> {
     let len = prefix.len() + suffix.len() + rand;
-    let mut buf = String::with_capacity(len);
-    buf.push_str(prefix);
-    buf.extend(iter::repeat('X').take(rand));
-    buf.push_str(suffix);
+    let mut buf = Vec::with_capacity(len);
+    buf.extend(prefix.as_bytes());
+    buf.extend(iter::repeat(b'X').take(rand));
+    buf.extend(suffix.as_bytes());
 
     // Randomize.
-    unsafe {
-        // We guarantee utf8.
-        let bytes = &mut buf.as_mut_vec()[prefix.len()..prefix.len() + rand];
-        rand::thread_rng().fill(bytes);
-        for byte in bytes.iter_mut() {
-            *byte = match *byte % 62 {
-                v @ 0..=9 => (v + b'0'),
-                v @ 10..=35 => (v - 10 + b'a'),
-                v @ 36..=61 => (v - 36 + b'A'),
-                _ => unreachable!(),
-            }
+    let bytes = &mut buf[prefix.len()..prefix.len() + rand];
+    rand::thread_rng().fill(bytes);
+    for byte in bytes.iter_mut() {
+        *byte = match *byte % 62 {
+            v @ 0..=9 => (v + b'0'),
+            v @ 10..=35 => (v - 10 + b'a'),
+            v @ 36..=61 => (v - 36 + b'A'),
+            _ => unreachable!(),
         }
     }
+    // We guarantee utf8.
+    let buf = String::from_utf8(buf).unwrap();
     tmpdir.push(buf);
-    println!("{}", tmpdir.display());
-    Ok(())
+    println_verbatim(tmpdir).map_err_context(|| "failed to print directory name".to_owned())
 }
 
 fn exec(dir: PathBuf, prefix: &str, rand: usize, suffix: &str, make_dir: bool) -> UResult<()> {
@@ -274,6 +274,5 @@ fn exec(dir: PathBuf, prefix: &str, rand: usize, suffix: &str, make_dir: bool) -
             .map_err(|e| MkTempError::PersistError(e.file.path().to_path_buf()))?
             .1
     };
-    println!("{}", path.display());
-    Ok(())
+    println_verbatim(path).map_err_context(|| "failed to print directory name".to_owned())
 }
diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml
index 03866d187..0111376f9 100644
--- a/src/uu/more/Cargo.toml
+++ b/src/uu/more/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_more"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "more ~ (uutils) input perusal filter"
@@ -17,7 +17,7 @@ path = "src/more.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 uucore = { version = ">=0.0.7", package = "uucore", path = "../../uucore" }
-uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" }
+uucore_procs = { version=">=0.0.7", package = "uucore_procs", path = "../../uucore_procs" }
 crossterm = ">=0.19"
 atty = "0.2"
 unicode-width = "0.1.7"
@@ -25,11 +25,15 @@ unicode-segmentation = "1.7.1"
 
 [target.'cfg(target_os = "redox")'.dependencies]
 redox_termios = "0.1"
-redox_syscall = "0.1"
+redox_syscall = "0.2"
 
 [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
-nix = "<=0.13"
+nix = "0.19"
 
 [[bin]]
 name = "more"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs
index ecc779ba6..d424d5a77 100644
--- a/src/uu/more/src/more.rs
+++ b/src/uu/more/src/more.rs
@@ -30,6 +30,7 @@ use crossterm::{
 
 use unicode_segmentation::UnicodeSegmentation;
 use unicode_width::UnicodeWidthStr;
+use uucore::display::Quotable;
 
 const BELL: &str = "\x07";
 
@@ -64,12 +65,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             let file = Path::new(file);
             if file.is_dir() {
                 terminal::disable_raw_mode().unwrap();
-                show_usage_error!("'{}' is a directory.", file.display());
+                show_usage_error!("{} is a directory.", file.quote());
                 return 1;
             }
             if !file.exists() {
                 terminal::disable_raw_mode().unwrap();
-                show_error!("cannot open {}: No such file or directory", file.display());
+                show_error!("cannot open {}: No such file or directory", file.quote());
                 return 1;
             }
             if length > 1 {
@@ -93,7 +94,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .about("A file perusal filter for CRT viewing.")
         .version(crate_version!())
         .arg(
@@ -209,7 +210,7 @@ fn reset_term(stdout: &mut std::io::Stdout) {
 #[inline(always)]
 fn reset_term(_: &mut usize) {}
 
-fn more(buff: &str, mut stdout: &mut Stdout, next_file: Option<&str>, silent: bool) {
+fn more(buff: &str, stdout: &mut Stdout, next_file: Option<&str>, silent: bool) {
     let (cols, rows) = terminal::size().unwrap();
     let lines = break_buff(buff, usize::from(cols));
 
@@ -231,7 +232,7 @@ fn more(buff: &str, mut stdout: &mut Stdout, next_file: Option<&str>, silent: bo
                     code: KeyCode::Char('c'),
                     modifiers: KeyModifiers::CONTROL,
                 }) => {
-                    reset_term(&mut stdout);
+                    reset_term(stdout);
                     std::process::exit(0);
                 }
                 Event::Key(KeyEvent {
diff --git a/src/uu/mv/Cargo.toml b/src/uu/mv/Cargo.toml
index 9af0cb2a3..6dd129af9 100644
--- a/src/uu/mv/Cargo.toml
+++ b/src/uu/mv/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_mv"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "mv ~ (uutils) move (rename) SOURCE to DESTINATION"
@@ -17,9 +17,13 @@ path = "src/mv.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 fs_extra = "1.1.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "mv"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs
index 166e8cb1a..9d23f86de 100644
--- a/src/uu/mv/src/mv.rs
+++ b/src/uu/mv/src/mv.rs
@@ -21,6 +21,7 @@ use std::os::unix;
 use std::os::windows;
 use std::path::{Path, PathBuf};
 use uucore::backup_control::{self, BackupMode};
+use uucore::display::Quotable;
 
 use fs_extra::dir::{move_dir, CopyOptions as DirCopyOptions};
 
@@ -44,13 +45,10 @@ pub enum OverwriteMode {
 static ABOUT: &str = "Move SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.";
 static LONG_HELP: &str = "";
 
-static OPT_BACKUP: &str = "backup";
-static OPT_BACKUP_NO_ARG: &str = "b";
 static OPT_FORCE: &str = "force";
 static OPT_INTERACTIVE: &str = "interactive";
 static OPT_NO_CLOBBER: &str = "no-clobber";
 static OPT_STRIP_TRAILING_SLASHES: &str = "strip-trailing-slashes";
-static OPT_SUFFIX: &str = "suffix";
 static OPT_TARGET_DIRECTORY: &str = "target-directory";
 static OPT_NO_TARGET_DIRECTORY: &str = "no-target-directory";
 static OPT_UPDATE: &str = "update";
@@ -58,17 +56,17 @@ static OPT_VERBOSE: &str = "verbose";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... [-T] SOURCE DEST
 {0} [OPTION]... SOURCE... DIRECTORY
 {0} [OPTION]... -t DIRECTORY SOURCE...",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app()
         .after_help(&*format!(
@@ -85,14 +83,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .unwrap_or_default();
 
     let overwrite_mode = determine_overwrite_mode(&matches);
-    let backup_mode = backup_control::determine_backup_mode(
-        matches.is_present(OPT_BACKUP_NO_ARG),
-        matches.is_present(OPT_BACKUP),
-        matches.value_of(OPT_BACKUP),
-    );
-    let backup_mode = match backup_mode {
-        Err(err) => {
-            show_usage_error!("{}", err);
+    let backup_mode = match backup_control::determine_backup_mode(&matches) {
+        Err(e) => {
+            show!(e);
             return 1;
         }
         Ok(mode) => mode,
@@ -103,7 +96,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         return 1;
     }
 
-    let backup_suffix = backup_control::determine_backup_suffix(matches.value_of(OPT_SUFFIX));
+    let backup_suffix = backup_control::determine_backup_suffix(&matches);
 
     let behavior = Behavior {
         overwrite: overwrite_mode,
@@ -133,22 +126,14 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
     .arg(
-            Arg::with_name(OPT_BACKUP)
-            .long(OPT_BACKUP)
-            .help("make a backup of each existing destination file")
-            .takes_value(true)
-            .require_equals(true)
-            .min_values(0)
-            .value_name("CONTROL")
+        backup_control::arguments::backup()
     )
     .arg(
-            Arg::with_name(OPT_BACKUP_NO_ARG)
-            .short(OPT_BACKUP_NO_ARG)
-            .help("like --backup but does not accept an argument")
+        backup_control::arguments::backup_no_args()
     )
     .arg(
             Arg::with_name(OPT_FORCE)
@@ -173,12 +158,7 @@ pub fn uu_app() -> App<'static, 'static> {
             .help("remove any trailing slashes from each SOURCE argument")
     )
     .arg(
-            Arg::with_name(OPT_SUFFIX)
-            .short("S")
-            .long(OPT_SUFFIX)
-            .help("override the usual backup suffix")
-            .takes_value(true)
-            .value_name("SUFFIX")
+        backup_control::arguments::suffix()
     )
     .arg(
         Arg::with_name(OPT_TARGET_DIRECTORY)
@@ -244,10 +224,7 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
             // `Ok()` results unless the source does not exist, or the user
             // lacks permission to access metadata.
             if source.symlink_metadata().is_err() {
-                show_error!(
-                    "cannot stat '{}': No such file or directory",
-                    source.display()
-                );
+                show_error!("cannot stat {}: No such file or directory", source.quote());
                 return 1;
             }
 
@@ -255,8 +232,8 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
                 if b.no_target_dir {
                     if !source.is_dir() {
                         show_error!(
-                            "cannot overwrite directory '{}' with non-directory",
-                            target.display()
+                            "cannot overwrite directory {} with non-directory",
+                            target.quote()
                         );
                         return 1;
                     }
@@ -264,9 +241,9 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
                     return match rename(source, target, &b) {
                         Err(e) => {
                             show_error!(
-                                "cannot move '{}' to '{}': {}",
-                                source.display(),
-                                target.display(),
+                                "cannot move {} to {}: {}",
+                                source.quote(),
+                                target.quote(),
                                 e.to_string()
                             );
                             1
@@ -278,9 +255,9 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
                 return move_files_into_dir(&[source.clone()], target, &b);
             } else if target.exists() && source.is_dir() {
                 show_error!(
-                    "cannot overwrite non-directory '{}' with directory '{}'",
-                    target.display(),
-                    source.display()
+                    "cannot overwrite non-directory {} with directory {}",
+                    target.quote(),
+                    source.quote()
                 );
                 return 1;
             }
@@ -293,10 +270,10 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
         _ => {
             if b.no_target_dir {
                 show_error!(
-                    "mv: extra operand '{}'\n\
+                    "mv: extra operand {}\n\
                      Try '{} --help' for more information.",
-                    files[2].display(),
-                    executable!()
+                    files[2].quote(),
+                    uucore::execution_phrase()
                 );
                 return 1;
             }
@@ -309,7 +286,7 @@ fn exec(files: &[PathBuf], b: Behavior) -> i32 {
 
 fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> i32 {
     if !target_dir.is_dir() {
-        show_error!("target '{}' is not a directory", target_dir.display());
+        show_error!("target {} is not a directory", target_dir.quote());
         return 1;
     }
 
@@ -319,8 +296,8 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> i3
             Some(name) => target_dir.join(name),
             None => {
                 show_error!(
-                    "cannot stat '{}': No such file or directory",
-                    sourcepath.display()
+                    "cannot stat {}: No such file or directory",
+                    sourcepath.quote()
                 );
 
                 all_successful = false;
@@ -330,9 +307,9 @@ fn move_files_into_dir(files: &[PathBuf], target_dir: &Path, b: &Behavior) -> i3
 
         if let Err(e) = rename(sourcepath, &targetpath, b) {
             show_error!(
-                "cannot move '{}' to '{}': {}",
-                sourcepath.display(),
-                targetpath.display(),
+                "cannot move {} to {}: {}",
+                sourcepath.quote(),
+                targetpath.quote(),
                 e.to_string()
             );
             all_successful = false;
@@ -353,7 +330,7 @@ fn rename(from: &Path, to: &Path, b: &Behavior) -> io::Result<()> {
         match b.overwrite {
             OverwriteMode::NoClobber => return Ok(()),
             OverwriteMode::Interactive => {
-                println!("{}: overwrite '{}'? ", executable!(), to.display());
+                println!("{}: overwrite {}? ", uucore::util_name(), to.quote());
                 if !read_yes() {
                     return Ok(());
                 }
@@ -386,9 +363,9 @@ fn rename(from: &Path, to: &Path, b: &Behavior) -> io::Result<()> {
     rename_with_fallback(from, to)?;
 
     if b.verbose {
-        print!("'{}' -> '{}'", from.display(), to.display());
+        print!("{} -> {}", from.quote(), to.quote());
         match backup_path {
-            Some(path) => println!(" (backup: '{}')", path.display()),
+            Some(path) => println!(" (backup: {})", path.quote()),
             None => println!(),
         }
     }
diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml
index 31c310790..ac719a768 100644
--- a/src/uu/nice/Cargo.toml
+++ b/src/uu/nice/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_nice"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "nice ~ (uutils) run PROGRAM with modified scheduling priority"
@@ -17,9 +17,9 @@ path = "src/nice.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-nix = { version="<=0.13" }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+nix = "0.20"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "nice"
diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs
index d5a4094d1..fbc2be0e5 100644
--- a/src/uu/nice/src/nice.rs
+++ b/src/uu/nice/src/nice.rs
@@ -10,27 +10,19 @@
 #[macro_use]
 extern crate uucore;
 
-use libc::{c_char, c_int, execvp};
+use libc::{c_char, c_int, execvp, PRIO_PROCESS};
 use std::ffi::CString;
 use std::io::Error;
 use std::ptr;
 
 use clap::{crate_version, App, AppSettings, Arg};
 
-// XXX: PRIO_PROCESS is 0 on at least FreeBSD and Linux.  Don't know about Mac OS X.
-const PRIO_PROCESS: c_int = 0;
-
-extern "C" {
-    fn getpriority(which: c_int, who: c_int) -> c_int;
-    fn setpriority(which: c_int, who: c_int, prio: c_int) -> c_int;
-}
-
 pub mod options {
     pub static ADJUSTMENT: &str = "adjustment";
     pub static COMMAND: &str = "COMMAND";
 }
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "
   {0} [OPTIONS] [COMMAND [ARGS]]
@@ -39,18 +31,18 @@ Run COMMAND with an adjusted niceness, which affects process scheduling.
 With no COMMAND, print the current niceness.  Niceness values range from at
 least -20 (most favorable to the process) to 19 (least favorable to the
 process).",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let mut niceness = unsafe {
         nix::errno::Errno::clear();
-        getpriority(PRIO_PROCESS, 0)
+        libc::getpriority(PRIO_PROCESS, 0)
     };
     if Error::last_os_error().raw_os_error().unwrap() != 0 {
         show_error!("getpriority: {}", Error::last_os_error());
@@ -61,8 +53,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         Some(nstr) => {
             if !matches.is_present(options::COMMAND) {
                 show_error!(
-                    "A command must be given with an adjustment.\nTry \"{} --help\" for more information.",
-                    executable!()
+                    "A command must be given with an adjustment.\nTry '{} --help' for more information.",
+                    uucore::execution_phrase()
                 );
                 return 125;
             }
@@ -84,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     };
 
     niceness += adjustment;
-    if unsafe { setpriority(PRIO_PROCESS, 0, niceness) } == -1 {
+    if unsafe { libc::setpriority(PRIO_PROCESS, 0, niceness) } == -1 {
         show_warning!("setpriority: {}", Error::last_os_error());
     }
 
@@ -109,7 +101,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .setting(AppSettings::TrailingVarArg)
         .version(crate_version!())
         .arg(
diff --git a/src/uu/nl/Cargo.toml b/src/uu/nl/Cargo.toml
index 57676768f..781f6502d 100644
--- a/src/uu/nl/Cargo.toml
+++ b/src/uu/nl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_nl"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "nl ~ (uutils) display input with added line numbers"
@@ -21,9 +21,13 @@ libc = "0.2.42"
 memchr = "2.2.0"
 regex = "1.0.1"
 regex-syntax = "0.6.7"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "nl"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs
index 81e76aa26..600ebace0 100644
--- a/src/uu/nl/src/nl.rs
+++ b/src/uu/nl/src/nl.rs
@@ -143,7 +143,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(USAGE)
diff --git a/src/uu/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml
index d7de60b0b..c2f3c329e 100644
--- a/src/uu/nohup/Cargo.toml
+++ b/src/uu/nohup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_nohup"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "nohup ~ (uutils) run COMMAND, ignoring hangup signals"
@@ -18,8 +18,8 @@ path = "src/nohup.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 atty = "0.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "nohup"
diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs
index acc101e4e..d83170ae8 100644
--- a/src/uu/nohup/src/nohup.rs
+++ b/src/uu/nohup/src/nohup.rs
@@ -19,6 +19,7 @@ use std::fs::{File, OpenOptions};
 use std::io::Error;
 use std::os::unix::prelude::*;
 use std::path::{Path, PathBuf};
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static ABOUT: &str = "Run COMMAND ignoring hangup signals.";
@@ -40,7 +41,7 @@ mod options {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -71,7 +72,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
@@ -122,13 +123,16 @@ fn find_stdout() -> File {
         .open(Path::new(NOHUP_OUT))
     {
         Ok(t) => {
-            show_error!("ignoring input and appending output to '{}'", NOHUP_OUT);
+            show_error!(
+                "ignoring input and appending output to {}",
+                NOHUP_OUT.quote()
+            );
             t
         }
         Err(e1) => {
             let home = match env::var("HOME") {
                 Err(_) => {
-                    show_error!("failed to open '{}': {}", NOHUP_OUT, e1);
+                    show_error!("failed to open {}: {}", NOHUP_OUT.quote(), e1);
                     exit!(internal_failure_code)
                 }
                 Ok(h) => h,
@@ -143,12 +147,15 @@ fn find_stdout() -> File {
                 .open(&homeout)
             {
                 Ok(t) => {
-                    show_error!("ignoring input and appending output to '{}'", homeout_str);
+                    show_error!(
+                        "ignoring input and appending output to {}",
+                        homeout_str.quote()
+                    );
                     t
                 }
                 Err(e2) => {
-                    show_error!("failed to open '{}': {}", NOHUP_OUT, e1);
-                    show_error!("failed to open '{}': {}", homeout_str, e2);
+                    show_error!("failed to open {}: {}", NOHUP_OUT.quote(), e1);
+                    show_error!("failed to open {}: {}", homeout_str.quote(), e2);
                     exit!(internal_failure_code)
                 }
             }
@@ -156,8 +163,11 @@ fn find_stdout() -> File {
     }
 }
 
-fn get_usage() -> String {
-    format!("{0} COMMAND [ARG]...\n    {0} FLAG", executable!())
+fn usage() -> String {
+    format!(
+        "{0} COMMAND [ARG]...\n    {0} FLAG",
+        uucore::execution_phrase()
+    )
 }
 
 #[cfg(target_vendor = "apple")]
diff --git a/src/uu/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml
index e02bec7e1..3c44062bd 100644
--- a/src/uu/nproc/Cargo.toml
+++ b/src/uu/nproc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_nproc"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "nproc ~ (uutils) display the number of processing units available"
@@ -18,8 +18,8 @@ path = "src/nproc.rs"
 libc = "0.2.42"
 num_cpus = "1.10"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "nproc"
diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs
index 1f284685b..16b8d8c3a 100644
--- a/src/uu/nproc/src/nproc.rs
+++ b/src/uu/nproc/src/nproc.rs
@@ -27,12 +27,12 @@ static OPT_IGNORE: &str = "ignore";
 
 static ABOUT: &str = "Print the number of cores available to the current process.";
 
-fn get_usage() -> String {
-    format!("{0} [OPTIONS]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTIONS]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let mut ignore = match matches.value_of(OPT_IGNORE) {
@@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/numfmt/Cargo.toml b/src/uu/numfmt/Cargo.toml
index a3bdcf261..60bfb3b14 100644
--- a/src/uu/numfmt/Cargo.toml
+++ b/src/uu/numfmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_numfmt"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "numfmt ~ (uutils) reformat NUMBER"
@@ -16,9 +16,13 @@ path = "src/numfmt.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "numfmt"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/numfmt/src/format.rs b/src/uu/numfmt/src/format.rs
index e44446818..bdee83e12 100644
--- a/src/uu/numfmt/src/format.rs
+++ b/src/uu/numfmt/src/format.rs
@@ -1,3 +1,5 @@
+use uucore::display::Quotable;
+
 use crate::options::{NumfmtOptions, RoundMethod};
 use crate::units::{DisplayableSuffix, RawSuffix, Result, Suffix, Unit, IEC_BASES, SI_BASES};
 
@@ -78,7 +80,7 @@ fn parse_suffix(s: &str) -> Result<(f64, Option<Suffix>)> {
         Some('Z') => Some((RawSuffix::Z, with_i)),
         Some('Y') => Some((RawSuffix::Y, with_i)),
         Some('0'..='9') => None,
-        _ => return Err(format!("invalid suffix in input: '{}'", s)),
+        _ => return Err(format!("invalid suffix in input: {}", s.quote())),
     };
 
     let suffix_len = match suffix {
@@ -89,7 +91,7 @@ fn parse_suffix(s: &str) -> Result<(f64, Option<Suffix>)> {
 
     let number = s[..s.len() - suffix_len]
         .parse::<f64>()
-        .map_err(|_| format!("invalid number: '{}'", s))?;
+        .map_err(|_| format!("invalid number: {}", s.quote()))?;
 
     Ok((number, suffix))
 }
diff --git a/src/uu/numfmt/src/numfmt.rs b/src/uu/numfmt/src/numfmt.rs
index 01f12c51b..da2fa8130 100644
--- a/src/uu/numfmt/src/numfmt.rs
+++ b/src/uu/numfmt/src/numfmt.rs
@@ -15,6 +15,7 @@ use crate::options::*;
 use crate::units::{Result, Unit};
 use clap::{crate_version, App, AppSettings, Arg, ArgMatches};
 use std::io::{BufRead, Write};
+use uucore::display::Quotable;
 use uucore::ranges::Range;
 
 pub mod format;
@@ -50,8 +51,8 @@ FIELDS supports cut(1) style field ranges:
 Multiple fields/ranges can be separated with commas
 ";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [NUMBER]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [NUMBER]...", uucore::execution_phrase())
 }
 
 fn handle_args<'a>(args: impl Iterator<Item = &'a str>, options: NumfmtOptions) -> Result<()> {
@@ -113,7 +114,7 @@ fn parse_options(args: &ArgMatches) -> Result<NumfmtOptions> {
                     0 => Err(value),
                     _ => Ok(n),
                 })
-                .map_err(|value| format!("invalid header value '{}'", value))
+                .map_err(|value| format!("invalid header value {}", value.quote()))
         }
     }?;
 
@@ -154,7 +155,7 @@ fn parse_options(args: &ArgMatches) -> Result<NumfmtOptions> {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -175,7 +176,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
diff --git a/src/uu/od/Cargo.toml b/src/uu/od/Cargo.toml
index 804183025..a6b5bc433 100644
--- a/src/uu/od/Cargo.toml
+++ b/src/uu/od/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_od"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "od ~ (uutils) display formatted representation of input"
@@ -19,9 +19,13 @@ byteorder = "1.3.2"
 clap = { version = "2.33", features = ["wrap_help"] }
 half = "1.6"
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "od"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/od/src/inputdecoder.rs b/src/uu/od/src/inputdecoder.rs
index 606495461..c347ccc10 100644
--- a/src/uu/od/src/inputdecoder.rs
+++ b/src/uu/od/src/inputdecoder.rs
@@ -161,6 +161,7 @@ mod tests {
     use std::io::Cursor;
 
     #[test]
+    #[allow(clippy::float_cmp)]
     fn smoke_test() {
         let data = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xff, 0xff];
         let mut input = PeekReader::new(Cursor::new(&data));
diff --git a/src/uu/od/src/mockstream.rs b/src/uu/od/src/mockstream.rs
index 810e1d35b..5beecbf9c 100644
--- a/src/uu/od/src/mockstream.rs
+++ b/src/uu/od/src/mockstream.rs
@@ -56,15 +56,15 @@ impl FailingMockStream {
     /// `kind` and `message` can be specified to define the exact error.
     pub fn new(kind: ErrorKind, message: &'static str, repeat_count: i32) -> FailingMockStream {
         FailingMockStream {
-            kind: kind,
-            message: message,
-            repeat_count: repeat_count,
+            kind,
+            message,
+            repeat_count,
         }
     }
 
     fn error(&mut self) -> Result<usize> {
         if self.repeat_count == 0 {
-            return Ok(0);
+            Ok(0)
         } else {
             if self.repeat_count > 0 {
                 self.repeat_count -= 1;
diff --git a/src/uu/od/src/multifilereader.rs b/src/uu/od/src/multifilereader.rs
index 1255da66d..1b3aba03d 100644
--- a/src/uu/od/src/multifilereader.rs
+++ b/src/uu/od/src/multifilereader.rs
@@ -5,6 +5,8 @@ use std::io;
 use std::io::BufReader;
 use std::vec::Vec;
 
+use uucore::display::Quotable;
+
 pub enum InputSource<'a> {
     FileName(&'a str),
     Stdin,
@@ -57,12 +59,7 @@ impl<'b> MultifileReader<'b> {
                             // print an error at the time that the file is needed,
                             // then move on the the next file.
                             // This matches the behavior of the original `od`
-                            eprintln!(
-                                "{}: '{}': {}",
-                                executable!().split("::").next().unwrap(), // remove module
-                                fname,
-                                e
-                            );
+                            show_error!("{}: {}", fname.maybe_quote(), e);
                             self.any_err = true
                         }
                     }
@@ -95,11 +92,7 @@ impl<'b> io::Read for MultifileReader<'b> {
                             Ok(0) => break,
                             Ok(n) => n,
                             Err(e) => {
-                                eprintln!(
-                                    "{}: I/O: {}",
-                                    executable!().split("::").next().unwrap(), // remove module
-                                    e
-                                );
+                                show_error!("I/O: {}", e);
                                 self.any_err = true;
                                 break;
                             }
@@ -131,9 +124,10 @@ mod tests {
 
     #[test]
     fn test_multi_file_reader_one_read() {
-        let mut inputs = Vec::new();
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))));
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))));
+        let inputs = vec![
+            InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))),
+            InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))),
+        ];
         let mut v = [0; 10];
 
         let mut sut = MultifileReader::new(inputs);
@@ -145,9 +139,10 @@ mod tests {
 
     #[test]
     fn test_multi_file_reader_two_reads() {
-        let mut inputs = Vec::new();
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))));
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))));
+        let inputs = vec![
+            InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))),
+            InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))),
+        ];
         let mut v = [0; 5];
 
         let mut sut = MultifileReader::new(inputs);
@@ -163,9 +158,10 @@ mod tests {
         let c = Cursor::new(&b"1234"[..])
             .chain(FailingMockStream::new(ErrorKind::Other, "Failing", 1))
             .chain(Cursor::new(&b"5678"[..]));
-        let mut inputs = Vec::new();
-        inputs.push(InputSource::Stream(Box::new(c)));
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))));
+        let inputs = vec![
+            InputSource::Stream(Box::new(c)),
+            InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))),
+        ];
         let mut v = [0; 5];
 
         let mut sut = MultifileReader::new(inputs);
@@ -180,24 +176,25 @@ mod tests {
 
     #[test]
     fn test_multi_file_reader_read_error_at_start() {
-        let mut inputs = Vec::new();
-        inputs.push(InputSource::Stream(Box::new(FailingMockStream::new(
-            ErrorKind::Other,
-            "Failing",
-            1,
-        ))));
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))));
-        inputs.push(InputSource::Stream(Box::new(FailingMockStream::new(
-            ErrorKind::Other,
-            "Failing",
-            1,
-        ))));
-        inputs.push(InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))));
-        inputs.push(InputSource::Stream(Box::new(FailingMockStream::new(
-            ErrorKind::Other,
-            "Failing",
-            1,
-        ))));
+        let inputs = vec![
+            InputSource::Stream(Box::new(FailingMockStream::new(
+                ErrorKind::Other,
+                "Failing",
+                1,
+            ))),
+            InputSource::Stream(Box::new(Cursor::new(&b"abcd"[..]))),
+            InputSource::Stream(Box::new(FailingMockStream::new(
+                ErrorKind::Other,
+                "Failing",
+                1,
+            ))),
+            InputSource::Stream(Box::new(Cursor::new(&b"ABCD"[..]))),
+            InputSource::Stream(Box::new(FailingMockStream::new(
+                ErrorKind::Other,
+                "Failing",
+                1,
+            ))),
+        ];
         let mut v = [0; 5];
 
         let mut sut = MultifileReader::new(inputs);
diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs
index ec5bb595a..e9983f991 100644
--- a/src/uu/od/src/od.rs
+++ b/src/uu/od/src/od.rs
@@ -43,6 +43,7 @@ use crate::partialreader::*;
 use crate::peekreader::*;
 use crate::prn_char::format_ascii_dump;
 use clap::{self, crate_version, AppSettings, Arg, ArgMatches};
+use uucore::display::Quotable;
 use uucore::parse_size::ParseSizeError;
 use uucore::InvalidEncodingHandling;
 
@@ -252,7 +253,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> clap::App<'static, 'static> {
-    clap::App::new(executable!())
+    clap::App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .usage(USAGE)
@@ -435,6 +436,7 @@ pub fn uu_app() -> clap::App<'static, 'static> {
                 .long(options::FORMAT)
                 .help("select output format or formats")
                 .multiple(true)
+                .number_of_values(1)
                 .value_name("TYPE"),
         )
         .arg(
@@ -634,7 +636,7 @@ fn format_error_message(error: ParseSizeError, s: &str, option: &str) -> String
     // GNU's od echos affected flag, -N or --read-bytes (-j or --skip-bytes, etc.), depending user's selection
     // GNU's od does distinguish between "invalid (suffix in) argument"
     match error {
-        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument '{}'", option, s),
-        ParseSizeError::SizeTooBig(_) => format!("--{} argument '{}' too large", option, s),
+        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
+        ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
     }
 }
diff --git a/src/uu/od/src/output_info.rs b/src/uu/od/src/output_info.rs
index 49c2a09a2..cf050475a 100644
--- a/src/uu/od/src/output_info.rs
+++ b/src/uu/od/src/output_info.rs
@@ -145,13 +145,12 @@ impl OutputInfo {
         byte_size_block: usize,
         print_width_block: usize,
     ) -> [usize; MAX_BYTES_PER_UNIT] {
-        if byte_size_block > MAX_BYTES_PER_UNIT {
-            panic!(
-                "{}-bits types are unsupported. Current max={}-bits.",
-                8 * byte_size_block,
-                8 * MAX_BYTES_PER_UNIT
-            );
-        }
+        assert!(
+            byte_size_block <= MAX_BYTES_PER_UNIT,
+            "{}-bits types are unsupported. Current max={}-bits.",
+            8 * byte_size_block,
+            8 * MAX_BYTES_PER_UNIT
+        );
         let mut spacing = [0; MAX_BYTES_PER_UNIT];
 
         let mut byte_size = sf.byte_size();
diff --git a/src/uu/od/src/parse_formats.rs b/src/uu/od/src/parse_formats.rs
index f5b150d61..301bb5154 100644
--- a/src/uu/od/src/parse_formats.rs
+++ b/src/uu/od/src/parse_formats.rs
@@ -1,5 +1,7 @@
 // spell-checker:ignore formatteriteminfo docopt fvox fvoxw vals acdx
 
+use uucore::display::Quotable;
+
 use crate::formatteriteminfo::FormatterItemInfo;
 use crate::prn_char::*;
 use crate::prn_float::*;
@@ -272,8 +274,9 @@ fn parse_type_string(params: &str) -> Result<Vec<ParsedFormatterItemInfo>, Strin
     while let Some(type_char) = ch {
         let type_char = format_type(type_char).ok_or_else(|| {
             format!(
-                "unexpected char '{}' in format specification '{}'",
-                type_char, params
+                "unexpected char '{}' in format specification {}",
+                type_char,
+                params.quote()
             )
         })?;
 
@@ -293,8 +296,9 @@ fn parse_type_string(params: &str) -> Result<Vec<ParsedFormatterItemInfo>, Strin
             if !decimal_size.is_empty() {
                 byte_size = decimal_size.parse().map_err(|_| {
                     format!(
-                        "invalid number '{}' in format specification '{}'",
-                        decimal_size, params
+                        "invalid number {} in format specification {}",
+                        decimal_size.quote(),
+                        params.quote()
                     )
                 })?;
             }
@@ -305,8 +309,9 @@ fn parse_type_string(params: &str) -> Result<Vec<ParsedFormatterItemInfo>, Strin
 
         let ft = od_format_type(type_char, byte_size).ok_or_else(|| {
             format!(
-                "invalid size '{}' in format specification '{}'",
-                byte_size, params
+                "invalid size '{}' in format specification {}",
+                byte_size,
+                params.quote()
             )
         })?;
         formats.push(ParsedFormatterItemInfo::new(ft, show_ascii_dump));
@@ -316,9 +321,7 @@ fn parse_type_string(params: &str) -> Result<Vec<ParsedFormatterItemInfo>, Strin
 }
 
 #[cfg(test)]
-pub fn parse_format_flags_str(
-    args_str: &Vec<&'static str>,
-) -> Result<Vec<FormatterItemInfo>, String> {
+pub fn parse_format_flags_str(args_str: &[&'static str]) -> Result<Vec<FormatterItemInfo>, String> {
     let args: Vec<String> = args_str.iter().map(|s| s.to_string()).collect();
     parse_format_flags(&args).map(|v| {
         // tests using this function assume add_ascii_dump is not set
@@ -332,7 +335,7 @@ pub fn parse_format_flags_str(
 #[test]
 fn test_no_options() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od"]).unwrap(),
+        parse_format_flags_str(&["od"]).unwrap(),
         vec![FORMAT_ITEM_OCT16]
     );
 }
@@ -340,7 +343,7 @@ fn test_no_options() {
 #[test]
 fn test_one_option() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-F"]).unwrap(),
+        parse_format_flags_str(&["od", "-F"]).unwrap(),
         vec![FORMAT_ITEM_F64]
     );
 }
@@ -348,7 +351,7 @@ fn test_one_option() {
 #[test]
 fn test_two_separate_options() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-F", "-x"]).unwrap(),
+        parse_format_flags_str(&["od", "-F", "-x"]).unwrap(),
         vec![FORMAT_ITEM_F64, FORMAT_ITEM_HEX16]
     );
 }
@@ -356,7 +359,7 @@ fn test_two_separate_options() {
 #[test]
 fn test_two_combined_options() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-Fx"]).unwrap(),
+        parse_format_flags_str(&["od", "-Fx"]).unwrap(),
         vec![FORMAT_ITEM_F64, FORMAT_ITEM_HEX16]
     );
 }
@@ -364,7 +367,7 @@ fn test_two_combined_options() {
 #[test]
 fn test_ignore_non_format_parameters() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-d", "-Ax"]).unwrap(),
+        parse_format_flags_str(&["od", "-d", "-Ax"]).unwrap(),
         vec![FORMAT_ITEM_DEC16U]
     );
 }
@@ -372,7 +375,7 @@ fn test_ignore_non_format_parameters() {
 #[test]
 fn test_ignore_separate_parameters() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-I", "-A", "x"]).unwrap(),
+        parse_format_flags_str(&["od", "-I", "-A", "x"]).unwrap(),
         vec![FORMAT_ITEM_DEC64S]
     );
 }
@@ -380,36 +383,36 @@ fn test_ignore_separate_parameters() {
 #[test]
 fn test_ignore_trailing_vals() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-D", "--", "-x"]).unwrap(),
+        parse_format_flags_str(&["od", "-D", "--", "-x"]).unwrap(),
         vec![FORMAT_ITEM_DEC32U]
     );
 }
 
 #[test]
 fn test_invalid_long_format() {
-    parse_format_flags_str(&vec!["od", "--format=X"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xX"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=aC"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=fI"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xD"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=X"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xX"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=aC"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=fI"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xD"]).unwrap_err();
 
-    parse_format_flags_str(&vec!["od", "--format=xC1"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=x1C"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xz1"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xzC"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xzz"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=xCC"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xC1"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=x1C"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xz1"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xzC"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xzz"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=xCC"]).unwrap_err();
 
-    parse_format_flags_str(&vec!["od", "--format=c1"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=x256"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=d5"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format=f1"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=c1"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=x256"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=d5"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format=f1"]).unwrap_err();
 }
 
 #[test]
 fn test_long_format_a() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=a"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=a"]).unwrap(),
         vec![FORMAT_ITEM_A]
     );
 }
@@ -417,7 +420,7 @@ fn test_long_format_a() {
 #[test]
 fn test_long_format_cz() {
     assert_eq!(
-        parse_format_flags(&vec!["od".to_string(), "--format=cz".to_string()]).unwrap(),
+        parse_format_flags(&["od".to_string(), "--format=cz".to_string()]).unwrap(),
         vec![ParsedFormatterItemInfo::new(FORMAT_ITEM_C, true)]
     );
 }
@@ -425,7 +428,7 @@ fn test_long_format_cz() {
 #[test]
 fn test_long_format_d() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=d8"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=d8"]).unwrap(),
         vec![FORMAT_ITEM_DEC64S]
     );
 }
@@ -433,7 +436,7 @@ fn test_long_format_d() {
 #[test]
 fn test_long_format_d_default() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=d"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=d"]).unwrap(),
         vec![FORMAT_ITEM_DEC32S]
     );
 }
@@ -441,7 +444,7 @@ fn test_long_format_d_default() {
 #[test]
 fn test_long_format_o_default() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=o"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=o"]).unwrap(),
         vec![FORMAT_ITEM_OCT32]
     );
 }
@@ -449,7 +452,7 @@ fn test_long_format_o_default() {
 #[test]
 fn test_long_format_u_default() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=u"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=u"]).unwrap(),
         vec![FORMAT_ITEM_DEC32U]
     );
 }
@@ -457,7 +460,7 @@ fn test_long_format_u_default() {
 #[test]
 fn test_long_format_x_default() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=x"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=x"]).unwrap(),
         vec![FORMAT_ITEM_HEX32]
     );
 }
@@ -465,7 +468,7 @@ fn test_long_format_x_default() {
 #[test]
 fn test_long_format_f_default() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format=f"]).unwrap(),
+        parse_format_flags_str(&["od", "--format=f"]).unwrap(),
         vec![FORMAT_ITEM_F32]
     );
 }
@@ -473,7 +476,7 @@ fn test_long_format_f_default() {
 #[test]
 fn test_long_format_next_arg() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "--format", "f8"]).unwrap(),
+        parse_format_flags_str(&["od", "--format", "f8"]).unwrap(),
         vec![FORMAT_ITEM_F64]
     );
 }
@@ -481,7 +484,7 @@ fn test_long_format_next_arg() {
 #[test]
 fn test_short_format_next_arg() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-t", "x8"]).unwrap(),
+        parse_format_flags_str(&["od", "-t", "x8"]).unwrap(),
         vec![FORMAT_ITEM_HEX64]
     );
 }
@@ -489,23 +492,23 @@ fn test_short_format_next_arg() {
 #[test]
 fn test_short_format_combined_arg() {
     assert_eq!(
-        parse_format_flags_str(&vec!["od", "-tu8"]).unwrap(),
+        parse_format_flags_str(&["od", "-tu8"]).unwrap(),
         vec![FORMAT_ITEM_DEC64U]
     );
 }
 
 #[test]
 fn test_format_next_arg_invalid() {
-    parse_format_flags_str(&vec!["od", "--format", "-v"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "--format"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "-t", "-v"]).unwrap_err();
-    parse_format_flags_str(&vec!["od", "-t"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format", "-v"]).unwrap_err();
+    parse_format_flags_str(&["od", "--format"]).unwrap_err();
+    parse_format_flags_str(&["od", "-t", "-v"]).unwrap_err();
+    parse_format_flags_str(&["od", "-t"]).unwrap_err();
 }
 
 #[test]
 fn test_mixed_formats() {
     assert_eq!(
-        parse_format_flags(&vec![
+        parse_format_flags(&[
             "od".to_string(),
             "--skip-bytes=2".to_string(),
             "-vItu1z".to_string(),
diff --git a/src/uu/od/src/prn_float.rs b/src/uu/od/src/prn_float.rs
index 411bc9c10..a9bf1279e 100644
--- a/src/uu/od/src/prn_float.rs
+++ b/src/uu/od/src/prn_float.rs
@@ -91,6 +91,7 @@ fn format_float(f: f64, width: usize, precision: usize) -> String {
 }
 
 #[test]
+#[allow(clippy::excessive_precision)]
 fn test_format_flo32() {
     assert_eq!(format_flo32(1.0), "     1.0000000");
     assert_eq!(format_flo32(9.9999990), "     9.9999990");
diff --git a/src/uu/paste/Cargo.toml b/src/uu/paste/Cargo.toml
index 19a674c3e..aeba6f68e 100644
--- a/src/uu/paste/Cargo.toml
+++ b/src/uu/paste/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_paste"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "paste ~ (uutils) merge lines from inputs"
@@ -16,9 +16,13 @@ path = "src/paste.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "paste"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs
index 7f7969687..9ac5507df 100644
--- a/src/uu/paste/src/paste.rs
+++ b/src/uu/paste/src/paste.rs
@@ -52,7 +52,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml
index d7e76728a..79e0c251b 100644
--- a/src/uu/pathchk/Cargo.toml
+++ b/src/uu/pathchk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_pathchk"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "pathchk ~ (uutils) diagnose invalid or non-portable PATHNAME"
@@ -17,8 +17,8 @@ path = "src/pathchk.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "pathchk"
diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs
index 7f728667f..8afeaff18 100644
--- a/src/uu/pathchk/src/pathchk.rs
+++ b/src/uu/pathchk/src/pathchk.rs
@@ -15,6 +15,7 @@ extern crate uucore;
 use clap::{crate_version, App, Arg};
 use std::fs;
 use std::io::{ErrorKind, Write};
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 // operating mode
@@ -25,7 +26,6 @@ enum Mode {
     Both,    // a combination of `Basic` and `Extra`
 }
 
-static NAME: &str = "pathchk";
 static ABOUT: &str = "Check whether file names are valid or portable";
 
 mod options {
@@ -39,12 +39,12 @@ mod options {
 const POSIX_PATH_MAX: usize = 256;
 const POSIX_NAME_MAX: usize = 14;
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... NAME...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... NAME...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -69,7 +69,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     // take necessary actions
     let paths = matches.values_of(options::PATH);
     let mut res = if paths.is_none() {
-        show_error!("missing operand\nTry {} --help for more information", NAME);
+        show_error!(
+            "missing operand\nTry '{} --help' for more information",
+            uucore::execution_phrase()
+        );
         false
     } else {
         true
@@ -96,7 +99,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -151,10 +154,10 @@ fn check_basic(path: &[String]) -> bool {
         if component_len > POSIX_NAME_MAX {
             writeln!(
                 &mut std::io::stderr(),
-                "limit {} exceeded by length {} of file name component '{}'",
+                "limit {} exceeded by length {} of file name component {}",
                 POSIX_NAME_MAX,
                 component_len,
-                p
+                p.quote()
             );
             return false;
         }
@@ -173,8 +176,8 @@ fn check_extra(path: &[String]) -> bool {
         if p.starts_with('-') {
             writeln!(
                 &mut std::io::stderr(),
-                "leading hyphen in file name component '{}'",
-                p
+                "leading hyphen in file name component {}",
+                p.quote()
             );
             return false;
         }
@@ -195,10 +198,10 @@ fn check_default(path: &[String]) -> bool {
     if total_len > libc::PATH_MAX as usize {
         writeln!(
             &mut std::io::stderr(),
-            "limit {} exceeded by length {} of file name '{}'",
+            "limit {} exceeded by length {} of file name {}",
             libc::PATH_MAX,
             total_len,
-            joined_path
+            joined_path.quote()
         );
         return false;
     }
@@ -208,10 +211,10 @@ fn check_default(path: &[String]) -> bool {
         if component_len > libc::FILENAME_MAX as usize {
             writeln!(
                 &mut std::io::stderr(),
-                "limit {} exceeded by length {} of file name component '{}'",
+                "limit {} exceeded by length {} of file name component {}",
                 libc::FILENAME_MAX,
                 component_len,
-                p
+                p.quote()
             );
             return false;
         }
@@ -244,9 +247,9 @@ fn check_portable_chars(path_segment: &str) -> bool {
             let invalid = path_segment[i..].chars().next().unwrap();
             writeln!(
                 &mut std::io::stderr(),
-                "nonportable character '{}' in file name component '{}'",
+                "nonportable character '{}' in file name component {}",
                 invalid,
-                path_segment
+                path_segment.quote()
             );
             return false;
         }
diff --git a/src/uu/pinky/Cargo.toml b/src/uu/pinky/Cargo.toml
index a84aa7473..297d40642 100644
--- a/src/uu/pinky/Cargo.toml
+++ b/src/uu/pinky/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_pinky"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "pinky ~ (uutils) display user information"
@@ -15,8 +15,8 @@ edition = "2018"
 path = "src/pinky.rs"
 
 [dependencies]
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx", "entries"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["utmpx", "entries"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 clap = { version = "2.33", features = ["wrap_help"] }
 
 [[bin]]
diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs
index 16bcfd3c9..4aa27affa 100644
--- a/src/uu/pinky/src/pinky.rs
+++ b/src/uu/pinky/src/pinky.rs
@@ -40,8 +40,8 @@ mod options {
     pub const USER: &str = "user";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [USER]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [USER]...", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -57,7 +57,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -130,7 +130,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -291,7 +291,7 @@ impl Pinky {
 
         let mut s = ut.host();
         if self.include_where && !s.is_empty() {
-            s = safe_unwrap!(ut.canon_host());
+            s = crash_if_err!(1, ut.canon_host());
             print!(" {}", s);
         }
 
diff --git a/src/uu/pr/Cargo.toml b/src/uu/pr/Cargo.toml
index 3028e7f6a..499ee7726 100644
--- a/src/uu/pr/Cargo.toml
+++ b/src/uu/pr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_pr"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "pr ~ (uutils) convert text files for printing"
@@ -16,11 +16,9 @@ path = "src/pr.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["utmpx", "entries"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["entries"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 getopts = "0.2.21"
-time = "0.1.41"
-# A higher version would cause a conflict with time
 chrono = "0.4.19"
 quick-error = "2.0.1"
 itertools = "0.10"
@@ -29,3 +27,7 @@ regex = "1.0"
 [[bin]]
 name = "pr"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs
index d6b9e8ca3..0886a9991 100644
--- a/src/uu/pr/src/pr.rs
+++ b/src/uu/pr/src/pr.rs
@@ -20,10 +20,11 @@ use quick_error::ResultExt;
 use regex::Regex;
 use std::convert::From;
 use std::fs::{metadata, File};
-use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Stdout, Write};
+use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Write};
 #[cfg(unix)]
 use std::os::unix::fs::FileTypeExt;
-use uucore::executable;
+
+use uucore::display::Quotable;
 
 type IOError = std::io::Error;
 
@@ -170,7 +171,7 @@ quick_error! {
 
 pub fn uu_app() -> clap::App<'static, 'static> {
     // TODO: migrate to clap to get more shell completions
-    clap::App::new(executable!())
+    clap::App::new(uucore::util_name())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
@@ -518,7 +519,7 @@ fn parse_usize(matches: &Matches, opt: &str) -> Option<Result<usize, PrError>> {
         let i = value_to_parse.0;
         let option = value_to_parse.1;
         i.parse().map_err(|_e| {
-            PrError::EncounteredErrors(format!("invalid {} argument '{}'", option, i))
+            PrError::EncounteredErrors(format!("invalid {} argument {}", option, i.quote()))
         })
     };
     matches
@@ -620,7 +621,7 @@ fn build_options(
         let unparsed_num = i.get(1).unwrap().as_str().trim();
         let x: Vec<_> = unparsed_num.split(':').collect();
         x[0].to_string().parse::<usize>().map_err(|_e| {
-            PrError::EncounteredErrors(format!("invalid {} argument '{}'", "+", unparsed_num))
+            PrError::EncounteredErrors(format!("invalid {} argument {}", "+", unparsed_num.quote()))
         })
     }) {
         Some(res) => res?,
@@ -634,7 +635,11 @@ fn build_options(
         .map(|unparsed_num| {
             let x: Vec<_> = unparsed_num.split(':').collect();
             x[1].to_string().parse::<usize>().map_err(|_e| {
-                PrError::EncounteredErrors(format!("invalid {} argument '{}'", "+", unparsed_num))
+                PrError::EncounteredErrors(format!(
+                    "invalid {} argument {}",
+                    "+",
+                    unparsed_num.quote()
+                ))
             })
         }) {
         Some(res) => Some(res?),
@@ -644,7 +649,10 @@ fn build_options(
     let invalid_pages_map = |i: String| {
         let unparsed_value = matches.opt_str(options::PAGE_RANGE_OPTION).unwrap();
         i.parse::<usize>().map_err(|_e| {
-            PrError::EncounteredErrors(format!("invalid --pages argument '{}'", unparsed_value))
+            PrError::EncounteredErrors(format!(
+                "invalid --pages argument {}",
+                unparsed_value.quote()
+            ))
         })
     };
 
@@ -742,7 +750,7 @@ fn build_options(
     let start_column_option = match re_col.captures(&free_args).map(|i| {
         let unparsed_num = i.get(1).unwrap().as_str().trim();
         unparsed_num.parse::<usize>().map_err(|_e| {
-            PrError::EncounteredErrors(format!("invalid {} argument '{}'", "-", unparsed_num))
+            PrError::EncounteredErrors(format!("invalid {} argument {}", "-", unparsed_num.quote()))
         })
     }) {
         Some(res) => Some(res?),
@@ -1028,15 +1036,16 @@ fn print_page(lines: &[FileLine], options: &OutputOptions, page: usize) -> Resul
 
     let header = header_content(options, page);
     let trailer_content = trailer_content(options);
-    let out = &mut stdout();
 
-    out.lock();
+    let out = stdout();
+    let mut out = out.lock();
+
     for x in header {
         out.write_all(x.as_bytes())?;
         out.write_all(line_separator)?;
     }
 
-    let lines_written = write_columns(lines, options, out)?;
+    let lines_written = write_columns(lines, options, &mut out)?;
 
     for (index, x) in trailer_content.iter().enumerate() {
         out.write_all(x.as_bytes())?;
@@ -1052,7 +1061,7 @@ fn print_page(lines: &[FileLine], options: &OutputOptions, page: usize) -> Resul
 fn write_columns(
     lines: &[FileLine],
     options: &OutputOptions,
-    out: &mut Stdout,
+    out: &mut impl Write,
 ) -> Result<usize, IOError> {
     let line_separator = options.content_line_separator.as_bytes();
 
diff --git a/src/uu/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml
index 040997393..eaf482b21 100644
--- a/src/uu/printenv/Cargo.toml
+++ b/src/uu/printenv/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_printenv"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "printenv ~ (uutils) display value of environment VAR"
@@ -16,9 +16,13 @@ path = "src/printenv.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "printenv"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs
index 6e0ca7157..5d32cfbcc 100644
--- a/src/uu/printenv/src/printenv.rs
+++ b/src/uu/printenv/src/printenv.rs
@@ -7,9 +7,6 @@
 
 /* last synced with: printenv (GNU coreutils) 8.13 */
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::env;
 
@@ -19,12 +16,12 @@ static OPT_NULL: &str = "null";
 
 static ARG_VARIABLES: &str = "variables";
 
-fn get_usage() -> String {
-    format!("{0} [VARIABLE]... [OPTION]...", executable!())
+fn usage() -> String {
+    format!("{0} [VARIABLE]... [OPTION]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -55,7 +52,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/printf/Cargo.toml b/src/uu/printf/Cargo.toml
index a0bd27d8e..50c454db5 100644
--- a/src/uu/printf/Cargo.toml
+++ b/src/uu/printf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_printf"
-version = "0.0.7"
+version = "0.0.8"
 authors = [
     "Nathan Ross",
     "uutils developers",
@@ -20,9 +20,13 @@ path = "src/printf.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 itertools = "0.8.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "printf"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/printf/src/cli.rs b/src/uu/printf/src/cli.rs
index a5e9c9775..fa2fda1d2 100644
--- a/src/uu/printf/src/cli.rs
+++ b/src/uu/printf/src/cli.rs
@@ -2,20 +2,11 @@
 
 // spell-checker:ignore (ToDO) bslice
 
-use std::env;
-use std::io::{stderr, stdout, Write};
+use std::io::{stdout, Write};
 
 pub const EXIT_OK: i32 = 0;
 pub const EXIT_ERR: i32 = 1;
 
-pub fn err_msg(msg: &str) {
-    let exe_path = match env::current_exe() {
-        Ok(p) => p.to_string_lossy().into_owned(),
-        _ => String::from(""),
-    };
-    writeln!(&mut stderr(), "{}: {}", exe_path, msg).unwrap();
-}
-
 // by default stdout only flushes
 // to console when a newline is passed.
 pub fn flush_char(c: char) {
diff --git a/src/uu/printf/src/memo.rs b/src/uu/printf/src/memo.rs
index 2f12f9192..a87d4fa89 100644
--- a/src/uu/printf/src/memo.rs
+++ b/src/uu/printf/src/memo.rs
@@ -8,8 +8,9 @@
 use itertools::put_back_n;
 use std::iter::Peekable;
 use std::slice::Iter;
+use uucore::display::Quotable;
+use uucore::show_warning;
 
-use crate::cli;
 use crate::tokenize::sub::Sub;
 use crate::tokenize::token::{Token, Tokenizer};
 use crate::tokenize::unescaped_text::UnescapedText;
@@ -19,10 +20,10 @@ pub struct Memo {
 }
 
 fn warn_excess_args(first_arg: &str) {
-    cli::err_msg(&format!(
-        "warning: ignoring excess arguments, starting with '{}'",
-        first_arg
-    ));
+    show_warning!(
+        "ignoring excess arguments, starting with {}",
+        first_arg.quote()
+    );
 }
 
 impl Memo {
diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs
index efa9aea57..d3c8dca90 100644
--- a/src/uu/printf/src/printf.rs
+++ b/src/uu/printf/src/printf.rs
@@ -2,9 +2,6 @@
 // spell-checker:ignore (change!) each's
 // spell-checker:ignore (ToDO) LONGHELP FORMATSTRING templating parameterizing formatstr
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use uucore::InvalidEncodingHandling;
 
@@ -281,11 +278,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let location = &args[0];
     if args.len() <= 1 {
         println!(
-            "{0}: missing operand\nTry '{0} --help' for more information.",
-            location
+            "{0}: missing operand\nTry '{1} --help' for more information.",
+            uucore::util_name(),
+            uucore::execution_phrase()
         );
         return 1;
     }
@@ -294,7 +291,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     if formatstr == "--help" {
         print!("{} {}", LONGHELP_LEAD, LONGHELP_BODY);
     } else if formatstr == "--version" {
-        println!("{} {}", executable!(), crate_version!());
+        println!("{} {}", uucore::util_name(), crate_version!());
     } else {
         let printf_args = &args[2..];
         memo::Memo::run_all(formatstr, printf_args);
@@ -303,7 +300,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .arg(Arg::with_name(VERSION).long(VERSION))
         .arg(Arg::with_name(HELP).long(HELP))
 }
diff --git a/src/uu/printf/src/tokenize/num_format/formatter.rs b/src/uu/printf/src/tokenize/num_format/formatter.rs
index f5f5d71b1..790c338ae 100644
--- a/src/uu/printf/src/tokenize/num_format/formatter.rs
+++ b/src/uu/printf/src/tokenize/num_format/formatter.rs
@@ -3,15 +3,15 @@
 
 use itertools::{put_back_n, PutBackN};
 use std::str::Chars;
+use uucore::{display::Quotable, show_error};
 
 use super::format_field::FormatField;
 
-use crate::cli;
-
 // contains the rough ingredients to final
 // output for a number, organized together
 // to allow for easy generalization of output manipulation
 // (e.g. max number of digits after decimal)
+#[derive(Default)]
 pub struct FormatPrimitive {
     pub prefix: Option<String>,
     pub pre_decimal: Option<String>,
@@ -19,17 +19,6 @@ pub struct FormatPrimitive {
     pub suffix: Option<String>,
 }
 
-impl Default for FormatPrimitive {
-    fn default() -> FormatPrimitive {
-        FormatPrimitive {
-            prefix: None,
-            pre_decimal: None,
-            post_decimal: None,
-            suffix: None,
-        }
-    }
-}
-
 #[derive(Clone, PartialEq)]
 pub enum Base {
     Ten = 10,
@@ -66,5 +55,5 @@ pub fn get_it_at(offset: usize, str_in: &str) -> PutBackN<Chars> {
 // TODO: put this somewhere better
 pub fn warn_incomplete_conv(pf_arg: &str) {
     // important: keep println here not print
-    cli::err_msg(&format!("{}: value not completely converted", pf_arg))
+    show_error!("{}: value not completely converted", pf_arg.maybe_quote());
 }
diff --git a/src/uu/printf/src/tokenize/num_format/num_format.rs b/src/uu/printf/src/tokenize/num_format/num_format.rs
index b32731f2d..a9fee58e1 100644
--- a/src/uu/printf/src/tokenize/num_format/num_format.rs
+++ b/src/uu/printf/src/tokenize/num_format/num_format.rs
@@ -7,6 +7,9 @@
 use std::env;
 use std::vec::Vec;
 
+use uucore::display::Quotable;
+use uucore::{show_error, show_warning};
+
 use super::format_field::{FieldType, FormatField};
 use super::formatter::{Base, FormatPrimitive, Formatter, InitialPrefix};
 use super::formatters::cninetyninehexfloatf::CninetyNineHexFloatf;
@@ -15,11 +18,9 @@ use super::formatters::floatf::Floatf;
 use super::formatters::intf::Intf;
 use super::formatters::scif::Scif;
 
-use crate::cli;
-
 pub fn warn_expected_numeric(pf_arg: &str) {
     // important: keep println here not print
-    cli::err_msg(&format!("{}: expected a numeric value", pf_arg));
+    show_error!("{}: expected a numeric value", pf_arg.maybe_quote());
 }
 
 // when character constant arguments have excess characters
@@ -29,11 +30,11 @@ fn warn_char_constant_ign(remaining_bytes: Vec<u8>) {
         Ok(_) => {}
         Err(e) => {
             if let env::VarError::NotPresent = e {
-                cli::err_msg(&format!(
-                    "warning: {:?}: character(s) following character \
+                show_warning!(
+                    "{:?}: character(s) following character \
                      constant have been ignored",
                     &*remaining_bytes
-                ));
+                );
             }
         }
     }
diff --git a/src/uu/printf/src/tokenize/sub.rs b/src/uu/printf/src/tokenize/sub.rs
index d01e00699..48d854fab 100644
--- a/src/uu/printf/src/tokenize/sub.rs
+++ b/src/uu/printf/src/tokenize/sub.rs
@@ -10,6 +10,7 @@ use std::iter::Peekable;
 use std::process::exit;
 use std::slice::Iter;
 use std::str::Chars;
+use uucore::show_error;
 // use std::collections::HashSet;
 
 use super::num_format::format_field::{FieldType, FormatField};
@@ -19,7 +20,7 @@ use super::unescaped_text::UnescapedText;
 use crate::cli;
 
 fn err_conv(sofar: &str) {
-    cli::err_msg(&format!("%{}: invalid conversion specification", sofar));
+    show_error!("%{}: invalid conversion specification", sofar);
     exit(cli::EXIT_ERR);
 }
 
diff --git a/src/uu/ptx/Cargo.toml b/src/uu/ptx/Cargo.toml
index 852379e15..06eb15ee8 100644
--- a/src/uu/ptx/Cargo.toml
+++ b/src/uu/ptx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_ptx"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "ptx ~ (uutils) display a permuted index of input"
@@ -21,9 +21,13 @@ libc = "0.2.42"
 memchr = "2.2.0"
 regex = "1.0.1"
 regex-syntax = "0.6.7"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "ptx"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs
index 01b14bc4d..3619b8d4d 100644
--- a/src/uu/ptx/src/ptx.rs
+++ b/src/uu/ptx/src/ptx.rs
@@ -17,6 +17,7 @@ use std::collections::{BTreeSet, HashMap, HashSet};
 use std::default::Default;
 use std::fs::File;
 use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static NAME: &str = "ptx";
@@ -292,7 +293,11 @@ fn create_word_set(config: &Config, filter: &WordFilter, file_map: &FileMap) ->
 
 fn get_reference(config: &Config, word_ref: &WordRef, line: &str, context_reg: &Regex) -> String {
     if config.auto_ref {
-        format!("{}:{}", word_ref.filename, word_ref.local_line_nr + 1)
+        format!(
+            "{}:{}",
+            word_ref.filename.maybe_quote(),
+            word_ref.local_line_nr + 1
+        )
     } else if config.input_ref {
         let (beg, end) = match context_reg.find(line) {
             Some(x) => (x.start(), x.end()),
@@ -659,7 +664,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(BRIEF)
diff --git a/src/uu/pwd/Cargo.toml b/src/uu/pwd/Cargo.toml
index 37cbc7fe6..a168fb5aa 100644
--- a/src/uu/pwd/Cargo.toml
+++ b/src/uu/pwd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_pwd"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "pwd ~ (uutils) display current working directory"
@@ -16,8 +16,8 @@ path = "src/pwd.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "pwd"
diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs
index 37effe618..8beb65dbd 100644
--- a/src/uu/pwd/src/pwd.rs
+++ b/src/uu/pwd/src/pwd.rs
@@ -5,68 +5,155 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::env;
 use std::io;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
-use uucore::error::{FromIo, UResult, USimpleError};
+use uucore::display::println_verbatim;
+use uucore::error::{FromIo, UResult};
 
 static ABOUT: &str = "Display the full filename of the current working directory.";
 static OPT_LOGICAL: &str = "logical";
 static OPT_PHYSICAL: &str = "physical";
 
-pub fn absolute_path(path: &Path) -> io::Result<PathBuf> {
-    let path_buf = path.canonicalize()?;
+fn physical_path() -> io::Result<PathBuf> {
+    // std::env::current_dir() is a thin wrapper around libc's getcwd().
 
-    #[cfg(windows)]
-    let path_buf = Path::new(
-        path_buf
-            .as_path()
-            .to_string_lossy()
-            .trim_start_matches(r"\\?\"),
-    )
-    .to_path_buf();
+    // On Unix, getcwd() must return the physical path:
+    // https://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html
+    #[cfg(unix)]
+    {
+        env::current_dir()
+    }
 
-    Ok(path_buf)
+    // On Windows we have to resolve it.
+    // On other systems we also resolve it, just in case.
+    #[cfg(not(unix))]
+    {
+        env::current_dir().and_then(|path| path.canonicalize())
+    }
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE...", executable!())
+fn logical_path() -> io::Result<PathBuf> {
+    // getcwd() on Windows seems to include symlinks, so this is easy.
+    #[cfg(windows)]
+    {
+        env::current_dir()
+    }
+
+    // If we're not on Windows we do things Unix-style.
+    //
+    // Typical Unix-like kernels don't actually keep track of the logical working
+    // directory. They know the precise directory a process is in, and the getcwd()
+    // syscall reconstructs a path from that.
+    //
+    // The logical working directory is maintained by the shell, in the $PWD
+    // environment variable. So we check carefully if that variable looks
+    // reasonable, and if not then we fall back to the physical path.
+    //
+    // POSIX: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/pwd.html
+    #[cfg(not(windows))]
+    {
+        use std::path::Path;
+        fn looks_reasonable(path: &Path) -> bool {
+            // First, check if it's an absolute path.
+            if !path.has_root() {
+                return false;
+            }
+
+            // Then, make sure there are no . or .. components.
+            // Path::components() isn't useful here, it normalizes those out.
+
+            // to_string_lossy() may allocate, but that's fine, we call this
+            // only once per run. It may also lose information, but not any
+            // information that we need for this check.
+            if path
+                .to_string_lossy()
+                .split(std::path::is_separator)
+                .any(|piece| piece == "." || piece == "..")
+            {
+                return false;
+            }
+
+            // Finally, check if it matches the directory we're in.
+            #[cfg(unix)]
+            {
+                use std::fs::metadata;
+                use std::os::unix::fs::MetadataExt;
+                let path_info = match metadata(path) {
+                    Ok(info) => info,
+                    Err(_) => return false,
+                };
+                let real_info = match metadata(".") {
+                    Ok(info) => info,
+                    Err(_) => return false,
+                };
+                if path_info.dev() != real_info.dev() || path_info.ino() != real_info.ino() {
+                    return false;
+                }
+            }
+
+            #[cfg(not(unix))]
+            {
+                use std::fs::canonicalize;
+                let canon_path = match canonicalize(path) {
+                    Ok(path) => path,
+                    Err(_) => return false,
+                };
+                let real_path = match canonicalize(".") {
+                    Ok(path) => path,
+                    Err(_) => return false,
+                };
+                if canon_path != real_path {
+                    return false;
+                }
+            }
+
+            true
+        }
+
+        match env::var_os("PWD").map(PathBuf::from) {
+            Some(value) if looks_reasonable(&value) => Ok(value),
+            _ => env::current_dir(),
+        }
+    }
+}
+
+fn usage() -> String {
+    format!("{0} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
+    let cwd = if matches.is_present(OPT_LOGICAL) {
+        logical_path()
+    } else {
+        physical_path()
+    }
+    .map_err_context(|| "failed to get current directory".to_owned())?;
 
-    match env::current_dir() {
-        Ok(logical_path) => {
-            if matches.is_present(OPT_LOGICAL) {
-                println!("{}", logical_path.display());
-            } else {
-                let physical_path = absolute_path(&logical_path)
-                    .map_err_context(|| "failed to get absolute path".to_string())?;
-                println!("{}", physical_path.display());
-            }
-        }
-        Err(e) => {
-            return Err(USimpleError::new(
-                1,
-                format!("failed to get current directory {}", e),
-            ))
-        }
-    };
+    // \\?\ is a prefix Windows gives to paths under certain circumstances,
+    // including when canonicalizing them.
+    // With the right extension trait we can remove it non-lossily, but
+    // we print it lossily anyway, so no reason to bother.
+    #[cfg(windows)]
+    let cwd = cwd
+        .to_string_lossy()
+        .strip_prefix(r"\\?\")
+        .map(Into::into)
+        .unwrap_or(cwd);
+
+    println_verbatim(&cwd).map_err_context(|| "failed to print current directory".to_owned())?;
 
     Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -79,6 +166,7 @@ pub fn uu_app() -> App<'static, 'static> {
             Arg::with_name(OPT_PHYSICAL)
                 .short("P")
                 .long(OPT_PHYSICAL)
+                .overrides_with(OPT_LOGICAL)
                 .help("avoid all symlinks"),
         )
 }
diff --git a/src/uu/readlink/Cargo.toml b/src/uu/readlink/Cargo.toml
index 9e0f939d1..d126a3835 100644
--- a/src/uu/readlink/Cargo.toml
+++ b/src/uu/readlink/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_readlink"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "readlink ~ (uutils) display resolved path of PATHNAME"
@@ -17,9 +17,13 @@ path = "src/readlink.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "readlink"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs
index 826fa0254..d6dd1634a 100644
--- a/src/uu/readlink/src/readlink.rs
+++ b/src/uu/readlink/src/readlink.rs
@@ -14,9 +14,9 @@ use clap::{crate_version, App, Arg};
 use std::fs;
 use std::io::{stdout, Write};
 use std::path::{Path, PathBuf};
-use uucore::fs::{canonicalize, CanonicalizeMode};
+use uucore::display::Quotable;
+use uucore::fs::{canonicalize, MissingHandling, ResolveMode};
 
-const NAME: &str = "readlink";
 const ABOUT: &str = "Print value of a symbolic link or canonical file name.";
 const OPT_CANONICALIZE: &str = "canonicalize";
 const OPT_CANONICALIZE_MISSING: &str = "canonicalize-missing";
@@ -29,12 +29,12 @@ const OPT_ZERO: &str = "zero";
 
 const ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let mut no_newline = matches.is_present(OPT_NO_NEWLINE);
@@ -42,14 +42,21 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let silent = matches.is_present(OPT_SILENT) || matches.is_present(OPT_QUIET);
     let verbose = matches.is_present(OPT_VERBOSE);
 
-    let can_mode = if matches.is_present(OPT_CANONICALIZE) {
-        CanonicalizeMode::Normal
-    } else if matches.is_present(OPT_CANONICALIZE_EXISTING) {
-        CanonicalizeMode::Existing
-    } else if matches.is_present(OPT_CANONICALIZE_MISSING) {
-        CanonicalizeMode::Missing
+    let res_mode = if matches.is_present(OPT_CANONICALIZE)
+        || matches.is_present(OPT_CANONICALIZE_EXISTING)
+        || matches.is_present(OPT_CANONICALIZE_MISSING)
+    {
+        ResolveMode::Logical
     } else {
-        CanonicalizeMode::None
+        ResolveMode::None
+    };
+
+    let can_mode = if matches.is_present(OPT_CANONICALIZE_EXISTING) {
+        MissingHandling::Existing
+    } else if matches.is_present(OPT_CANONICALIZE_MISSING) {
+        MissingHandling::Missing
+    } else {
+        MissingHandling::Normal
     };
 
     let files: Vec<String> = matches
@@ -59,34 +66,34 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     if files.is_empty() {
         crash!(
             1,
-            "missing operand\nTry {} --help for more information",
-            NAME
+            "missing operand\nTry '{} --help' for more information",
+            uucore::execution_phrase()
         );
     }
 
     if no_newline && files.len() > 1 && !silent {
-        eprintln!("{}: ignoring --no-newline with multiple arguments", NAME);
+        show_error!("ignoring --no-newline with multiple arguments");
         no_newline = false;
     }
 
     for f in &files {
         let p = PathBuf::from(f);
-        if can_mode == CanonicalizeMode::None {
+        if res_mode == ResolveMode::None {
             match fs::read_link(&p) {
                 Ok(path) => show(&path, no_newline, use_zero),
                 Err(err) => {
                     if verbose {
-                        eprintln!("{}: {}: errno {}", NAME, f, err.raw_os_error().unwrap());
+                        show_error!("{}: errno {}", f.maybe_quote(), err.raw_os_error().unwrap());
                     }
                     return 1;
                 }
             }
         } else {
-            match canonicalize(&p, can_mode) {
+            match canonicalize(&p, can_mode, res_mode) {
                 Ok(path) => show(&path, no_newline, use_zero),
                 Err(err) => {
                     if verbose {
-                        eprintln!("{}: {}: errno {:?}", NAME, f, err.raw_os_error().unwrap());
+                        show_error!("{}: errno {}", f.maybe_quote(), err.raw_os_error().unwrap());
                     }
                     return 1;
                 }
@@ -98,7 +105,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/realpath/Cargo.toml b/src/uu/realpath/Cargo.toml
index f5b9af2e7..4be39f978 100644
--- a/src/uu/realpath/Cargo.toml
+++ b/src/uu/realpath/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_realpath"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "realpath ~ (uutils) display resolved absolute path of PATHNAME"
@@ -16,9 +16,13 @@ path = "src/realpath.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "realpath"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs
index fe2ad4ccc..d13aed6c7 100644
--- a/src/uu/realpath/src/realpath.rs
+++ b/src/uu/realpath/src/realpath.rs
@@ -11,23 +11,33 @@
 extern crate uucore;
 
 use clap::{crate_version, App, Arg};
-use std::path::{Path, PathBuf};
-use uucore::fs::{canonicalize, CanonicalizeMode};
+use std::{
+    io::{stdout, Write},
+    path::{Path, PathBuf},
+};
+use uucore::{
+    display::{print_verbatim, Quotable},
+    fs::{canonicalize, MissingHandling, ResolveMode},
+};
 
 static ABOUT: &str = "print the resolved path";
 
 static OPT_QUIET: &str = "quiet";
 static OPT_STRIP: &str = "strip";
 static OPT_ZERO: &str = "zero";
+static OPT_PHYSICAL: &str = "physical";
+static OPT_LOGICAL: &str = "logical";
+const OPT_CANONICALIZE_MISSING: &str = "canonicalize-missing";
+const OPT_CANONICALIZE_EXISTING: &str = "canonicalize-existing";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -42,11 +52,19 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let strip = matches.is_present(OPT_STRIP);
     let zero = matches.is_present(OPT_ZERO);
     let quiet = matches.is_present(OPT_QUIET);
+    let logical = matches.is_present(OPT_LOGICAL);
+    let can_mode = if matches.is_present(OPT_CANONICALIZE_EXISTING) {
+        MissingHandling::Existing
+    } else if matches.is_present(OPT_CANONICALIZE_MISSING) {
+        MissingHandling::Missing
+    } else {
+        MissingHandling::Normal
+    };
     let mut retcode = 0;
     for path in &paths {
-        if let Err(e) = resolve_path(path, strip, zero) {
+        if let Err(e) = resolve_path(path, strip, zero, logical, can_mode) {
             if !quiet {
-                show_error!("{}: {}", e, path.display());
+                show_error!("{}: {}", path.maybe_quote(), e);
             }
             retcode = 1
         };
@@ -55,7 +73,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -76,6 +94,37 @@ pub fn uu_app() -> App<'static, 'static> {
                 .long(OPT_ZERO)
                 .help("Separate output filenames with \\0 rather than newline"),
         )
+        .arg(
+            Arg::with_name(OPT_LOGICAL)
+                .short("L")
+                .long(OPT_LOGICAL)
+                .help("resolve '..' components before symlinks"),
+        )
+        .arg(
+            Arg::with_name(OPT_PHYSICAL)
+                .short("P")
+                .long(OPT_PHYSICAL)
+                .overrides_with_all(&[OPT_STRIP, OPT_LOGICAL])
+                .help("resolve symlinks as encountered (default)"),
+        )
+        .arg(
+            Arg::with_name(OPT_CANONICALIZE_EXISTING)
+                .short("e")
+                .long(OPT_CANONICALIZE_EXISTING)
+                .help(
+                    "canonicalize by following every symlink in every component of the \
+                     given name recursively, all components must exist",
+                ),
+        )
+        .arg(
+            Arg::with_name(OPT_CANONICALIZE_MISSING)
+                .short("m")
+                .long(OPT_CANONICALIZE_MISSING)
+                .help(
+                    "canonicalize by following every symlink in every component of the \
+                     given name recursively, without requirements on components existence",
+                ),
+        )
         .arg(
             Arg::with_name(ARG_FILES)
                 .multiple(true)
@@ -96,14 +145,24 @@ pub fn uu_app() -> App<'static, 'static> {
 ///
 /// This function returns an error if there is a problem resolving
 /// symbolic links.
-fn resolve_path(p: &Path, strip: bool, zero: bool) -> std::io::Result<()> {
-    let mode = if strip {
-        CanonicalizeMode::None
+fn resolve_path(
+    p: &Path,
+    strip: bool,
+    zero: bool,
+    logical: bool,
+    can_mode: MissingHandling,
+) -> std::io::Result<()> {
+    let resolve = if strip {
+        ResolveMode::None
+    } else if logical {
+        ResolveMode::Logical
     } else {
-        CanonicalizeMode::Normal
+        ResolveMode::Physical
     };
-    let abs = canonicalize(p, mode)?;
-    let line_ending = if zero { '\0' } else { '\n' };
-    print!("{}{}", abs.display(), line_ending);
+    let abs = canonicalize(p, can_mode, resolve)?;
+    let line_ending = if zero { b'\0' } else { b'\n' };
+
+    print_verbatim(&abs)?;
+    stdout().write_all(&[line_ending])?;
     Ok(())
 }
diff --git a/src/uu/relpath/Cargo.toml b/src/uu/relpath/Cargo.toml
index 89376c12d..f1ddf87dc 100644
--- a/src/uu/relpath/Cargo.toml
+++ b/src/uu/relpath/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_relpath"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "relpath ~ (uutils) display relative path of PATHNAME_TO from PATHNAME_FROM"
@@ -16,9 +16,13 @@ path = "src/relpath.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "relpath"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/relpath/src/relpath.rs b/src/uu/relpath/src/relpath.rs
index cb0fba7cc..16b920861 100644
--- a/src/uu/relpath/src/relpath.rs
+++ b/src/uu/relpath/src/relpath.rs
@@ -7,13 +7,11 @@
 
 // spell-checker:ignore (ToDO) subpath absto absfrom absbase
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::env;
 use std::path::{Path, PathBuf};
-use uucore::fs::{canonicalize, CanonicalizeMode};
+use uucore::display::println_verbatim;
+use uucore::fs::{canonicalize, MissingHandling, ResolveMode};
 use uucore::InvalidEncodingHandling;
 
 static ABOUT: &str = "Convert TO destination to the relative path from the FROM dir.
@@ -25,15 +23,15 @@ mod options {
     pub const FROM: &str = "FROM";
 }
 
-fn get_usage() -> String {
-    format!("{} [-d DIR] TO [FROM]", executable!())
+fn usage() -> String {
+    format!("{} [-d DIR] TO [FROM]", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -42,16 +40,16 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         Some(p) => Path::new(p).to_path_buf(),
         None => env::current_dir().unwrap(),
     };
-    let absto = canonicalize(to, CanonicalizeMode::Normal).unwrap();
-    let absfrom = canonicalize(from, CanonicalizeMode::Normal).unwrap();
+    let absto = canonicalize(to, MissingHandling::Normal, ResolveMode::Logical).unwrap();
+    let absfrom = canonicalize(from, MissingHandling::Normal, ResolveMode::Logical).unwrap();
 
     if matches.is_present(options::DIR) {
         let base = Path::new(&matches.value_of(options::DIR).unwrap()).to_path_buf();
-        let absbase = canonicalize(base, CanonicalizeMode::Normal).unwrap();
+        let absbase = canonicalize(base, MissingHandling::Normal, ResolveMode::Logical).unwrap();
         if !absto.as_path().starts_with(absbase.as_path())
             || !absfrom.as_path().starts_with(absbase.as_path())
         {
-            println!("{}", absto.display());
+            println_verbatim(absto).unwrap();
             return 0;
         }
     }
@@ -77,12 +75,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .map(|x| result.push(x.as_os_str()))
         .last();
 
-    println!("{}", result.display());
+    println_verbatim(result).unwrap();
     0
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/rm/Cargo.toml b/src/uu/rm/Cargo.toml
index 2c30446e8..757fa8b22 100644
--- a/src/uu/rm/Cargo.toml
+++ b/src/uu/rm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_rm"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "rm ~ (uutils) remove PATHNAME"
@@ -18,12 +18,16 @@ path = "src/rm.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 walkdir = "2.2"
 remove_dir_all = "0.5.1"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+
+[target.'cfg(windows)'.dependencies]
 winapi = { version="0.3", features=[] }
 
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
-
-
 [[bin]]
 name = "rm"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs
index 1fdc59371..202adff27 100644
--- a/src/uu/rm/src/rm.rs
+++ b/src/uu/rm/src/rm.rs
@@ -17,6 +17,7 @@ use std::fs;
 use std::io::{stderr, stdin, BufRead, Write};
 use std::ops::BitOr;
 use std::path::{Path, PathBuf};
+use uucore::display::Quotable;
 use walkdir::{DirEntry, WalkDir};
 
 #[derive(Eq, PartialEq, Clone, Copy)]
@@ -53,8 +54,8 @@ static PRESUME_INPUT_TTY: &str = "presume-input-tty";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -75,7 +76,7 @@ fn get_long_usage() -> String {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let long_usage = get_long_usage();
 
     let matches = uu_app()
@@ -94,7 +95,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         // Still check by hand and not use clap
         // Because "rm -f" is a thing
         show_error!("missing an argument");
-        show_error!("for help, try '{0} --help'", executable!());
+        show_error!("for help, try '{0} --help'", uucore::execution_phrase());
         return 1;
     } else {
         let options = Options {
@@ -141,7 +142,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
 
@@ -186,6 +187,7 @@ pub fn uu_app() -> App<'static, 'static> {
         )
         .arg(
             Arg::with_name(OPT_RECURSIVE).short("r")
+            .multiple(true)
             .long(OPT_RECURSIVE)
             .help("remove directories and their contents recursively")
         )
@@ -248,7 +250,10 @@ fn remove(files: Vec<String>, options: Options) -> bool {
                 // (e.g., permission), even rm -f should fail with
                 // outputting the error, but there's no easy eay.
                 if !options.force {
-                    show_error!("cannot remove '{}': No such file or directory", filename);
+                    show_error!(
+                        "cannot remove {}: No such file or directory",
+                        filename.quote()
+                    );
                     true
                 } else {
                     false
@@ -275,13 +280,9 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
                     // GNU compatibility (rm/fail-eacces.sh)
                     // here, GNU doesn't use some kind of remove_dir_all
                     // It will show directory+file
-                    show_error!(
-                        "cannot remove '{}': {}",
-                        path.display(),
-                        "Permission denied"
-                    );
+                    show_error!("cannot remove {}: {}", path.quote(), "Permission denied");
                 } else {
-                    show_error!("cannot remove '{}': {}", path.display(), e);
+                    show_error!("cannot remove {}: {}", path.quote(), e);
                 }
             }
         } else {
@@ -299,7 +300,7 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
                     }
                     Err(e) => {
                         had_err = true;
-                        show_error!("recursing in '{}': {}", path.display(), e);
+                        show_error!("recursing in {}: {}", path.quote(), e);
                     }
                 }
             }
@@ -311,12 +312,12 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
     } else if options.dir && (!is_root || !options.preserve_root) {
         had_err = remove_dir(path, options).bitor(had_err);
     } else if options.recursive {
-        show_error!("could not remove directory '{}'", path.display());
+        show_error!("could not remove directory {}", path.quote());
         had_err = true;
     } else {
         show_error!(
-            "cannot remove '{}': Is a directory", // GNU's rm error message does not include help
-            path.display()
+            "cannot remove {}: Is a directory", // GNU's rm error message does not include help
+            path.quote()
         );
         had_err = true;
     }
@@ -337,36 +338,36 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
                     match fs::remove_dir(path) {
                         Ok(_) => {
                             if options.verbose {
-                                println!("removed directory '{}'", normalize(path).display());
+                                println!("removed directory {}", normalize(path).quote());
                             }
                         }
                         Err(e) => {
                             if e.kind() == std::io::ErrorKind::PermissionDenied {
                                 // GNU compatibility (rm/fail-eacces.sh)
                                 show_error!(
-                                    "cannot remove '{}': {}",
-                                    path.display(),
+                                    "cannot remove {}: {}",
+                                    path.quote(),
                                     "Permission denied"
                                 );
                             } else {
-                                show_error!("cannot remove '{}': {}", path.display(), e);
+                                show_error!("cannot remove {}: {}", path.quote(), e);
                             }
                             return true;
                         }
                     }
                 } else {
                     // directory can be read but is not empty
-                    show_error!("cannot remove '{}': Directory not empty", path.display());
+                    show_error!("cannot remove {}: Directory not empty", path.quote());
                     return true;
                 }
             } else {
                 // called to remove a symlink_dir (windows) without "-r"/"-R" or "-d"
-                show_error!("cannot remove '{}': Is a directory", path.display());
+                show_error!("cannot remove {}: Is a directory", path.quote());
                 return true;
             }
         } else {
             // GNU's rm shows this message if directory is empty but not readable
-            show_error!("cannot remove '{}': Directory not empty", path.display());
+            show_error!("cannot remove {}: Directory not empty", path.quote());
             return true;
         }
     }
@@ -384,19 +385,15 @@ fn remove_file(path: &Path, options: &Options) -> bool {
         match fs::remove_file(path) {
             Ok(_) => {
                 if options.verbose {
-                    println!("removed '{}'", normalize(path).display());
+                    println!("removed {}", normalize(path).quote());
                 }
             }
             Err(e) => {
                 if e.kind() == std::io::ErrorKind::PermissionDenied {
                     // GNU compatibility (rm/fail-eacces.sh)
-                    show_error!(
-                        "cannot remove '{}': {}",
-                        path.display(),
-                        "Permission denied"
-                    );
+                    show_error!("cannot remove {}: {}", path.quote(), "Permission denied");
                 } else {
-                    show_error!("cannot remove '{}': {}", path.display(), e);
+                    show_error!("cannot remove {}: {}", path.quote(), e);
                 }
                 return true;
             }
@@ -408,9 +405,9 @@ fn remove_file(path: &Path, options: &Options) -> bool {
 
 fn prompt_file(path: &Path, is_dir: bool) -> bool {
     if is_dir {
-        prompt(&(format!("rm: remove directory '{}'? ", path.display())))
+        prompt(&(format!("rm: remove directory {}? ", path.quote())))
     } else {
-        prompt(&(format!("rm: remove file '{}'? ", path.display())))
+        prompt(&(format!("rm: remove file {}? ", path.quote())))
     }
 }
 
diff --git a/src/uu/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml
index 27d94ec1d..bc05773a8 100644
--- a/src/uu/rmdir/Cargo.toml
+++ b/src/uu/rmdir/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_rmdir"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "rmdir ~ (uutils) remove empty DIRECTORY"
@@ -16,8 +16,9 @@ path = "src/rmdir.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+libc = "0.2.42"
 
 [[bin]]
 name = "rmdir"
diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs
index 8dbaf79a8..f982cf4c3 100644
--- a/src/uu/rmdir/src/rmdir.rs
+++ b/src/uu/rmdir/src/rmdir.rs
@@ -11,8 +11,12 @@
 extern crate uucore;
 
 use clap::{crate_version, App, Arg};
-use std::fs;
+use std::fs::{read_dir, remove_dir};
+use std::io;
 use std::path::Path;
+use uucore::display::Quotable;
+use uucore::error::{set_exit_code, strip_errno, UResult};
+use uucore::util_name;
 
 static ABOUT: &str = "Remove the DIRECTORY(ies), if they are empty.";
 static OPT_IGNORE_FAIL_NON_EMPTY: &str = "ignore-fail-on-non-empty";
@@ -21,39 +25,158 @@ static OPT_VERBOSE: &str = "verbose";
 
 static ARG_DIRS: &str = "dirs";
 
-#[cfg(unix)]
-static ENOTDIR: i32 = 20;
-#[cfg(windows)]
-static ENOTDIR: i32 = 267;
-
-fn get_usage() -> String {
-    format!("{0} [OPTION]... DIRECTORY...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... DIRECTORY...", uucore::execution_phrase())
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
-    let dirs: Vec<String> = matches
-        .values_of(ARG_DIRS)
-        .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_default();
+    let opts = Opts {
+        ignore: matches.is_present(OPT_IGNORE_FAIL_NON_EMPTY),
+        parents: matches.is_present(OPT_PARENTS),
+        verbose: matches.is_present(OPT_VERBOSE),
+    };
 
-    let ignore = matches.is_present(OPT_IGNORE_FAIL_NON_EMPTY);
-    let parents = matches.is_present(OPT_PARENTS);
-    let verbose = matches.is_present(OPT_VERBOSE);
+    for path in matches
+        .values_of_os(ARG_DIRS)
+        .unwrap_or_default()
+        .map(Path::new)
+    {
+        if let Err(error) = remove(path, opts) {
+            let Error { error, path } = error;
 
-    match remove(dirs, ignore, parents, verbose) {
-        Ok(()) => ( /* pass */ ),
-        Err(e) => return e,
+            if opts.ignore && dir_not_empty(&error, path) {
+                continue;
+            }
+
+            set_exit_code(1);
+
+            // If `foo` is a symlink to a directory then `rmdir foo/` may give
+            // a "not a directory" error. This is confusing as `rm foo/` says
+            // "is a directory".
+            // This differs from system to system. Some don't give an error.
+            // Windows simply allows calling RemoveDirectory on symlinks so we
+            // don't need to worry about it here.
+            // GNU rmdir seems to print "Symbolic link not followed" if:
+            // - It has a trailing slash
+            // - It's a symlink
+            // - It either points to a directory or dangles
+            #[cfg(unix)]
+            {
+                use std::ffi::OsStr;
+                use std::os::unix::ffi::OsStrExt;
+
+                fn is_symlink(path: &Path) -> io::Result<bool> {
+                    Ok(path.symlink_metadata()?.file_type().is_symlink())
+                }
+
+                fn points_to_directory(path: &Path) -> io::Result<bool> {
+                    Ok(path.metadata()?.file_type().is_dir())
+                }
+
+                let bytes = path.as_os_str().as_bytes();
+                if error.raw_os_error() == Some(libc::ENOTDIR) && bytes.ends_with(b"/") {
+                    // Strip the trailing slash or .symlink_metadata() will follow the symlink
+                    let no_slash: &Path = OsStr::from_bytes(&bytes[..bytes.len() - 1]).as_ref();
+                    if is_symlink(no_slash).unwrap_or(false)
+                        && points_to_directory(no_slash).unwrap_or(true)
+                    {
+                        show_error!(
+                            "failed to remove {}: Symbolic link not followed",
+                            path.quote()
+                        );
+                        continue;
+                    }
+                }
+            }
+
+            show_error!("failed to remove {}: {}", path.quote(), strip_errno(&error));
+        }
     }
 
-    0
+    Ok(())
+}
+
+struct Error<'a> {
+    error: io::Error,
+    path: &'a Path,
+}
+
+fn remove(mut path: &Path, opts: Opts) -> Result<(), Error<'_>> {
+    remove_single(path, opts)?;
+    if opts.parents {
+        while let Some(new) = path.parent() {
+            path = new;
+            if path.as_os_str() == "" {
+                break;
+            }
+            remove_single(path, opts)?;
+        }
+    }
+    Ok(())
+}
+
+fn remove_single(path: &Path, opts: Opts) -> Result<(), Error<'_>> {
+    if opts.verbose {
+        println!("{}: removing directory, {}", util_name(), path.quote());
+    }
+    remove_dir(path).map_err(|error| Error { error, path })
+}
+
+// POSIX: https://pubs.opengroup.org/onlinepubs/009696799/functions/rmdir.html
+#[cfg(not(windows))]
+const NOT_EMPTY_CODES: &[i32] = &[libc::ENOTEMPTY, libc::EEXIST];
+
+// 145 is ERROR_DIR_NOT_EMPTY, determined experimentally.
+#[cfg(windows)]
+const NOT_EMPTY_CODES: &[i32] = &[145];
+
+// Other error codes you might get for directories that could be found and are
+// not empty.
+// This is a subset of the error codes listed in rmdir(2) from the Linux man-pages
+// project. Maybe other systems have additional codes that apply?
+#[cfg(not(windows))]
+const PERHAPS_EMPTY_CODES: &[i32] = &[libc::EACCES, libc::EBUSY, libc::EPERM, libc::EROFS];
+
+// Probably incomplete, I can't find a list of possible errors for
+// RemoveDirectory anywhere.
+#[cfg(windows)]
+const PERHAPS_EMPTY_CODES: &[i32] = &[
+    5, // ERROR_ACCESS_DENIED, found experimentally.
+];
+
+fn dir_not_empty(error: &io::Error, path: &Path) -> bool {
+    if let Some(code) = error.raw_os_error() {
+        if NOT_EMPTY_CODES.contains(&code) {
+            return true;
+        }
+        // If --ignore-fail-on-non-empty is used then we want to ignore all errors
+        // for non-empty directories, even if the error was e.g. because there's
+        // no permission. So we do an additional check.
+        if PERHAPS_EMPTY_CODES.contains(&code) {
+            if let Ok(mut iterator) = read_dir(path) {
+                if iterator.next().is_some() {
+                    return true;
+                }
+            }
+        }
+    }
+    false
+}
+
+#[derive(Clone, Copy, Debug)]
+struct Opts {
+    ignore: bool,
+    parents: bool,
+    verbose: bool,
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -84,57 +207,3 @@ pub fn uu_app() -> App<'static, 'static> {
                 .required(true),
         )
 }
-
-fn remove(dirs: Vec<String>, ignore: bool, parents: bool, verbose: bool) -> Result<(), i32> {
-    let mut r = Ok(());
-
-    for dir in &dirs {
-        let path = Path::new(&dir[..]);
-        r = remove_dir(path, ignore, verbose).and(r);
-        if parents {
-            let mut p = path;
-            while let Some(new_p) = p.parent() {
-                p = new_p;
-                match p.as_os_str().to_str() {
-                    None => break,
-                    Some(s) => match s {
-                        "" | "." | "/" => break,
-                        _ => (),
-                    },
-                };
-                r = remove_dir(p, ignore, verbose).and(r);
-            }
-        }
-    }
-
-    r
-}
-
-fn remove_dir(path: &Path, ignore: bool, verbose: bool) -> Result<(), i32> {
-    let mut read_dir = fs::read_dir(path).map_err(|e| {
-        if e.raw_os_error() == Some(ENOTDIR) {
-            show_error!("failed to remove '{}': Not a directory", path.display());
-        } else {
-            show_error!("reading directory '{}': {}", path.display(), e);
-        }
-        1
-    })?;
-
-    let mut r = Ok(());
-
-    if read_dir.next().is_none() {
-        match fs::remove_dir(path) {
-            Err(e) => {
-                show_error!("removing directory '{}': {}", path.display(), e);
-                r = Err(1);
-            }
-            Ok(_) if verbose => println!("removing directory, '{}'", path.display()),
-            _ => (),
-        }
-    } else if !ignore {
-        show_error!("failed to remove '{}': Directory not empty", path.display());
-        r = Err(1);
-    }
-
-    r
-}
diff --git a/src/uu/runcon/Cargo.toml b/src/uu/runcon/Cargo.toml
new file mode 100644
index 000000000..ff06e72a1
--- /dev/null
+++ b/src/uu/runcon/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "uu_runcon"
+version = "0.0.8"
+authors = ["uutils developers"]
+license = "MIT"
+description = "runcon ~ (uutils) run command with specified security context"
+homepage = "https://github.com/uutils/coreutils"
+repository = "https://github.com/uutils/coreutils/tree/master/src/uu/runcon"
+keywords = ["coreutils", "uutils", "cli", "utility"]
+categories = ["command-line-utilities"]
+edition = "2018"
+
+[lib]
+path = "src/runcon.rs"
+
+[dependencies]
+clap         = { version = "2.33", features = ["wrap_help"] }
+uucore       = { version = ">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] }
+uucore_procs = { version = ">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+selinux      = { version = "0.2"   }
+fts-sys      = { version = "0.2"   }
+thiserror    = { version = "1.0"   }
+libc         = { version = "0.2"   }
+
+[[bin]]
+name = "runcon"
+path = "src/main.rs"
diff --git a/src/uu/runcon/src/errors.rs b/src/uu/runcon/src/errors.rs
new file mode 100644
index 000000000..5f8258de0
--- /dev/null
+++ b/src/uu/runcon/src/errors.rs
@@ -0,0 +1,75 @@
+use std::ffi::OsString;
+use std::fmt::Write;
+use std::io;
+use std::str::Utf8Error;
+
+use uucore::display::Quotable;
+
+pub(crate) type Result<T> = std::result::Result<T, Error>;
+
+#[derive(thiserror::Error, Debug)]
+pub(crate) enum Error {
+    #[error("No command is specified")]
+    MissingCommand,
+
+    #[error("SELinux is not enabled")]
+    SELinuxNotEnabled,
+
+    #[error(transparent)]
+    NotUTF8(#[from] Utf8Error),
+
+    #[error(transparent)]
+    CommandLine(#[from] clap::Error),
+
+    #[error("{operation} failed")]
+    SELinux {
+        operation: &'static str,
+        source: selinux::errors::Error,
+    },
+
+    #[error("{operation} failed")]
+    Io {
+        operation: &'static str,
+        source: io::Error,
+    },
+
+    #[error("{operation} failed on {}", .operand1.quote())]
+    Io1 {
+        operation: &'static str,
+        operand1: OsString,
+        source: io::Error,
+    },
+}
+
+impl Error {
+    pub(crate) fn from_io(operation: &'static str, source: io::Error) -> Self {
+        Self::Io { operation, source }
+    }
+
+    pub(crate) fn from_io1(
+        operation: &'static str,
+        operand1: impl Into<OsString>,
+        source: io::Error,
+    ) -> Self {
+        Self::Io1 {
+            operation,
+            operand1: operand1.into(),
+            source,
+        }
+    }
+
+    pub(crate) fn from_selinux(operation: &'static str, source: selinux::errors::Error) -> Self {
+        Self::SELinux { operation, source }
+    }
+}
+
+pub(crate) fn report_full_error(mut err: &dyn std::error::Error) -> String {
+    let mut desc = String::with_capacity(256);
+    write!(&mut desc, "{}", err).unwrap();
+    while let Some(source) = err.source() {
+        err = source;
+        write!(&mut desc, ": {}", err).unwrap();
+    }
+    desc.push('.');
+    desc
+}
diff --git a/src/uu/runcon/src/main.rs b/src/uu/runcon/src/main.rs
new file mode 100644
index 000000000..86aae54e5
--- /dev/null
+++ b/src/uu/runcon/src/main.rs
@@ -0,0 +1 @@
+uucore_procs::main!(uu_runcon);
diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs
new file mode 100644
index 000000000..b2f1468bd
--- /dev/null
+++ b/src/uu/runcon/src/runcon.rs
@@ -0,0 +1,450 @@
+// spell-checker:ignore (vars) RFILE
+
+use uucore::{show_error, show_usage_error};
+
+use clap::{App, Arg};
+use selinux::{OpaqueSecurityContext, SecurityClass, SecurityContext};
+
+use std::borrow::Cow;
+use std::ffi::{CStr, CString, OsStr, OsString};
+use std::os::raw::c_char;
+use std::os::unix::ffi::OsStrExt;
+use std::{io, ptr};
+
+mod errors;
+
+use errors::{report_full_error, Error, Result};
+
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+const ABOUT: &str = "Run command with specified security context.";
+const DESCRIPTION: &str = "Run COMMAND with completely-specified CONTEXT, or with current or \
+                      transitioned security context modified by one or more of \
+                      LEVEL, ROLE, TYPE, and USER.\n\n\
+                      If none of --compute, --type, --user, --role or --range is specified, \
+                      then the first argument is used as the complete context.\n\n\
+                      Note that only carefully-chosen contexts are likely to successfully run.\n\n\
+                      With neither CONTEXT nor COMMAND are specified, \
+                      then this prints the current security context.";
+
+pub mod options {
+    pub const COMPUTE: &str = "compute";
+
+    pub const USER: &str = "user";
+    pub const ROLE: &str = "role";
+    pub const TYPE: &str = "type";
+    pub const RANGE: &str = "range";
+}
+
+// This list is NOT exhaustive. This command might perform an `execvp()` to run
+// a different program. When that happens successfully, the exit status of this
+// process will be the exit status of that program.
+mod error_exit_status {
+    pub const SUCCESS: i32 = libc::EXIT_SUCCESS;
+    pub const NOT_FOUND: i32 = 127;
+    pub const COULD_NOT_EXECUTE: i32 = 126;
+    pub const ANOTHER_ERROR: i32 = libc::EXIT_FAILURE;
+}
+
+fn get_usage() -> String {
+    format!(
+        "{0} [CONTEXT COMMAND [ARG...]]\n    \
+         {0} [-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [ARG...]",
+        uucore::execution_phrase()
+    )
+}
+
+pub fn uumain(args: impl uucore::Args) -> i32 {
+    let usage = get_usage();
+
+    let config = uu_app().usage(usage.as_ref());
+
+    let options = match parse_command_line(config, args) {
+        Ok(r) => r,
+        Err(r) => {
+            if let Error::CommandLine(ref r) = r {
+                match r.kind {
+                    clap::ErrorKind::HelpDisplayed | clap::ErrorKind::VersionDisplayed => {
+                        println!("{}", r);
+                        return error_exit_status::SUCCESS;
+                    }
+                    _ => {}
+                }
+            }
+
+            show_usage_error!("{}.\n", r);
+            return error_exit_status::ANOTHER_ERROR;
+        }
+    };
+
+    match &options.mode {
+        CommandLineMode::Print => {
+            if let Err(r) = print_current_context() {
+                show_error!("{}", report_full_error(&r));
+                return error_exit_status::ANOTHER_ERROR;
+            }
+        }
+
+        CommandLineMode::PlainContext { context, command } => {
+            let (exit_status, err) =
+                if let Err(err) = get_plain_context(context).and_then(set_next_exec_context) {
+                    (error_exit_status::ANOTHER_ERROR, err)
+                } else {
+                    // On successful execution, the following call never returns,
+                    // and this process image is replaced.
+                    execute_command(command, &options.arguments)
+                };
+
+            show_error!("{}", report_full_error(&err));
+            return exit_status;
+        }
+
+        CommandLineMode::CustomContext {
+            compute_transition_context,
+            user,
+            role,
+            the_type,
+            range,
+            command,
+        } => {
+            if let Some(command) = command {
+                let (exit_status, err) = if let Err(err) = get_custom_context(
+                    *compute_transition_context,
+                    user.as_deref(),
+                    role.as_deref(),
+                    the_type.as_deref(),
+                    range.as_deref(),
+                    command,
+                )
+                .and_then(set_next_exec_context)
+                {
+                    (error_exit_status::ANOTHER_ERROR, err)
+                } else {
+                    // On successful execution, the following call never returns,
+                    // and this process image is replaced.
+                    execute_command(command, &options.arguments)
+                };
+
+                show_error!("{}", report_full_error(&err));
+                return exit_status;
+            } else if let Err(r) = print_current_context() {
+                show_error!("{}", report_full_error(&r));
+                return error_exit_status::ANOTHER_ERROR;
+            }
+        }
+    }
+
+    error_exit_status::SUCCESS
+}
+
+pub fn uu_app() -> App<'static, 'static> {
+    App::new(uucore::util_name())
+        .version(VERSION)
+        .about(ABOUT)
+        .after_help(DESCRIPTION)
+        .arg(
+            Arg::with_name(options::COMPUTE)
+                .short("c")
+                .long(options::COMPUTE)
+                .takes_value(false)
+                .help("Compute process transition context before modifying."),
+        )
+        .arg(
+            Arg::with_name(options::USER)
+                .short("u")
+                .long(options::USER)
+                .takes_value(true)
+                .value_name("USER")
+                .help("Set user USER in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::ROLE)
+                .short("r")
+                .long(options::ROLE)
+                .takes_value(true)
+                .value_name("ROLE")
+                .help("Set role ROLE in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::TYPE)
+                .short("t")
+                .long(options::TYPE)
+                .takes_value(true)
+                .value_name("TYPE")
+                .help("Set type TYPE in the target security context."),
+        )
+        .arg(
+            Arg::with_name(options::RANGE)
+                .short("l")
+                .long(options::RANGE)
+                .takes_value(true)
+                .value_name("RANGE")
+                .help("Set range RANGE in the target security context."),
+        )
+        .arg(Arg::with_name("ARG").multiple(true))
+        // Once "ARG" is parsed, everything after that belongs to it.
+        //
+        // This is not how POSIX does things, but this is how the GNU implementation
+        // parses its command line.
+        .setting(clap::AppSettings::TrailingVarArg)
+}
+
+#[derive(Debug)]
+enum CommandLineMode {
+    Print,
+
+    PlainContext {
+        context: OsString,
+        command: OsString,
+    },
+
+    CustomContext {
+        /// Compute process transition context before modifying.
+        compute_transition_context: bool,
+
+        /// Use the current context with the specified user.
+        user: Option<OsString>,
+
+        /// Use the current context with the specified role.
+        role: Option<OsString>,
+
+        /// Use the current context with the specified type.
+        the_type: Option<OsString>,
+
+        /// Use the current context with the specified range.
+        range: Option<OsString>,
+
+        // `command` can be `None`, in which case we're dealing with this syntax:
+        // runcon [-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE]
+        //
+        // This syntax is undocumented, but it is accepted by the GNU implementation,
+        // so we do the same for compatibility.
+        command: Option<OsString>,
+    },
+}
+
+#[derive(Debug)]
+struct Options {
+    mode: CommandLineMode,
+    arguments: Vec<OsString>,
+}
+
+fn parse_command_line(config: App, args: impl uucore::Args) -> Result<Options> {
+    let matches = config.get_matches_from_safe(args)?;
+
+    let compute_transition_context = matches.is_present(options::COMPUTE);
+
+    let mut args = matches
+        .values_of_os("ARG")
+        .unwrap_or_default()
+        .map(OsString::from);
+
+    if compute_transition_context
+        || matches.is_present(options::USER)
+        || matches.is_present(options::ROLE)
+        || matches.is_present(options::TYPE)
+        || matches.is_present(options::RANGE)
+    {
+        // runcon [-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] [COMMAND [args]]
+
+        let mode = CommandLineMode::CustomContext {
+            compute_transition_context,
+            user: matches.value_of_os(options::USER).map(Into::into),
+            role: matches.value_of_os(options::ROLE).map(Into::into),
+            the_type: matches.value_of_os(options::TYPE).map(Into::into),
+            range: matches.value_of_os(options::RANGE).map(Into::into),
+            command: args.next(),
+        };
+
+        Ok(Options {
+            mode,
+            arguments: args.collect(),
+        })
+    } else if let Some(context) = args.next() {
+        // runcon CONTEXT COMMAND [args]
+
+        args.next()
+            .ok_or(Error::MissingCommand)
+            .map(move |command| Options {
+                mode: CommandLineMode::PlainContext { context, command },
+                arguments: args.collect(),
+            })
+    } else {
+        // runcon
+
+        Ok(Options {
+            mode: CommandLineMode::Print,
+            arguments: Vec::default(),
+        })
+    }
+}
+
+fn print_current_context() -> Result<()> {
+    let op = "Getting security context of the current process";
+    let context = SecurityContext::current(false).map_err(|r| Error::from_selinux(op, r))?;
+
+    let context = context
+        .to_c_string()
+        .map_err(|r| Error::from_selinux(op, r))?;
+
+    if let Some(context) = context {
+        let context = context.as_ref().to_str()?;
+        println!("{}", context);
+    } else {
+        println!();
+    }
+    Ok(())
+}
+
+fn set_next_exec_context(context: OpaqueSecurityContext) -> Result<()> {
+    let c_context = context
+        .to_c_string()
+        .map_err(|r| Error::from_selinux("Creating new context", r))?;
+
+    let sc = SecurityContext::from_c_str(&c_context, false);
+
+    if sc.check() != Some(true) {
+        let ctx = OsStr::from_bytes(c_context.as_bytes());
+        let err = io::ErrorKind::InvalidInput.into();
+        return Err(Error::from_io1("Checking security context", ctx, err));
+    }
+
+    sc.set_for_next_exec()
+        .map_err(|r| Error::from_selinux("Setting new security context", r))
+}
+
+fn get_plain_context(context: &OsStr) -> Result<OpaqueSecurityContext> {
+    if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
+        return Err(Error::SELinuxNotEnabled);
+    }
+
+    let c_context = os_str_to_c_string(context)?;
+
+    OpaqueSecurityContext::from_c_str(&c_context)
+        .map_err(|r| Error::from_selinux("Creating new context", r))
+}
+
+fn get_transition_context(command: &OsStr) -> Result<SecurityContext> {
+    // Generate context based on process transition.
+    let sec_class = SecurityClass::from_name("process")
+        .map_err(|r| Error::from_selinux("Getting process security class", r))?;
+
+    // Get context of file to be executed.
+    let file_context = match SecurityContext::of_path(command, true, false) {
+        Ok(Some(context)) => context,
+
+        Ok(None) => {
+            let err = io::Error::from_raw_os_error(libc::ENODATA);
+            return Err(Error::from_io1("getfilecon", command, err));
+        }
+
+        Err(r) => {
+            let op = "Getting security context of command file";
+            return Err(Error::from_selinux(op, r));
+        }
+    };
+
+    let process_context = SecurityContext::current(false)
+        .map_err(|r| Error::from_selinux("Getting security context of the current process", r))?;
+
+    // Compute result of process transition.
+    process_context
+        .of_labeling_decision(&file_context, sec_class, "")
+        .map_err(|r| Error::from_selinux("Computing result of process transition", r))
+}
+
+fn get_initial_custom_opaque_context(
+    compute_transition_context: bool,
+    command: &OsStr,
+) -> Result<OpaqueSecurityContext> {
+    let context = if compute_transition_context {
+        get_transition_context(command)?
+    } else {
+        SecurityContext::current(false).map_err(|r| {
+            Error::from_selinux("Getting security context of the current process", r)
+        })?
+    };
+
+    let c_context = context
+        .to_c_string()
+        .map_err(|r| Error::from_selinux("Getting security context", r))?
+        .unwrap_or_else(|| Cow::Owned(CString::default()));
+
+    OpaqueSecurityContext::from_c_str(c_context.as_ref())
+        .map_err(|r| Error::from_selinux("Creating new context", r))
+}
+
+fn get_custom_context(
+    compute_transition_context: bool,
+    user: Option<&OsStr>,
+    role: Option<&OsStr>,
+    the_type: Option<&OsStr>,
+    range: Option<&OsStr>,
+    command: &OsStr,
+) -> Result<OpaqueSecurityContext> {
+    use OpaqueSecurityContext as OSC;
+    type SetNewValueProc = fn(&OSC, &CStr) -> selinux::errors::Result<()>;
+
+    if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
+        return Err(Error::SELinuxNotEnabled);
+    }
+
+    let osc = get_initial_custom_opaque_context(compute_transition_context, command)?;
+
+    let list: &[(Option<&OsStr>, SetNewValueProc, &'static str)] = &[
+        (user, OSC::set_user, "Setting security context user"),
+        (role, OSC::set_role, "Setting security context role"),
+        (the_type, OSC::set_type, "Setting security context type"),
+        (range, OSC::set_range, "Setting security context range"),
+    ];
+
+    for &(new_value, method, op) in list {
+        if let Some(new_value) = new_value {
+            let c_new_value = os_str_to_c_string(new_value)?;
+            method(&osc, &c_new_value).map_err(|r| Error::from_selinux(op, r))?;
+        }
+    }
+    Ok(osc)
+}
+
+/// The actual return type of this function should be `Result<!, (i32, Error)>`
+/// However, until the *never* type is stabilized, one way to indicate to the
+/// compiler the only valid return type is to say "if this returns, it will
+/// always return an error".
+fn execute_command(command: &OsStr, arguments: &[OsString]) -> (i32, Error) {
+    let c_command = match os_str_to_c_string(command) {
+        Ok(v) => v,
+        Err(r) => return (error_exit_status::ANOTHER_ERROR, r),
+    };
+
+    let argv_storage: Vec<CString> = match arguments
+        .iter()
+        .map(AsRef::as_ref)
+        .map(os_str_to_c_string)
+        .collect::<Result<_>>()
+    {
+        Ok(v) => v,
+        Err(r) => return (error_exit_status::ANOTHER_ERROR, r),
+    };
+
+    let mut argv: Vec<*const c_char> = Vec::with_capacity(arguments.len().saturating_add(2));
+    argv.push(c_command.as_ptr());
+    argv.extend(argv_storage.iter().map(AsRef::as_ref).map(CStr::as_ptr));
+    argv.push(ptr::null());
+
+    unsafe { libc::execvp(c_command.as_ptr(), argv.as_ptr()) };
+
+    let err = io::Error::last_os_error();
+    let exit_status = if err.kind() == io::ErrorKind::NotFound {
+        error_exit_status::NOT_FOUND
+    } else {
+        error_exit_status::COULD_NOT_EXECUTE
+    };
+
+    let err = Error::from_io1("Executing command", command, err);
+    (exit_status, err)
+}
+
+fn os_str_to_c_string(s: &OsStr) -> Result<CString> {
+    CString::new(s.as_bytes())
+        .map_err(|_r| Error::from_io("CString::new()", io::ErrorKind::InvalidInput.into()))
+}
diff --git a/src/uu/seq/Cargo.toml b/src/uu/seq/Cargo.toml
index 68aa87bad..f5a23310f 100644
--- a/src/uu/seq/Cargo.toml
+++ b/src/uu/seq/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_seq"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "seq ~ (uutils) display a sequence of numbers"
@@ -18,9 +18,13 @@ path = "src/seq.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 num-bigint = "0.4.0"
 num-traits = "0.2.14"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "seq"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/seq/src/digits.rs b/src/uu/seq/src/digits.rs
new file mode 100644
index 000000000..bde933978
--- /dev/null
+++ b/src/uu/seq/src/digits.rs
@@ -0,0 +1,190 @@
+//! Counting number of digits needed to represent a number.
+//!
+//! The [`num_integral_digits`] and [`num_fractional_digits`] functions
+//! count the number of digits needed to represent a number in decimal
+//! notation (like "123.456").
+use std::convert::TryInto;
+use std::num::ParseIntError;
+
+use uucore::display::Quotable;
+
+/// The number of digits after the decimal point in a given number.
+///
+/// The input `s` is a string representing a number, either an integer
+/// or a floating point number in either decimal notation or scientific
+/// notation. This function returns the number of digits after the
+/// decimal point needed to print the number in decimal notation.
+///
+/// # Examples
+///
+/// ```rust,ignore
+/// assert_eq!(num_fractional_digits("123.45e-1").unwrap(), 3);
+/// ```
+pub fn num_fractional_digits(s: &str) -> Result<usize, ParseIntError> {
+    match (s.find('.'), s.find('e')) {
+        // For example, "123456".
+        (None, None) => Ok(0),
+
+        // For example, "123e456".
+        (None, Some(j)) => {
+            let exponent: i64 = s[j + 1..].parse()?;
+            if exponent < 0 {
+                Ok(-exponent as usize)
+            } else {
+                Ok(0)
+            }
+        }
+
+        // For example, "123.456".
+        (Some(i), None) => Ok(s.len() - (i + 1)),
+
+        // For example, "123.456e789".
+        (Some(i), Some(j)) if i < j => {
+            // Because of the match guard, this subtraction will not underflow.
+            let num_digits_between_decimal_point_and_e = (j - (i + 1)) as i64;
+            let exponent: i64 = s[j + 1..].parse()?;
+            if num_digits_between_decimal_point_and_e < exponent {
+                Ok(0)
+            } else {
+                Ok((num_digits_between_decimal_point_and_e - exponent)
+                    .try_into()
+                    .unwrap())
+            }
+        }
+        _ => crash!(
+            1,
+            "invalid floating point argument: {}\n Try '{} --help' for more information.",
+            s.quote(),
+            uucore::execution_phrase()
+        ),
+    }
+}
+
+/// The number of digits before the decimal point in a given number.
+///
+/// The input `s` is a string representing a number, either an integer
+/// or a floating point number in either decimal notation or scientific
+/// notation. This function returns the number of digits before the
+/// decimal point needed to print the number in decimal notation.
+///
+/// # Examples
+///
+/// ```rust,ignore
+/// assert_eq!(num_fractional_digits("123.45e-1").unwrap(), 2);
+/// ```
+pub fn num_integral_digits(s: &str) -> Result<usize, ParseIntError> {
+    match (s.find('.'), s.find('e')) {
+        // For example, "123456".
+        (None, None) => Ok(s.len()),
+
+        // For example, "123e456".
+        (None, Some(j)) => {
+            let exponent: i64 = s[j + 1..].parse()?;
+            let total = j as i64 + exponent;
+            if total < 1 {
+                Ok(1)
+            } else {
+                Ok(total.try_into().unwrap())
+            }
+        }
+
+        // For example, "123.456".
+        (Some(i), None) => Ok(i),
+
+        // For example, "123.456e789".
+        (Some(i), Some(j)) => {
+            let exponent: i64 = s[j + 1..].parse()?;
+            let minimum: usize = {
+                let integral_part: f64 = crash_if_err!(1, s[..j].parse());
+                if integral_part == -0.0 && integral_part.is_sign_negative() {
+                    2
+                } else {
+                    1
+                }
+            };
+
+            let total = i as i64 + exponent;
+            if total < minimum as i64 {
+                Ok(minimum)
+            } else {
+                Ok(total.try_into().unwrap())
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    mod test_num_integral_digits {
+        use crate::num_integral_digits;
+
+        #[test]
+        fn test_integer() {
+            assert_eq!(num_integral_digits("123").unwrap(), 3);
+        }
+
+        #[test]
+        fn test_decimal() {
+            assert_eq!(num_integral_digits("123.45").unwrap(), 3);
+        }
+
+        #[test]
+        fn test_scientific_no_decimal_positive_exponent() {
+            assert_eq!(num_integral_digits("123e4").unwrap(), 3 + 4);
+        }
+
+        #[test]
+        fn test_scientific_with_decimal_positive_exponent() {
+            assert_eq!(num_integral_digits("123.45e6").unwrap(), 3 + 6);
+        }
+
+        #[test]
+        fn test_scientific_no_decimal_negative_exponent() {
+            assert_eq!(num_integral_digits("123e-4").unwrap(), 1);
+        }
+
+        #[test]
+        fn test_scientific_with_decimal_negative_exponent() {
+            assert_eq!(num_integral_digits("123.45e-6").unwrap(), 1);
+            assert_eq!(num_integral_digits("123.45e-1").unwrap(), 2);
+        }
+    }
+
+    mod test_num_fractional_digits {
+        use crate::num_fractional_digits;
+
+        #[test]
+        fn test_integer() {
+            assert_eq!(num_fractional_digits("123").unwrap(), 0);
+        }
+
+        #[test]
+        fn test_decimal() {
+            assert_eq!(num_fractional_digits("123.45").unwrap(), 2);
+        }
+
+        #[test]
+        fn test_scientific_no_decimal_positive_exponent() {
+            assert_eq!(num_fractional_digits("123e4").unwrap(), 0);
+        }
+
+        #[test]
+        fn test_scientific_with_decimal_positive_exponent() {
+            assert_eq!(num_fractional_digits("123.45e6").unwrap(), 0);
+            assert_eq!(num_fractional_digits("123.45e1").unwrap(), 1);
+        }
+
+        #[test]
+        fn test_scientific_no_decimal_negative_exponent() {
+            assert_eq!(num_fractional_digits("123e-4").unwrap(), 4);
+            assert_eq!(num_fractional_digits("123e-1").unwrap(), 1);
+        }
+
+        #[test]
+        fn test_scientific_with_decimal_negative_exponent() {
+            assert_eq!(num_fractional_digits("123.45e-6").unwrap(), 8);
+            assert_eq!(num_fractional_digits("123.45e-1").unwrap(), 3);
+        }
+    }
+}
diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs
index 50a93d3af..a76a23c4e 100644
--- a/src/uu/seq/src/seq.rs
+++ b/src/uu/seq/src/seq.rs
@@ -12,9 +12,15 @@ use num_traits::One;
 use num_traits::Zero;
 use num_traits::{Num, ToPrimitive};
 use std::cmp;
-use std::io::{stdout, Write};
+use std::io::{stdout, ErrorKind, Write};
 use std::str::FromStr;
 
+mod digits;
+use crate::digits::num_fractional_digits;
+use crate::digits::num_integral_digits;
+
+use uucore::display::Quotable;
+
 static ABOUT: &str = "Display numbers from FIRST to LAST, in steps of INCREMENT.";
 static OPT_SEPARATOR: &str = "separator";
 static OPT_TERMINATOR: &str = "terminator";
@@ -22,12 +28,12 @@ static OPT_WIDTHS: &str = "widths";
 
 static ARG_NUMBERS: &str = "numbers";
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... LAST
     {0} [OPTION]... FIRST LAST
     {0} [OPTION]... FIRST INCREMENT LAST",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 #[derive(Clone)]
@@ -38,6 +44,8 @@ struct SeqOptions {
 }
 
 enum Number {
+    /// Negative zero, as if it were an integer.
+    MinusZero,
     BigInt(BigInt),
     F64(f64),
 }
@@ -45,6 +53,7 @@ enum Number {
 impl Number {
     fn is_zero(&self) -> bool {
         match self {
+            Number::MinusZero => true,
             Number::BigInt(n) => n.is_zero(),
             Number::F64(n) => n.is_zero(),
         }
@@ -52,41 +61,109 @@ impl Number {
 
     fn into_f64(self) -> f64 {
         match self {
+            Number::MinusZero => -0.,
             // BigInt::to_f64() can not return None.
             Number::BigInt(n) => n.to_f64().unwrap(),
             Number::F64(n) => n,
         }
     }
+
+    /// Convert this number into a bigint, consuming it.
+    ///
+    /// For floats, this returns the [`BigInt`] corresponding to the
+    /// floor of the number.
+    fn into_bigint(self) -> BigInt {
+        match self {
+            Number::MinusZero => BigInt::zero(),
+            Number::F64(x) => BigInt::from(x.floor() as i64),
+            Number::BigInt(n) => n,
+        }
+    }
 }
 
 impl FromStr for Number {
     type Err = String;
     fn from_str(mut s: &str) -> Result<Self, Self::Err> {
+        s = s.trim_start();
         if s.starts_with('+') {
             s = &s[1..];
         }
+        let is_neg = s.starts_with('-');
 
-        match s.parse::<BigInt>() {
-            Ok(n) => Ok(Number::BigInt(n)),
-            Err(_) => match s.parse::<f64>() {
-                Ok(value) if value.is_nan() => Err(format!(
-                    "invalid 'not-a-number' argument: '{}'\nTry '{} --help' for more information.",
-                    s,
-                    executable!(),
+        match s.to_lowercase().find("0x") {
+            Some(i) if i <= 1 => match &s.as_bytes()[i + 2] {
+                    b'-' | b'+' => Err(format!(
+                    "invalid hexadecimal argument: {}\nTry '{} --help' for more information.",
+                    s.quote(),
+                    uucore::execution_phrase(),
                 )),
-                Ok(value) => Ok(Number::F64(value)),
-                Err(_) => Err(format!(
-                    "invalid floating point argument: '{}'\nTry '{} --help' for more information.",
-                    s,
-                    executable!(),
+                    // TODO: hexadecimal floating point parsing (see #2660)
+                    b'.' => Err(format!(
+                    "NotImplemented: hexadecimal floating point numbers: {}\nTry '{} --help' for more information.",
+                    s.quote(),
+                    uucore::execution_phrase(),
                 )),
+                    _ => {
+                        let num = BigInt::from_str_radix(&s[i + 2..], 16)
+                            .map_err(|_| format!(
+                    "invalid hexadecimal argument: {}\nTry '{} --help' for more information.",
+                    s.quote(),
+                    uucore::execution_phrase(),
+                ))?;
+                        match (is_neg, num == BigInt::zero()) {
+                            (true, true) => Ok(Number::MinusZero),
+                            (true, false) => Ok(Number::BigInt(-num)),
+                            (false, _) => Ok(Number::BigInt(num)),
+                        }
+                    }
+                },
+            Some(_) => Err(format!(
+                "invalid hexadecimal argument: {}\nTry '{} --help' for more information.",
+                s.quote(),
+                uucore::execution_phrase(),
+            )),
+
+            None => match s.parse::<BigInt>() {
+                Ok(n) => {
+                    // If `s` is '-0', then `parse()` returns
+                    // `BigInt::zero()`, but we need to return
+                    // `Number::MinusZero` instead.
+                    if n == BigInt::zero() && is_neg {
+                        Ok(Number::MinusZero)
+                    } else {
+                        Ok(Number::BigInt(n))
+                    }
+                }
+                Err(_) => match s.parse::<f64>() {
+                    Ok(value) if value.is_nan() => Err(format!(
+                    "invalid 'not-a-number' argument: {}\nTry '{} --help' for more information.",
+                    s.quote(),
+                    uucore::execution_phrase(),
+                )),
+                    Ok(value) => Ok(Number::F64(value)),
+                    Err(_) => Err(format!(
+                    "invalid floating point argument: {}\nTry '{} --help' for more information.",
+                    s.quote(),
+                    uucore::execution_phrase(),
+                )),
+                },
             },
         }
     }
 }
 
+/// A range of integers.
+///
+/// The elements are (first, increment, last).
+type RangeInt = (BigInt, BigInt, BigInt);
+
+/// A range of f64.
+///
+/// The elements are (first, increment, last).
+type RangeF64 = (f64, f64, f64);
+
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let numbers = matches.values_of(ARG_NUMBERS).unwrap().collect::<Vec<_>>();
@@ -101,21 +178,47 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let mut padding = 0;
     let first = if numbers.len() > 1 {
         let slice = numbers[0];
-        let len = slice.len();
-        let dec = slice.find('.').unwrap_or(len);
-        largest_dec = len - dec;
-        padding = dec;
-        return_if_err!(1, slice.parse())
+        largest_dec = num_fractional_digits(slice).unwrap_or_else(|_| {
+            crash!(
+                1,
+                "invalid floating point argument: {}\n Try '{} --help' for more information.",
+                slice.quote(),
+                uucore::execution_phrase()
+            )
+        });
+        padding = num_integral_digits(slice).unwrap_or_else(|_| {
+            crash!(
+                1,
+                "invalid floating point argument: {}\n Try '{} --help' for more information.",
+                slice.quote(),
+                uucore::execution_phrase()
+            )
+        });
+        crash_if_err!(1, slice.parse())
     } else {
         Number::BigInt(BigInt::one())
     };
     let increment = if numbers.len() > 2 {
         let slice = numbers[1];
-        let len = slice.len();
-        let dec = slice.find('.').unwrap_or(len);
-        largest_dec = cmp::max(largest_dec, len - dec);
-        padding = cmp::max(padding, dec);
-        return_if_err!(1, slice.parse())
+        let dec = num_fractional_digits(slice).unwrap_or_else(|_| {
+            crash!(
+                1,
+                "invalid floating point argument: {}\n Try '{} --help' for more information.",
+                slice.quote(),
+                uucore::execution_phrase()
+            )
+        });
+        let int_digits = num_integral_digits(slice).unwrap_or_else(|_| {
+            crash!(
+                1,
+                "invalid floating point argument: {}\n Try '{} --help' for more information.",
+                slice.quote(),
+                uucore::execution_phrase()
+            )
+        });
+        largest_dec = cmp::max(largest_dec, dec);
+        padding = cmp::max(padding, int_digits);
+        crash_if_err!(1, slice.parse())
     } else {
         Number::BigInt(BigInt::one())
     };
@@ -123,47 +226,74 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         show_error!(
             "invalid Zero increment value: '{}'\nTry '{} --help' for more information.",
             numbers[1],
-            executable!()
+            uucore::execution_phrase()
         );
         return 1;
     }
-    let last = {
+    let last: Number = {
         let slice = numbers[numbers.len() - 1];
-        padding = cmp::max(padding, slice.find('.').unwrap_or_else(|| slice.len()));
-        return_if_err!(1, slice.parse())
+        let int_digits = num_integral_digits(slice).unwrap_or_else(|_| {
+            crash!(
+                1,
+                "invalid floating point argument: {}\n Try '{} --help' for more information.",
+                slice.quote(),
+                uucore::execution_phrase()
+            )
+        });
+        padding = cmp::max(padding, int_digits);
+        crash_if_err!(1, slice.parse())
     };
-    if largest_dec > 0 {
-        largest_dec -= 1;
-    }
 
-    match (first, last, increment) {
-        (Number::BigInt(first), Number::BigInt(last), Number::BigInt(increment)) => {
+    let is_negative_zero_f64 = |x: f64| x == -0.0 && x.is_sign_negative() && largest_dec == 0;
+    let result = match (first, last, increment) {
+        // For example, `seq -0 1 2` or `seq -0 1 2.0`.
+        (Number::MinusZero, last, Number::BigInt(increment)) => print_seq_integers(
+            (BigInt::zero(), increment, last.into_bigint()),
+            options.separator,
+            options.terminator,
+            options.widths,
+            padding,
+            true,
+        ),
+        // For example, `seq -0e0 1 2` or `seq -0e0 1 2.0`.
+        (Number::F64(x), last, Number::BigInt(increment)) if is_negative_zero_f64(x) => {
             print_seq_integers(
-                first,
-                increment,
-                last,
+                (BigInt::zero(), increment, last.into_bigint()),
                 options.separator,
                 options.terminator,
                 options.widths,
                 padding,
+                true,
             )
         }
+        // For example, `seq 0 1 2` or `seq 0 1 2.0`.
+        (Number::BigInt(first), last, Number::BigInt(increment)) => print_seq_integers(
+            (first, increment, last.into_bigint()),
+            options.separator,
+            options.terminator,
+            options.widths,
+            padding,
+            false,
+        ),
+        // For example, `seq 0 0.5 1` or `seq 0.0 0.5 1` or `seq 0.0 0.5 1.0`.
         (first, last, increment) => print_seq(
-            first.into_f64(),
-            increment.into_f64(),
-            last.into_f64(),
+            (first.into_f64(), increment.into_f64(), last.into_f64()),
             largest_dec,
             options.separator,
             options.terminator,
             options.widths,
             padding,
         ),
+    };
+    match result {
+        Ok(_) => 0,
+        Err(err) if err.kind() == ErrorKind::BrokenPipe => 0,
+        Err(_) => 1,
     }
-    0
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .setting(AppSettings::AllowLeadingHyphen)
         .version(crate_version!())
         .about(ABOUT)
@@ -208,67 +338,96 @@ fn done_printing<T: Num + PartialOrd>(next: &T, increment: &T, last: &T) -> bool
 }
 
 /// Floating point based code path
-#[allow(clippy::too_many_arguments)]
 fn print_seq(
-    first: f64,
-    increment: f64,
-    last: f64,
+    range: RangeF64,
     largest_dec: usize,
     separator: String,
     terminator: String,
     pad: bool,
     padding: usize,
-) {
+) -> std::io::Result<()> {
+    let stdout = stdout();
+    let mut stdout = stdout.lock();
+    let (first, increment, last) = range;
     let mut i = 0isize;
+    let is_first_minus_zero = first == -0.0 && first.is_sign_negative();
     let mut value = first + i as f64 * increment;
+    let padding = if pad { padding + 1 + largest_dec } else { 0 };
+    let mut is_first_iteration = true;
     while !done_printing(&value, &increment, &last) {
-        let istr = format!("{:.*}", largest_dec, value);
-        let ilen = istr.len();
-        let before_dec = istr.find('.').unwrap_or(ilen);
-        if pad && before_dec < padding {
-            for _ in 0..(padding - before_dec) {
-                print!("0");
-            }
+        if !is_first_iteration {
+            write!(stdout, "{}", separator)?;
         }
-        print!("{}", istr);
+        let mut width = padding;
+        if is_first_iteration && is_first_minus_zero {
+            write!(stdout, "-")?;
+            width -= 1;
+        }
+        is_first_iteration = false;
+        write!(
+            stdout,
+            "{value:>0width$.precision$}",
+            value = value,
+            width = width,
+            precision = largest_dec,
+        )?;
         i += 1;
         value = first + i as f64 * increment;
-        if !done_printing(&value, &increment, &last) {
-            print!("{}", separator);
-        }
     }
-    if (first >= last && increment < 0f64) || (first <= last && increment > 0f64) {
-        print!("{}", terminator);
+    if !is_first_iteration {
+        write!(stdout, "{}", terminator)?;
     }
-    crash_if_err!(1, stdout().flush());
+    stdout.flush()?;
+    Ok(())
 }
 
-/// BigInt based code path
+/// Print an integer sequence.
+///
+/// This function prints a sequence of integers defined by `range`,
+/// which defines the first integer, last integer, and increment of the
+/// range. The `separator` is inserted between each integer and
+/// `terminator` is inserted at the end.
+///
+/// The `pad` parameter indicates whether to pad numbers to the width
+/// given in `padding`.
+///
+/// If `is_first_minus_zero` is `true`, then the `first` parameter is
+/// printed as if it were negative zero, even though no such number
+/// exists as an integer (negative zero only exists for floating point
+/// numbers). Only set this to `true` if `first` is actually zero.
 fn print_seq_integers(
-    first: BigInt,
-    increment: BigInt,
-    last: BigInt,
+    range: RangeInt,
     separator: String,
     terminator: String,
     pad: bool,
     padding: usize,
-) {
+    is_first_minus_zero: bool,
+) -> std::io::Result<()> {
+    let stdout = stdout();
+    let mut stdout = stdout.lock();
+    let (first, increment, last) = range;
     let mut value = first;
     let mut is_first_iteration = true;
     while !done_printing(&value, &increment, &last) {
         if !is_first_iteration {
-            print!("{}", separator);
+            write!(stdout, "{}", separator)?;
+        }
+        let mut width = padding;
+        if is_first_iteration && is_first_minus_zero {
+            write!(stdout, "-")?;
+            width -= 1;
         }
         is_first_iteration = false;
         if pad {
-            print!("{number:>0width$}", number = value, width = padding);
+            write!(stdout, "{number:>0width$}", number = value, width = width)?;
         } else {
-            print!("{}", value);
+            write!(stdout, "{}", value)?;
         }
         value += &increment;
     }
 
     if !is_first_iteration {
-        print!("{}", terminator);
+        write!(stdout, "{}", terminator)?;
     }
+    Ok(())
 }
diff --git a/src/uu/shred/Cargo.toml b/src/uu/shred/Cargo.toml
index 89ed980c1..00356d701 100644
--- a/src/uu/shred/Cargo.toml
+++ b/src/uu/shred/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_shred"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "shred ~ (uutils) hide former FILE contents with repeated overwrites"
@@ -16,13 +16,15 @@ path = "src/shred.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-filetime = "0.2.1"
 libc = "0.2.42"
-rand = "0.5"
-time = "0.1.40"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+rand = "0.7"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "shred"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs
index 90336ea95..fa455f027 100644
--- a/src/uu/shred/src/shred.rs
+++ b/src/uu/shred/src/shred.rs
@@ -9,7 +9,8 @@
 // spell-checker:ignore (words) writeback wipesync
 
 use clap::{crate_version, App, Arg};
-use rand::{Rng, ThreadRng};
+use rand::prelude::SliceRandom;
+use rand::Rng;
 use std::cell::{Cell, RefCell};
 use std::fs;
 use std::fs::{File, OpenOptions};
@@ -17,12 +18,12 @@ use std::io;
 use std::io::prelude::*;
 use std::io::SeekFrom;
 use std::path::{Path, PathBuf};
-use uucore::InvalidEncodingHandling;
+use uucore::display::Quotable;
+use uucore::{util_name, InvalidEncodingHandling};
 
 #[macro_use]
 extern crate uucore;
 
-static NAME: &str = "shred";
 const BLOCK_SIZE: usize = 512;
 const NAME_CHARSET: &[u8] = b"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_.";
 
@@ -119,7 +120,7 @@ struct BytesGenerator<'a> {
     block_size: usize,
     exact: bool, // if false, every block's size is block_size
     gen_type: PassType<'a>,
-    rng: Option<RefCell<ThreadRng>>,
+    rng: Option<RefCell<rand::rngs::ThreadRng>>,
     bytes: [u8; BLOCK_SIZE],
 }
 
@@ -213,8 +214,8 @@ static ABOUT: &str = "Overwrite the specified FILE(s) repeatedly, in order to ma
 for even very expensive hardware probing to recover the data.
 ";
 
-fn get_usage() -> String {
-    format!("{} [OPTION]... FILE...", executable!())
+fn usage() -> String {
+    format!("{} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 static AFTER_HELP: &str =
@@ -270,7 +271,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
 
     let app = uu_app().usage(&usage[..]);
 
@@ -280,7 +281,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     if !matches.is_present(options::FILE) {
         show_error!("Missing an argument");
-        show_error!("For help, try '{} --help'", NAME);
+        show_error!("For help, try '{} --help'", uucore::execution_phrase());
         return 0;
     }
 
@@ -288,7 +289,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         Some(s) => match s.parse::<usize>() {
             Ok(u) => u,
             Err(_) => {
-                errs.push(format!("invalid number of passes: '{}'", s));
+                errs.push(format!("invalid number of passes: {}", s.quote()));
                 0
             }
         },
@@ -330,7 +331,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(AFTER_HELP)
@@ -413,7 +414,11 @@ fn get_size(size_str_opt: Option<String>) -> Option<u64> {
     let coefficient = match size_str.parse::<u64>() {
         Ok(u) => u,
         Err(_) => {
-            println!("{}: {}: Invalid file size", NAME, size_str_opt.unwrap());
+            println!(
+                "{}: {}: Invalid file size",
+                util_name(),
+                size_str_opt.unwrap().maybe_quote()
+            );
             exit!(1);
         }
     };
@@ -451,11 +456,11 @@ fn wipe_file(
     // Get these potential errors out of the way first
     let path: &Path = Path::new(path_str);
     if !path.exists() {
-        show_error!("{}: No such file or directory", path.display());
+        show_error!("{}: No such file or directory", path.maybe_quote());
         return;
     }
     if !path.is_file() {
-        show_error!("{}: Not a file", path.display());
+        show_error!("{}: Not a file", path.maybe_quote());
         return;
     }
 
@@ -499,7 +504,8 @@ fn wipe_file(
         for pattern in PATTERNS.iter().take(remainder) {
             pass_sequence.push(PassType::Pattern(pattern));
         }
-        rand::thread_rng().shuffle(&mut pass_sequence[..]); // randomize the order of application
+        let mut rng = rand::thread_rng();
+        pass_sequence.shuffle(&mut rng); // randomize the order of application
 
         let n_random = 3 + n_passes / 10; // Minimum 3 random passes; ratio of 10 after
                                           // Evenly space random passes; ensures one at the beginning and end
@@ -518,7 +524,7 @@ fn wipe_file(
         let mut file: File = match OpenOptions::new().write(true).truncate(false).open(path) {
             Ok(f) => f,
             Err(e) => {
-                show_error!("{}: failed to open for writing: {}", path.display(), e);
+                show_error!("{}: failed to open for writing: {}", path.maybe_quote(), e);
                 return;
             }
         };
@@ -533,8 +539,8 @@ fn wipe_file(
                 if total_passes.to_string().len() == 1 {
                     println!(
                         "{}: {}: pass {}/{} ({})... ",
-                        NAME,
-                        path.display(),
+                        util_name(),
+                        path.maybe_quote(),
                         i + 1,
                         total_passes,
                         pass_name
@@ -542,8 +548,8 @@ fn wipe_file(
                 } else {
                     println!(
                         "{}: {}: pass {:2.0}/{:2.0} ({})... ",
-                        NAME,
-                        path.display(),
+                        util_name(),
+                        path.maybe_quote(),
                         i + 1,
                         total_passes,
                         pass_name
@@ -554,7 +560,7 @@ fn wipe_file(
             match do_pass(&mut file, path, &mut generator, *pass_type, size) {
                 Ok(_) => {}
                 Err(e) => {
-                    show_error!("{}: File write pass failed: {}", path.display(), e);
+                    show_error!("{}: File write pass failed: {}", path.maybe_quote(), e);
                 }
             }
             // Ignore failed writes; just keep trying
@@ -565,7 +571,7 @@ fn wipe_file(
         match do_remove(path, path_str, verbose) {
             Ok(_) => {}
             Err(e) => {
-                show_error!("{}: failed to remove file: {}", path.display(), e);
+                show_error!("{}: failed to remove file: {}", path.maybe_quote(), e);
             }
         }
     }
@@ -620,9 +626,9 @@ fn wipe_name(orig_path: &Path, verbose: bool) -> Option<PathBuf> {
                     if verbose {
                         println!(
                             "{}: {}: renamed to {}",
-                            NAME,
-                            last_path.display(),
-                            new_path.display()
+                            util_name(),
+                            last_path.maybe_quote(),
+                            new_path.quote()
                         );
                     }
 
@@ -639,9 +645,9 @@ fn wipe_name(orig_path: &Path, verbose: bool) -> Option<PathBuf> {
                 Err(e) => {
                     println!(
                         "{}: {}: Couldn't rename to {}: {}",
-                        NAME,
-                        last_path.display(),
-                        new_path.display(),
+                        util_name(),
+                        last_path.maybe_quote(),
+                        new_path.quote(),
                         e
                     );
                     return None;
@@ -655,7 +661,7 @@ fn wipe_name(orig_path: &Path, verbose: bool) -> Option<PathBuf> {
 
 fn do_remove(path: &Path, orig_filename: &str, verbose: bool) -> Result<(), io::Error> {
     if verbose {
-        println!("{}: {}: removing", NAME, orig_filename);
+        println!("{}: {}: removing", util_name(), orig_filename.maybe_quote());
     }
 
     let renamed_path: Option<PathBuf> = wipe_name(path, verbose);
@@ -664,7 +670,7 @@ fn do_remove(path: &Path, orig_filename: &str, verbose: bool) -> Result<(), io::
     }
 
     if verbose {
-        println!("{}: {}: removed", NAME, orig_filename);
+        println!("{}: {}: removed", util_name(), orig_filename.maybe_quote());
     }
 
     Ok(())
diff --git a/src/uu/shuf/Cargo.toml b/src/uu/shuf/Cargo.toml
index 5c99c6d26..35da41145 100644
--- a/src/uu/shuf/Cargo.toml
+++ b/src/uu/shuf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_shuf"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "shuf ~ (uutils) display random permutations of input lines"
@@ -17,9 +17,13 @@ path = "src/shuf.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 rand = "0.5"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "shuf"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs
index 4690d1c6e..9a899d746 100644
--- a/src/uu/shuf/src/shuf.rs
+++ b/src/uu/shuf/src/shuf.rs
@@ -14,6 +14,7 @@ use clap::{crate_version, App, Arg};
 use rand::Rng;
 use std::fs::File;
 use std::io::{stdin, stdout, BufReader, BufWriter, Read, Write};
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 enum Mode {
@@ -76,7 +77,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             Some(count) => match count.parse::<usize>() {
                 Ok(val) => val,
                 Err(_) => {
-                    show_error!("invalid line count: '{}'", count);
+                    show_error!("invalid line count: {}", count.quote());
                     return 1;
                 }
             },
@@ -115,7 +116,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .template(TEMPLATE)
@@ -185,13 +186,13 @@ fn read_input_file(filename: &str) -> Vec<u8> {
     } else {
         match File::open(filename) {
             Ok(f) => Box::new(f) as Box<dyn Read>,
-            Err(e) => crash!(1, "failed to open '{}': {}", filename, e),
+            Err(e) => crash!(1, "failed to open {}: {}", filename.quote(), e),
         }
     });
 
     let mut data = Vec::new();
     if let Err(e) = file.read_to_end(&mut data) {
-        crash!(1, "failed reading '{}': {}", filename, e)
+        crash!(1, "failed reading {}: {}", filename.quote(), e)
     };
 
     data
@@ -235,15 +236,17 @@ fn shuf_bytes(input: &mut Vec<&[u8]>, opts: Options) {
         None => Box::new(stdout()) as Box<dyn Write>,
         Some(s) => match File::create(&s[..]) {
             Ok(f) => Box::new(f) as Box<dyn Write>,
-            Err(e) => crash!(1, "failed to open '{}' for writing: {}", &s[..], e),
+            Err(e) => crash!(1, "failed to open {} for writing: {}", s.quote(), e),
         },
     });
 
     let mut rng = match opts.random_source {
-        Some(r) => WrappedRng::RngFile(rand::read::ReadRng::new(match File::open(&r[..]) {
-            Ok(f) => f,
-            Err(e) => crash!(1, "failed to open random source '{}': {}", &r[..], e),
-        })),
+        Some(r) => WrappedRng::RngFile(rand::rngs::adapter::ReadRng::new(
+            match File::open(&r[..]) {
+                Ok(f) => f,
+                Err(e) => crash!(1, "failed to open random source {}: {}", r.quote(), e),
+            },
+        )),
         None => WrappedRng::RngDefault(rand::thread_rng()),
     };
 
@@ -286,21 +289,21 @@ fn shuf_bytes(input: &mut Vec<&[u8]>, opts: Options) {
 fn parse_range(input_range: &str) -> Result<(usize, usize), String> {
     let split: Vec<&str> = input_range.split('-').collect();
     if split.len() != 2 {
-        Err(format!("invalid input range: '{}'", input_range))
+        Err(format!("invalid input range: {}", input_range.quote()))
     } else {
         let begin = split[0]
             .parse::<usize>()
-            .map_err(|_| format!("invalid input range: '{}'", split[0]))?;
+            .map_err(|_| format!("invalid input range: {}", split[0].quote()))?;
         let end = split[1]
             .parse::<usize>()
-            .map_err(|_| format!("invalid input range: '{}'", split[1]))?;
+            .map_err(|_| format!("invalid input range: {}", split[1].quote()))?;
         Ok((begin, end + 1))
     }
 }
 
 enum WrappedRng {
-    RngFile(rand::read::ReadRng<File>),
-    RngDefault(rand::ThreadRng),
+    RngFile(rand::rngs::adapter::ReadRng<File>),
+    RngDefault(rand::rngs::ThreadRng),
 }
 
 impl WrappedRng {
diff --git a/src/uu/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml
index 8414f444c..af6f22b9f 100644
--- a/src/uu/sleep/Cargo.toml
+++ b/src/uu/sleep/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_sleep"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "sleep ~ (uutils) pause for DURATION"
@@ -16,8 +16,8 @@ path = "src/sleep.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "sleep"
diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs
index 127804a9f..80e8cd852 100644
--- a/src/uu/sleep/src/sleep.rs
+++ b/src/uu/sleep/src/sleep.rs
@@ -5,9 +5,6 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use std::thread;
 use std::time::Duration;
 
@@ -26,17 +23,17 @@ mod options {
     pub const NUMBER: &str = "NUMBER";
 }
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} {1}[SUFFIX]... \n    {0} OPTION",
-        executable!(),
+        uucore::execution_phrase(),
         options::NUMBER
     )
 }
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -49,7 +46,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
diff --git a/src/uu/sort/Cargo.toml b/src/uu/sort/Cargo.toml
index 14db546eb..b3d4fe0ea 100644
--- a/src/uu/sort/Cargo.toml
+++ b/src/uu/sort/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_sort"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "sort ~ (uutils) sort input lines"
@@ -18,16 +18,17 @@ path = "src/sort.rs"
 binary-heap-plus = "0.4.1"
 clap = { version = "2.33", features = ["wrap_help"] }
 compare = "0.1.0"
+ctrlc = { version = "3.0", features = ["termination"] }
 fnv = "1.0.7"
 itertools = "0.10.0"
 memchr = "2.4.0"
-ouroboros = "0.9.3"
+ouroboros = "0.10.1"
 rand = "0.7"
 rayon = "1.5"
 tempfile = "3"
 unicode-width = "0.1.8"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "sort"
diff --git a/src/uu/sort/src/check.rs b/src/uu/sort/src/check.rs
index f1cd22686..5be752be0 100644
--- a/src/uu/sort/src/check.rs
+++ b/src/uu/sort/src/check.rs
@@ -9,24 +9,33 @@
 
 use crate::{
     chunks::{self, Chunk, RecycledChunk},
-    compare_by, open, GlobalSettings,
+    compare_by, open, GlobalSettings, SortError,
 };
 use itertools::Itertools;
 use std::{
     cmp::Ordering,
+    ffi::OsStr,
     io::Read,
     iter,
     sync::mpsc::{sync_channel, Receiver, SyncSender},
     thread,
 };
+use uucore::error::UResult;
 
 /// Check if the file at `path` is ordered.
 ///
 /// # Returns
 ///
 /// The code we should exit with.
-pub fn check(path: &str, settings: &GlobalSettings) -> i32 {
-    let file = open(path);
+pub fn check(path: &OsStr, settings: &GlobalSettings) -> UResult<()> {
+    let max_allowed_cmp = if settings.unique {
+        // If `unique` is enabled, the previous line must compare _less_ to the next one.
+        Ordering::Less
+    } else {
+        // Otherwise, the line previous line must compare _less or equal_ to the next one.
+        Ordering::Equal
+    };
+    let file = open(path)?;
     let (recycled_sender, recycled_receiver) = sync_channel(2);
     let (loaded_sender, loaded_receiver) = sync_channel(2);
     thread::spawn({
@@ -34,7 +43,13 @@ pub fn check(path: &str, settings: &GlobalSettings) -> i32 {
         move || reader(file, recycled_receiver, loaded_sender, &settings)
     });
     for _ in 0..2 {
-        let _ = recycled_sender.send(RecycledChunk::new(100 * 1024));
+        let _ = recycled_sender.send(RecycledChunk::new(if settings.buffer_size < 100 * 1024 {
+            // when the buffer size is smaller than 100KiB we choose it instead of the default.
+            // this improves testability.
+            settings.buffer_size
+        } else {
+            100 * 1024
+        }));
     }
 
     let mut prev_chunk: Option<Chunk> = None;
@@ -53,30 +68,35 @@ pub fn check(path: &str, settings: &GlobalSettings) -> i32 {
                 settings,
                 prev_chunk.line_data(),
                 chunk.line_data(),
-            ) == Ordering::Greater
+            ) > max_allowed_cmp
             {
-                if !settings.check_silent {
-                    println!("sort: {}:{}: disorder: {}", path, line_idx, new_first.line);
+                return Err(SortError::Disorder {
+                    file: path.to_owned(),
+                    line_number: line_idx,
+                    line: new_first.line.to_owned(),
+                    silent: settings.check_silent,
                 }
-                return 1;
+                .into());
             }
             let _ = recycled_sender.send(prev_chunk.recycle());
         }
 
         for (a, b) in chunk.lines().iter().tuple_windows() {
             line_idx += 1;
-            if compare_by(a, b, settings, chunk.line_data(), chunk.line_data()) == Ordering::Greater
-            {
-                if !settings.check_silent {
-                    println!("sort: {}:{}: disorder: {}", path, line_idx, b.line);
+            if compare_by(a, b, settings, chunk.line_data(), chunk.line_data()) > max_allowed_cmp {
+                return Err(SortError::Disorder {
+                    file: path.to_owned(),
+                    line_number: line_idx,
+                    line: b.line.to_owned(),
+                    silent: settings.check_silent,
                 }
-                return 1;
+                .into());
             }
         }
 
         prev_chunk = Some(chunk);
     }
-    0
+    Ok(())
 }
 
 /// The function running on the reader thread.
@@ -85,7 +105,7 @@ fn reader(
     receiver: Receiver<RecycledChunk>,
     sender: SyncSender<Chunk>,
     settings: &GlobalSettings,
-) {
+) -> UResult<()> {
     let mut carry_over = vec![];
     for recycled_chunk in receiver.iter() {
         let should_continue = chunks::read(
@@ -101,9 +121,10 @@ fn reader(
                 b'\n'
             },
             settings,
-        );
+        )?;
         if !should_continue {
             break;
         }
     }
+    Ok(())
 }
diff --git a/src/uu/sort/src/chunks.rs b/src/uu/sort/src/chunks.rs
index 9e9d212c2..bfe6aa73b 100644
--- a/src/uu/sort/src/chunks.rs
+++ b/src/uu/sort/src/chunks.rs
@@ -14,8 +14,9 @@ use std::{
 
 use memchr::memchr_iter;
 use ouroboros::self_referencing;
+use uucore::error::{UResult, USimpleError};
 
-use crate::{numeric_str_cmp::NumInfo, GeneralF64ParseResult, GlobalSettings, Line};
+use crate::{numeric_str_cmp::NumInfo, GeneralF64ParseResult, GlobalSettings, Line, SortError};
 
 /// The chunk that is passed around between threads.
 /// `lines` consist of slices into `buffer`.
@@ -137,10 +138,10 @@ pub fn read<T: Read>(
     max_buffer_size: Option<usize>,
     carry_over: &mut Vec<u8>,
     file: &mut T,
-    next_files: &mut impl Iterator<Item = T>,
+    next_files: &mut impl Iterator<Item = UResult<T>>,
     separator: u8,
     settings: &GlobalSettings,
-) -> bool {
+) -> UResult<bool> {
     let RecycledChunk {
         lines,
         selections,
@@ -159,12 +160,12 @@ pub fn read<T: Read>(
         max_buffer_size,
         carry_over.len(),
         separator,
-    );
+    )?;
     carry_over.clear();
     carry_over.extend_from_slice(&buffer[read..]);
 
     if read != 0 {
-        let payload = Chunk::new(buffer, |buffer| {
+        let payload: UResult<Chunk> = Chunk::try_new(buffer, |buffer| {
             let selections = unsafe {
                 // SAFETY: It is safe to transmute to an empty vector of selections with shorter lifetime.
                 // It was only temporarily transmuted to a Vec<Line<'static>> to make recycling possible.
@@ -175,32 +176,30 @@ pub fn read<T: Read>(
                 // because it was only temporarily transmuted to a Vec<Line<'static>> to make recycling possible.
                 std::mem::transmute::<Vec<Line<'static>>, Vec<Line<'_>>>(lines)
             };
-            let read = crash_if_err!(1, std::str::from_utf8(&buffer[..read]));
+            let read = std::str::from_utf8(&buffer[..read])
+                .map_err(|error| SortError::Uft8Error { error })?;
             let mut line_data = LineData {
                 selections,
                 num_infos,
                 parsed_floats,
             };
             parse_lines(read, &mut lines, &mut line_data, separator, settings);
-            ChunkContents { lines, line_data }
+            Ok(ChunkContents { lines, line_data })
         });
-        sender.send(payload).unwrap();
+        sender.send(payload?).unwrap();
     }
-    should_continue
+    Ok(should_continue)
 }
 
 /// Split `read` into `Line`s, and add them to `lines`.
 fn parse_lines<'a>(
-    mut read: &'a str,
+    read: &'a str,
     lines: &mut Vec<Line<'a>>,
     line_data: &mut LineData<'a>,
     separator: u8,
     settings: &GlobalSettings,
 ) {
-    // Strip a trailing separator. TODO: Once our MinRustV is 1.45 or above, use strip_suffix() instead.
-    if read.ends_with(separator as char) {
-        read = &read[..read.len() - 1];
-    }
+    let read = read.strip_suffix(separator as char).unwrap_or(read);
 
     assert!(lines.is_empty());
     assert!(line_data.selections.is_empty());
@@ -242,12 +241,12 @@ fn parse_lines<'a>(
 /// * Whether this function should be called again.
 fn read_to_buffer<T: Read>(
     file: &mut T,
-    next_files: &mut impl Iterator<Item = T>,
+    next_files: &mut impl Iterator<Item = UResult<T>>,
     buffer: &mut Vec<u8>,
     max_buffer_size: Option<usize>,
     start_offset: usize,
     separator: u8,
-) -> (usize, bool) {
+) -> UResult<(usize, bool)> {
     let mut read_target = &mut buffer[start_offset..];
     let mut last_file_target_size = read_target.len();
     loop {
@@ -274,7 +273,7 @@ fn read_to_buffer<T: Read>(
                         // We read enough lines.
                         let end = last_line_end.unwrap();
                         // We want to include the separator here, because it shouldn't be carried over.
-                        return (end + 1, true);
+                        return Ok((end + 1, true));
                     } else {
                         // We need to read more lines
                         let len = buffer.len();
@@ -299,11 +298,11 @@ fn read_to_buffer<T: Read>(
                     if let Some(next_file) = next_files.next() {
                         // There is another file.
                         last_file_target_size = leftover_len;
-                        *file = next_file;
+                        *file = next_file?;
                     } else {
                         // This was the last file.
                         let read_len = buffer.len() - leftover_len;
-                        return (read_len, false);
+                        return Ok((read_len, false));
                     }
                 }
             }
@@ -313,7 +312,7 @@ fn read_to_buffer<T: Read>(
             Err(e) if e.kind() == ErrorKind::Interrupted => {
                 // retry
             }
-            Err(e) => crash!(1, "{}", e),
+            Err(e) => return Err(USimpleError::new(2, e.to_string())),
         }
     }
 }
diff --git a/src/uu/sort/src/ext_sort.rs b/src/uu/sort/src/ext_sort.rs
index e0814b7a2..bf332e4e8 100644
--- a/src/uu/sort/src/ext_sort.rs
+++ b/src/uu/sort/src/ext_sort.rs
@@ -12,8 +12,8 @@
 //! The buffers for the individual chunks are recycled. There are two buffers.
 
 use std::cmp::Ordering;
+use std::fs::File;
 use std::io::Write;
-use std::path::Path;
 use std::path::PathBuf;
 use std::{
     io::Read,
@@ -22,23 +22,30 @@ use std::{
 };
 
 use itertools::Itertools;
+use uucore::error::UResult;
 
 use crate::chunks::RecycledChunk;
 use crate::merge::ClosedTmpFile;
 use crate::merge::WriteableCompressedTmpFile;
 use crate::merge::WriteablePlainTmpFile;
 use crate::merge::WriteableTmpFile;
+use crate::tmp_dir::TmpDirWrapper;
+use crate::Output;
 use crate::{
     chunks::{self, Chunk},
     compare_by, merge, sort_by, GlobalSettings,
 };
 use crate::{print_sorted, Line};
-use tempfile::TempDir;
 
 const START_BUFFER_SIZE: usize = 8_000;
 
 /// Sort files by using auxiliary files for storing intermediate chunks (if needed), and output the result.
-pub fn ext_sort(files: &mut impl Iterator<Item = Box<dyn Read + Send>>, settings: &GlobalSettings) {
+pub fn ext_sort(
+    files: &mut impl Iterator<Item = UResult<Box<dyn Read + Send>>>,
+    settings: &GlobalSettings,
+    output: Output,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<()> {
     let (sorted_sender, sorted_receiver) = std::sync::mpsc::sync_channel(1);
     let (recycled_sender, recycled_receiver) = std::sync::mpsc::sync_channel(1);
     thread::spawn({
@@ -51,23 +58,32 @@ pub fn ext_sort(files: &mut impl Iterator<Item = Box<dyn Read + Send>>, settings
             settings,
             sorted_receiver,
             recycled_sender,
-        );
+            output,
+            tmp_dir,
+        )
     } else {
         reader_writer::<_, WriteablePlainTmpFile>(
             files,
             settings,
             sorted_receiver,
             recycled_sender,
-        );
+            output,
+            tmp_dir,
+        )
     }
 }
 
-fn reader_writer<F: Iterator<Item = Box<dyn Read + Send>>, Tmp: WriteableTmpFile + 'static>(
+fn reader_writer<
+    F: Iterator<Item = UResult<Box<dyn Read + Send>>>,
+    Tmp: WriteableTmpFile + 'static,
+>(
     files: F,
     settings: &GlobalSettings,
     receiver: Receiver<Chunk>,
     sender: SyncSender<Chunk>,
-) {
+    output: Output,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<()> {
     let separator = if settings.zero_terminated {
         b'\0'
     } else {
@@ -79,24 +95,21 @@ fn reader_writer<F: Iterator<Item = Box<dyn Read + Send>>, Tmp: WriteableTmpFile
     let buffer_size = settings.buffer_size / 10;
     let read_result: ReadResult<Tmp> = read_write_loop(
         files,
-        &settings.tmp_dir,
+        tmp_dir,
         separator,
-        // Heuristically chosen: Dividing by 10 seems to keep our memory usage roughly
-        // around settings.buffer_size as a whole.
         buffer_size,
         settings,
         receiver,
         sender,
-    );
+    )?;
     match read_result {
-        ReadResult::WroteChunksToFile { tmp_files, tmp_dir } => {
-            let tmp_dir_size = tmp_files.len();
-            let mut merger = merge::merge_with_file_limit::<_, _, Tmp>(
+        ReadResult::WroteChunksToFile { tmp_files } => {
+            let merger = merge::merge_with_file_limit::<_, _, Tmp>(
                 tmp_files.into_iter().map(|c| c.reopen()),
                 settings,
-                Some((tmp_dir, tmp_dir_size)),
-            );
-            merger.write_all(settings);
+                tmp_dir,
+            )?;
+            merger.write_all(settings, output)?;
         }
         ReadResult::SortedSingleChunk(chunk) => {
             if settings.unique {
@@ -106,9 +119,10 @@ fn reader_writer<F: Iterator<Item = Box<dyn Read + Send>>, Tmp: WriteableTmpFile
                             == Ordering::Equal
                     }),
                     settings,
+                    output,
                 );
             } else {
-                print_sorted(chunk.lines().iter(), settings);
+                print_sorted(chunk.lines().iter(), settings, output);
             }
         }
         ReadResult::SortedTwoChunks([a, b]) => {
@@ -128,15 +142,17 @@ fn reader_writer<F: Iterator<Item = Box<dyn Read + Send>>, Tmp: WriteableTmpFile
                         })
                         .map(|(line, _)| line),
                     settings,
+                    output,
                 );
             } else {
-                print_sorted(merged_iter.map(|(line, _)| line), settings);
+                print_sorted(merged_iter.map(|(line, _)| line), settings, output);
             }
         }
         ReadResult::EmptyInput => {
             // don't output anything
         }
     }
+    Ok(())
 }
 
 /// The function that is executed on the sorter thread.
@@ -145,7 +161,11 @@ fn sorter(receiver: Receiver<Chunk>, sender: SyncSender<Chunk>, settings: Global
         payload.with_contents_mut(|contents| {
             sort_by(&mut contents.lines, &settings, &contents.line_data)
         });
-        sender.send(payload).unwrap();
+        if sender.send(payload).is_err() {
+            // The receiver has gone away, likely because the other thread hit an error.
+            // We stop silently because the actual error is printed by the other thread.
+            return;
+        }
     }
 }
 
@@ -158,22 +178,19 @@ enum ReadResult<I: WriteableTmpFile> {
     /// The input fits into two chunks, which were kept in memory.
     SortedTwoChunks([Chunk; 2]),
     /// The input was read into multiple chunks, which were written to auxiliary files.
-    WroteChunksToFile {
-        tmp_files: Vec<I::Closed>,
-        tmp_dir: TempDir,
-    },
+    WroteChunksToFile { tmp_files: Vec<I::Closed> },
 }
 /// The function that is executed on the reader/writer thread.
 fn read_write_loop<I: WriteableTmpFile>(
-    mut files: impl Iterator<Item = Box<dyn Read + Send>>,
-    tmp_dir_parent: &Path,
+    mut files: impl Iterator<Item = UResult<Box<dyn Read + Send>>>,
+    tmp_dir: &mut TmpDirWrapper,
     separator: u8,
     buffer_size: usize,
     settings: &GlobalSettings,
     receiver: Receiver<Chunk>,
     sender: SyncSender<Chunk>,
-) -> ReadResult<I> {
-    let mut file = files.next().unwrap();
+) -> UResult<ReadResult<I>> {
+    let mut file = files.next().unwrap()?;
 
     let mut carry_over = vec![];
     // kick things off with two reads
@@ -191,14 +208,14 @@ fn read_write_loop<I: WriteableTmpFile>(
             &mut files,
             separator,
             settings,
-        );
+        )?;
 
         if !should_continue {
             drop(sender);
             // We have already read the whole input. Since we are in our first two reads,
             // this means that we can fit the whole input into memory. Bypass writing below and
             // handle this case in a more straightforward way.
-            return if let Ok(first_chunk) = receiver.recv() {
+            return Ok(if let Ok(first_chunk) = receiver.recv() {
                 if let Ok(second_chunk) = receiver.recv() {
                     ReadResult::SortedTwoChunks([first_chunk, second_chunk])
                 } else {
@@ -206,38 +223,28 @@ fn read_write_loop<I: WriteableTmpFile>(
                 }
             } else {
                 ReadResult::EmptyInput
-            };
+            });
         }
     }
 
-    let tmp_dir = crash_if_err!(
-        1,
-        tempfile::Builder::new()
-            .prefix("uutils_sort")
-            .tempdir_in(tmp_dir_parent)
-    );
-
     let mut sender_option = Some(sender);
-    let mut file_number = 0;
     let mut tmp_files = vec![];
     loop {
         let mut chunk = match receiver.recv() {
             Ok(it) => it,
             _ => {
-                return ReadResult::WroteChunksToFile { tmp_files, tmp_dir };
+                return Ok(ReadResult::WroteChunksToFile { tmp_files });
             }
         };
 
         let tmp_file = write::<I>(
             &mut chunk,
-            tmp_dir.path().join(file_number.to_string()),
+            tmp_dir.next_file()?,
             settings.compress_prog.as_deref(),
             separator,
-        );
+        )?;
         tmp_files.push(tmp_file);
 
-        file_number += 1;
-
         let recycled_chunk = chunk.recycle();
 
         if let Some(sender) = &sender_option {
@@ -250,7 +257,7 @@ fn read_write_loop<I: WriteableTmpFile>(
                 &mut files,
                 separator,
                 settings,
-            );
+            )?;
             if !should_continue {
                 sender_option = None;
             }
@@ -262,11 +269,11 @@ fn read_write_loop<I: WriteableTmpFile>(
 /// `compress_prog` is used to optionally compress file contents.
 fn write<I: WriteableTmpFile>(
     chunk: &mut Chunk,
-    file: PathBuf,
+    file: (File, PathBuf),
     compress_prog: Option<&str>,
     separator: u8,
-) -> I::Closed {
-    let mut tmp_file = I::create(file, compress_prog);
+) -> UResult<I::Closed> {
+    let mut tmp_file = I::create(file, compress_prog)?;
     write_lines(chunk.lines(), tmp_file.as_write(), separator);
     tmp_file.finished_writing()
 }
diff --git a/src/uu/sort/src/merge.rs b/src/uu/sort/src/merge.rs
index 12d7a9b9b..934d1c208 100644
--- a/src/uu/sort/src/merge.rs
+++ b/src/uu/sort/src/merge.rs
@@ -9,69 +9,98 @@
 
 use std::{
     cmp::Ordering,
+    ffi::OsString,
     fs::{self, File},
     io::{BufWriter, Read, Write},
     iter,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::{Child, ChildStdin, ChildStdout, Command, Stdio},
     rc::Rc,
     sync::mpsc::{channel, sync_channel, Receiver, Sender, SyncSender},
-    thread,
+    thread::{self, JoinHandle},
 };
 
 use compare::Compare;
 use itertools::Itertools;
-use tempfile::TempDir;
+use uucore::error::UResult;
 
 use crate::{
     chunks::{self, Chunk, RecycledChunk},
-    compare_by, GlobalSettings,
+    compare_by, open,
+    tmp_dir::TmpDirWrapper,
+    GlobalSettings, Output, SortError,
 };
 
+/// If the output file occurs in the input files as well, copy the contents of the output file
+/// and replace its occurrences in the inputs with that copy.
+fn replace_output_file_in_input_files(
+    files: &mut [OsString],
+    output: Option<&str>,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<()> {
+    let mut copy: Option<PathBuf> = None;
+    if let Some(Ok(output_path)) = output.map(|path| Path::new(path).canonicalize()) {
+        for file in files {
+            if let Ok(file_path) = Path::new(file).canonicalize() {
+                if file_path == output_path {
+                    if let Some(copy) = &copy {
+                        *file = copy.clone().into_os_string();
+                    } else {
+                        let (_file, copy_path) = tmp_dir.next_file()?;
+                        std::fs::copy(file_path, &copy_path)
+                            .map_err(|error| SortError::OpenTmpFileFailed { error })?;
+                        *file = copy_path.clone().into_os_string();
+                        copy = Some(copy_path)
+                    }
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
 /// Merge pre-sorted `Box<dyn Read>`s.
 ///
 /// If `settings.merge_batch_size` is greater than the length of `files`, intermediate files will be used.
 /// If `settings.compress_prog` is `Some`, intermediate files will be compressed with it.
-pub fn merge<Files: ExactSizeIterator<Item = Box<dyn Read + Send>>>(
-    files: Files,
-    settings: &GlobalSettings,
-) -> FileMerger {
+pub fn merge<'a>(
+    files: &mut [OsString],
+    settings: &'a GlobalSettings,
+    output: Option<&str>,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<FileMerger<'a>> {
+    replace_output_file_in_input_files(files, output, tmp_dir)?;
     if settings.compress_prog.is_none() {
         merge_with_file_limit::<_, _, WriteablePlainTmpFile>(
-            files.map(|file| PlainMergeInput { inner: file }),
+            files
+                .iter()
+                .map(|file| open(file).map(|file| PlainMergeInput { inner: file })),
             settings,
-            None,
+            tmp_dir,
         )
     } else {
         merge_with_file_limit::<_, _, WriteableCompressedTmpFile>(
-            files.map(|file| PlainMergeInput { inner: file }),
+            files
+                .iter()
+                .map(|file| open(file).map(|file| PlainMergeInput { inner: file })),
             settings,
-            None,
+            tmp_dir,
         )
     }
 }
 
 // Merge already sorted `MergeInput`s.
 pub fn merge_with_file_limit<
+    'a,
     M: MergeInput + 'static,
-    F: ExactSizeIterator<Item = M>,
+    F: ExactSizeIterator<Item = UResult<M>>,
     Tmp: WriteableTmpFile + 'static,
 >(
     files: F,
-    settings: &GlobalSettings,
-    tmp_dir: Option<(TempDir, usize)>,
-) -> FileMerger {
+    settings: &'a GlobalSettings,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<FileMerger<'a>> {
     if files.len() > settings.merge_batch_size {
-        // If we did not get a tmp_dir, create one.
-        let (tmp_dir, mut tmp_dir_size) = tmp_dir.unwrap_or_else(|| {
-            (
-                tempfile::Builder::new()
-                    .prefix("uutils_sort")
-                    .tempdir_in(&settings.tmp_dir)
-                    .unwrap(),
-                0,
-            )
-        });
         let mut remaining_files = files.len();
         let batches = files.chunks(settings.merge_batch_size);
         let mut batches = batches.into_iter();
@@ -79,14 +108,11 @@ pub fn merge_with_file_limit<
         while remaining_files != 0 {
             // Work around the fact that `Chunks` is not an `ExactSizeIterator`.
             remaining_files = remaining_files.saturating_sub(settings.merge_batch_size);
-            let mut merger = merge_without_limit(batches.next().unwrap(), settings);
-            let mut tmp_file = Tmp::create(
-                tmp_dir.path().join(tmp_dir_size.to_string()),
-                settings.compress_prog.as_deref(),
-            );
-            tmp_dir_size += 1;
-            merger.write_all_to(settings, tmp_file.as_write());
-            temporary_files.push(tmp_file.finished_writing());
+            let merger = merge_without_limit(batches.next().unwrap(), settings)?;
+            let mut tmp_file =
+                Tmp::create(tmp_dir.next_file()?, settings.compress_prog.as_deref())?;
+            merger.write_all_to(settings, tmp_file.as_write())?;
+            temporary_files.push(tmp_file.finished_writing()?);
         }
         assert!(batches.next().is_none());
         merge_with_file_limit::<_, _, Tmp>(
@@ -94,10 +120,10 @@ pub fn merge_with_file_limit<
                 .into_iter()
                 .map(Box::new(|c: Tmp::Closed| c.reopen())
                     as Box<
-                        dyn FnMut(Tmp::Closed) -> <Tmp::Closed as ClosedTmpFile>::Reopened,
+                        dyn FnMut(Tmp::Closed) -> UResult<<Tmp::Closed as ClosedTmpFile>::Reopened>,
                     >),
             settings,
-            Some((tmp_dir, tmp_dir_size)),
+            tmp_dir,
         )
     } else {
         merge_without_limit(files, settings)
@@ -108,10 +134,10 @@ pub fn merge_with_file_limit<
 ///
 /// It is the responsibility of the caller to ensure that `files` yields only
 /// as many files as we are allowed to open concurrently.
-fn merge_without_limit<M: MergeInput + 'static, F: Iterator<Item = M>>(
+fn merge_without_limit<M: MergeInput + 'static, F: Iterator<Item = UResult<M>>>(
     files: F,
     settings: &GlobalSettings,
-) -> FileMerger {
+) -> UResult<FileMerger> {
     let (request_sender, request_receiver) = channel();
     let mut reader_files = Vec::with_capacity(files.size_hint().0);
     let mut loaded_receivers = Vec::with_capacity(files.size_hint().0);
@@ -119,7 +145,7 @@ fn merge_without_limit<M: MergeInput + 'static, F: Iterator<Item = M>>(
         let (sender, receiver) = sync_channel(2);
         loaded_receivers.push(receiver);
         reader_files.push(Some(ReaderFile {
-            file,
+            file: file?,
             sender,
             carry_over: vec![],
         }));
@@ -136,7 +162,7 @@ fn merge_without_limit<M: MergeInput + 'static, F: Iterator<Item = M>>(
             .unwrap();
     }
 
-    thread::spawn({
+    let reader_join_handle = thread::spawn({
         let settings = settings.clone();
         move || {
             reader(
@@ -155,22 +181,25 @@ fn merge_without_limit<M: MergeInput + 'static, F: Iterator<Item = M>>(
     let mut mergeable_files = vec![];
 
     for (file_number, receiver) in loaded_receivers.into_iter().enumerate() {
-        mergeable_files.push(MergeableFile {
-            current_chunk: Rc::new(receiver.recv().unwrap()),
-            file_number,
-            line_idx: 0,
-            receiver,
-        })
+        if let Ok(chunk) = receiver.recv() {
+            mergeable_files.push(MergeableFile {
+                current_chunk: Rc::new(chunk),
+                file_number,
+                line_idx: 0,
+                receiver,
+            })
+        }
     }
 
-    FileMerger {
+    Ok(FileMerger {
         heap: binary_heap_plus::BinaryHeap::from_vec_cmp(
             mergeable_files,
             FileComparator { settings },
         ),
         request_sender,
         prev: None,
-    }
+        reader_join_handle,
+    })
 }
 /// The struct on the reader thread representing an input file
 struct ReaderFile<M: MergeInput> {
@@ -185,7 +214,7 @@ fn reader(
     files: &mut [Option<ReaderFile<impl MergeInput>>],
     settings: &GlobalSettings,
     separator: u8,
-) {
+) -> UResult<()> {
     for (file_idx, recycled_chunk) in recycled_receiver.iter() {
         if let Some(ReaderFile {
             file,
@@ -202,15 +231,16 @@ fn reader(
                 &mut iter::empty(),
                 separator,
                 settings,
-            );
+            )?;
             if !should_continue {
                 // Remove the file from the list by replacing it with `None`.
                 let ReaderFile { file, .. } = files[file_idx].take().unwrap();
                 // Depending on the kind of the `MergeInput`, this may delete the file:
-                file.finished_reading();
+                file.finished_reading()?;
             }
         }
     }
+    Ok(())
 }
 /// The struct on the main thread representing an input file
 pub struct MergeableFile {
@@ -234,17 +264,20 @@ pub struct FileMerger<'a> {
     heap: binary_heap_plus::BinaryHeap<MergeableFile, FileComparator<'a>>,
     request_sender: Sender<(usize, RecycledChunk)>,
     prev: Option<PreviousLine>,
+    reader_join_handle: JoinHandle<UResult<()>>,
 }
 
 impl<'a> FileMerger<'a> {
     /// Write the merged contents to the output file.
-    pub fn write_all(&mut self, settings: &GlobalSettings) {
-        let mut out = settings.out_writer();
-        self.write_all_to(settings, &mut out);
+    pub fn write_all(self, settings: &GlobalSettings, output: Output) -> UResult<()> {
+        let mut out = output.into_write();
+        self.write_all_to(settings, &mut out)
     }
 
-    pub fn write_all_to(&mut self, settings: &GlobalSettings, out: &mut impl Write) {
+    pub fn write_all_to(mut self, settings: &GlobalSettings, out: &mut impl Write) -> UResult<()> {
         while self.write_next(settings, out) {}
+        drop(self.request_sender);
+        self.reader_join_handle.join().unwrap()
     }
 
     fn write_next(&mut self, settings: &GlobalSettings, out: &mut impl Write) -> bool {
@@ -328,36 +361,41 @@ impl<'a> Compare<MergeableFile> for FileComparator<'a> {
 }
 
 // Wait for the child to exit and check its exit code.
-fn assert_child_success(mut child: Child, program: &str) {
+fn check_child_success(mut child: Child, program: &str) -> UResult<()> {
     if !matches!(
         child.wait().map(|e| e.code()),
         Ok(Some(0)) | Ok(None) | Err(_)
     ) {
-        crash!(2, "'{}' terminated abnormally", program)
+        Err(SortError::CompressProgTerminatedAbnormally {
+            prog: program.to_owned(),
+        }
+        .into())
+    } else {
+        Ok(())
     }
 }
 
 /// A temporary file that can be written to.
-pub trait WriteableTmpFile {
+pub trait WriteableTmpFile: Sized {
     type Closed: ClosedTmpFile;
     type InnerWrite: Write;
-    fn create(path: PathBuf, compress_prog: Option<&str>) -> Self;
+    fn create(file: (File, PathBuf), compress_prog: Option<&str>) -> UResult<Self>;
     /// Closes the temporary file.
-    fn finished_writing(self) -> Self::Closed;
+    fn finished_writing(self) -> UResult<Self::Closed>;
     fn as_write(&mut self) -> &mut Self::InnerWrite;
 }
 /// A temporary file that is (temporarily) closed, but can be reopened.
 pub trait ClosedTmpFile {
     type Reopened: MergeInput;
     /// Reopens the temporary file.
-    fn reopen(self) -> Self::Reopened;
+    fn reopen(self) -> UResult<Self::Reopened>;
 }
 /// A pre-sorted input for merging.
 pub trait MergeInput: Send {
     type InnerRead: Read;
     /// Cleans this `MergeInput` up.
     /// Implementations may delete the backing file.
-    fn finished_reading(self);
+    fn finished_reading(self) -> UResult<()>;
     fn as_read(&mut self) -> &mut Self::InnerRead;
 }
 
@@ -376,15 +414,15 @@ impl WriteableTmpFile for WriteablePlainTmpFile {
     type Closed = ClosedPlainTmpFile;
     type InnerWrite = BufWriter<File>;
 
-    fn create(path: PathBuf, _: Option<&str>) -> Self {
-        WriteablePlainTmpFile {
-            file: BufWriter::new(File::create(&path).unwrap()),
+    fn create((file, path): (File, PathBuf), _: Option<&str>) -> UResult<Self> {
+        Ok(WriteablePlainTmpFile {
+            file: BufWriter::new(file),
             path,
-        }
+        })
     }
 
-    fn finished_writing(self) -> Self::Closed {
-        ClosedPlainTmpFile { path: self.path }
+    fn finished_writing(self) -> UResult<Self::Closed> {
+        Ok(ClosedPlainTmpFile { path: self.path })
     }
 
     fn as_write(&mut self) -> &mut Self::InnerWrite {
@@ -393,18 +431,22 @@ impl WriteableTmpFile for WriteablePlainTmpFile {
 }
 impl ClosedTmpFile for ClosedPlainTmpFile {
     type Reopened = PlainTmpMergeInput;
-    fn reopen(self) -> Self::Reopened {
-        PlainTmpMergeInput {
-            file: File::open(&self.path).unwrap(),
+    fn reopen(self) -> UResult<Self::Reopened> {
+        Ok(PlainTmpMergeInput {
+            file: File::open(&self.path).map_err(|error| SortError::OpenTmpFileFailed { error })?,
             path: self.path,
-        }
+        })
     }
 }
 impl MergeInput for PlainTmpMergeInput {
     type InnerRead = File;
 
-    fn finished_reading(self) {
-        fs::remove_file(self.path).ok();
+    fn finished_reading(self) -> UResult<()> {
+        // we ignore failures to delete the temporary file,
+        // because there is a race at the end of the execution and the whole
+        // temporary directory might already be gone.
+        let _ = fs::remove_file(self.path);
+        Ok(())
     }
 
     fn as_read(&mut self) -> &mut Self::InnerRead {
@@ -432,35 +474,31 @@ impl WriteableTmpFile for WriteableCompressedTmpFile {
     type Closed = ClosedCompressedTmpFile;
     type InnerWrite = BufWriter<ChildStdin>;
 
-    fn create(path: PathBuf, compress_prog: Option<&str>) -> Self {
+    fn create((file, path): (File, PathBuf), compress_prog: Option<&str>) -> UResult<Self> {
         let compress_prog = compress_prog.unwrap();
         let mut command = Command::new(compress_prog);
-        command
-            .stdin(Stdio::piped())
-            .stdout(File::create(&path).unwrap());
-        let mut child = crash_if_err!(
-            2,
-            command.spawn().map_err(|err| format!(
-                "couldn't execute compress program: errno {}",
-                err.raw_os_error().unwrap()
-            ))
-        );
+        command.stdin(Stdio::piped()).stdout(file);
+        let mut child = command
+            .spawn()
+            .map_err(|err| SortError::CompressProgExecutionFailed {
+                code: err.raw_os_error().unwrap(),
+            })?;
         let child_stdin = child.stdin.take().unwrap();
-        WriteableCompressedTmpFile {
+        Ok(WriteableCompressedTmpFile {
             path,
             compress_prog: compress_prog.to_owned(),
             child,
             child_stdin: BufWriter::new(child_stdin),
-        }
+        })
     }
 
-    fn finished_writing(self) -> Self::Closed {
+    fn finished_writing(self) -> UResult<Self::Closed> {
         drop(self.child_stdin);
-        assert_child_success(self.child, &self.compress_prog);
-        ClosedCompressedTmpFile {
+        check_child_success(self.child, &self.compress_prog)?;
+        Ok(ClosedCompressedTmpFile {
             path: self.path,
             compress_prog: self.compress_prog,
-        }
+        })
     }
 
     fn as_write(&mut self) -> &mut Self::InnerWrite {
@@ -470,33 +508,32 @@ impl WriteableTmpFile for WriteableCompressedTmpFile {
 impl ClosedTmpFile for ClosedCompressedTmpFile {
     type Reopened = CompressedTmpMergeInput;
 
-    fn reopen(self) -> Self::Reopened {
+    fn reopen(self) -> UResult<Self::Reopened> {
         let mut command = Command::new(&self.compress_prog);
         let file = File::open(&self.path).unwrap();
         command.stdin(file).stdout(Stdio::piped()).arg("-d");
-        let mut child = crash_if_err!(
-            2,
-            command.spawn().map_err(|err| format!(
-                "couldn't execute compress program: errno {}",
-                err.raw_os_error().unwrap()
-            ))
-        );
+        let mut child = command
+            .spawn()
+            .map_err(|err| SortError::CompressProgExecutionFailed {
+                code: err.raw_os_error().unwrap(),
+            })?;
         let child_stdout = child.stdout.take().unwrap();
-        CompressedTmpMergeInput {
+        Ok(CompressedTmpMergeInput {
             path: self.path,
             compress_prog: self.compress_prog,
             child,
             child_stdout,
-        }
+        })
     }
 }
 impl MergeInput for CompressedTmpMergeInput {
     type InnerRead = ChildStdout;
 
-    fn finished_reading(self) {
+    fn finished_reading(self) -> UResult<()> {
         drop(self.child_stdout);
-        assert_child_success(self.child, &self.compress_prog);
-        fs::remove_file(self.path).ok();
+        check_child_success(self.child, &self.compress_prog)?;
+        let _ = fs::remove_file(self.path);
+        Ok(())
     }
 
     fn as_read(&mut self) -> &mut Self::InnerRead {
@@ -509,7 +546,9 @@ pub struct PlainMergeInput<R: Read + Send> {
 }
 impl<R: Read + Send> MergeInput for PlainMergeInput<R> {
     type InnerRead = R;
-    fn finished_reading(self) {}
+    fn finished_reading(self) -> UResult<()> {
+        Ok(())
+    }
     fn as_read(&mut self) -> &mut Self::InnerRead {
         &mut self.inner
     }
diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs
index 55bcdb77b..ae1bcfa4c 100644
--- a/src/uu/sort/src/sort.rs
+++ b/src/uu/sort/src/sort.rs
@@ -22,6 +22,7 @@ mod custom_str_cmp;
 mod ext_sort;
 mod merge;
 mod numeric_str_cmp;
+mod tmp_dir;
 
 use chunks::LineData;
 use clap::{crate_version, App, Arg};
@@ -29,24 +30,29 @@ use custom_str_cmp::custom_str_cmp;
 use ext_sort::ext_sort;
 use fnv::FnvHasher;
 use numeric_str_cmp::{human_numeric_str_cmp, numeric_str_cmp, NumInfo, NumInfoParseSettings};
-use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 use rayon::prelude::*;
 use std::cmp::Ordering;
 use std::env;
-use std::ffi::OsStr;
-use std::fs::File;
+use std::error::Error;
+use std::ffi::{OsStr, OsString};
+use std::fmt::Display;
+use std::fs::{File, OpenOptions};
 use std::hash::{Hash, Hasher};
 use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
 use std::ops::Range;
 use std::path::Path;
 use std::path::PathBuf;
+use std::str::Utf8Error;
 use unicode_width::UnicodeWidthStr;
+use uucore::display::Quotable;
+use uucore::error::{set_exit_code, strip_errno, UError, UResult, USimpleError, UUsageError};
 use uucore::parse_size::{parse_size, ParseSizeError};
 use uucore::version_cmp::version_cmp;
 use uucore::InvalidEncodingHandling;
 
-const NAME: &str = "sort";
+use crate::tmp_dir::TmpDirWrapper;
+
 const ABOUT: &str = "Display sorted concatenation of all FILE(s).";
 
 const LONG_HELP_KEYS: &str = "The key format is FIELD[.CHAR][OPTIONS][,FIELD[.CHAR]][OPTIONS].
@@ -121,6 +127,107 @@ const POSITIVE: char = '+';
 // available memory into consideration, instead of relying on this constant only.
 const DEFAULT_BUF_SIZE: usize = 1_000_000_000; // 1 GB
 
+#[derive(Debug)]
+enum SortError {
+    Disorder {
+        file: OsString,
+        line_number: usize,
+        line: String,
+        silent: bool,
+    },
+    OpenFailed {
+        path: String,
+        error: std::io::Error,
+    },
+    ReadFailed {
+        path: PathBuf,
+        error: std::io::Error,
+    },
+    ParseKeyError {
+        key: String,
+        msg: String,
+    },
+    OpenTmpFileFailed {
+        error: std::io::Error,
+    },
+    CompressProgExecutionFailed {
+        code: i32,
+    },
+    CompressProgTerminatedAbnormally {
+        prog: String,
+    },
+    TmpDirCreationFailed,
+    Uft8Error {
+        error: Utf8Error,
+    },
+}
+
+impl Error for SortError {}
+
+impl UError for SortError {
+    fn code(&self) -> i32 {
+        match self {
+            SortError::Disorder { .. } => 1,
+            _ => 2,
+        }
+    }
+}
+
+impl Display for SortError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SortError::Disorder {
+                file,
+                line_number,
+                line,
+                silent,
+            } => {
+                if !silent {
+                    write!(
+                        f,
+                        "{}:{}: disorder: {}",
+                        file.maybe_quote(),
+                        line_number,
+                        line
+                    )
+                } else {
+                    Ok(())
+                }
+            }
+            SortError::OpenFailed { path, error } => {
+                write!(
+                    f,
+                    "open failed: {}: {}",
+                    path.maybe_quote(),
+                    strip_errno(error)
+                )
+            }
+            SortError::ParseKeyError { key, msg } => {
+                write!(f, "failed to parse key {}: {}", key.quote(), msg)
+            }
+            SortError::ReadFailed { path, error } => {
+                write!(
+                    f,
+                    "cannot read: {}: {}",
+                    path.maybe_quote(),
+                    strip_errno(error)
+                )
+            }
+            SortError::OpenTmpFileFailed { error } => {
+                write!(f, "failed to open temporary file: {}", strip_errno(error))
+            }
+            SortError::CompressProgExecutionFailed { code } => {
+                write!(f, "couldn't execute compress program: errno {}", code)
+            }
+            SortError::CompressProgTerminatedAbnormally { prog } => {
+                write!(f, "{} terminated abnormally", prog.quote())
+            }
+            SortError::TmpDirCreationFailed => write!(f, "could not create temporary directory"),
+            SortError::Uft8Error { error } => write!(f, "{}", error),
+        }
+    }
+}
+
 #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy, Debug)]
 enum SortMode {
     Numeric,
@@ -146,6 +253,49 @@ impl SortMode {
     }
 }
 
+pub struct Output {
+    file: Option<(String, File)>,
+}
+
+impl Output {
+    fn new(name: Option<&str>) -> UResult<Self> {
+        let file = if let Some(name) = name {
+            // This is different from `File::create()` because we don't truncate the output yet.
+            // This allows using the output file as an input file.
+            let file = OpenOptions::new()
+                .write(true)
+                .create(true)
+                .open(name)
+                .map_err(|e| SortError::OpenFailed {
+                    path: name.to_owned(),
+                    error: e,
+                })?;
+            Some((name.to_owned(), file))
+        } else {
+            None
+        };
+        Ok(Self { file })
+    }
+
+    fn into_write(self) -> BufWriter<Box<dyn Write>> {
+        BufWriter::new(match self.file {
+            Some((_name, file)) => {
+                // truncate the file
+                let _ = file.set_len(0);
+                Box::new(file)
+            }
+            None => Box::new(stdout()),
+        })
+    }
+
+    fn as_output_name(&self) -> Option<&str> {
+        match &self.file {
+            Some((name, _file)) => Some(name),
+            None => None,
+        }
+    }
+}
+
 #[derive(Clone)]
 pub struct GlobalSettings {
     mode: SortMode,
@@ -156,18 +306,16 @@ pub struct GlobalSettings {
     ignore_non_printing: bool,
     merge: bool,
     reverse: bool,
-    output_file: Option<String>,
     stable: bool,
     unique: bool,
     check: bool,
     check_silent: bool,
-    salt: String,
+    salt: Option<[u8; 16]>,
     selectors: Vec<FieldSelector>,
     separator: Option<char>,
     threads: String,
     zero_terminated: bool,
     buffer_size: usize,
-    tmp_dir: PathBuf,
     compress_prog: Option<String>,
     merge_batch_size: usize,
     precomputed: Precomputed,
@@ -209,19 +357,6 @@ impl GlobalSettings {
         }
     }
 
-    fn out_writer(&self) -> BufWriter<Box<dyn Write>> {
-        match self.output_file {
-            Some(ref filename) => match File::create(Path::new(&filename)) {
-                Ok(f) => BufWriter::new(Box::new(f) as Box<dyn Write>),
-                Err(e) => {
-                    show_error!("{0}: {1}", filename, e.to_string());
-                    panic!("Could not open output file");
-                }
-            },
-            None => BufWriter::new(Box::new(stdout()) as Box<dyn Write>),
-        }
-    }
-
     /// Precompute some data needed for sorting.
     /// This function **must** be called before starting to sort, and `GlobalSettings` may not be altered
     /// afterwards.
@@ -253,18 +388,16 @@ impl Default for GlobalSettings {
             ignore_non_printing: false,
             merge: false,
             reverse: false,
-            output_file: None,
             stable: false,
             unique: false,
             check: false,
             check_silent: false,
-            salt: String::new(),
+            salt: None,
             selectors: vec![],
             separator: None,
             threads: String::new(),
             zero_terminated: false,
             buffer_size: DEFAULT_BUF_SIZE,
-            tmp_dir: PathBuf::new(),
             compress_prog: None,
             merge_batch_size: 32,
             precomputed: Precomputed {
@@ -526,18 +659,14 @@ impl<'a> Line<'a> {
                 " ".repeat(UnicodeWidthStr::width(&line[..selection.start]))
             )?;
 
-            // TODO: Once our minimum supported rust version is at least 1.47, use selection.is_empty() instead.
-            #[allow(clippy::len_zero)]
-            {
-                if selection.len() == 0 {
-                    writeln!(writer, "^ no match for key")?;
-                } else {
-                    writeln!(
-                        writer,
-                        "{}",
-                        "_".repeat(UnicodeWidthStr::width(&line[selection]))
-                    )?;
-                }
+            if selection.is_empty() {
+                writeln!(writer, "^ no match for key")?;
+            } else {
+                writeln!(
+                    writer,
+                    "{}",
+                    "_".repeat(UnicodeWidthStr::width(&line[selection]))
+                )?;
             }
         }
         if settings.mode != SortMode::Random
@@ -630,19 +759,19 @@ impl KeyPosition {
 
         let field = field_and_char
             .next()
-            .ok_or_else(|| format!("invalid key `{}`", key))?;
+            .ok_or_else(|| format!("invalid key {}", key.quote()))?;
         let char = field_and_char.next();
 
         let field = field
             .parse()
-            .map_err(|e| format!("failed to parse field index `{}`: {}", field, e))?;
+            .map_err(|e| format!("failed to parse field index {}: {}", field.quote(), e))?;
         if field == 0 {
             return Err("field index can not be 0".to_string());
         }
 
         let char = char.map_or(Ok(default_char_index), |char| {
             char.parse()
-                .map_err(|e| format!("failed to parse character index `{}`: {}", char, e))
+                .map_err(|e| format!("failed to parse character index {}: {}", char.quote(), e))
         })?;
 
         Ok(Self {
@@ -663,7 +792,7 @@ impl Default for KeyPosition {
     }
 }
 
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Debug, Default)]
 struct FieldSelector {
     from: KeyPosition,
     to: Option<KeyPosition>,
@@ -675,18 +804,6 @@ struct FieldSelector {
     needs_selection: bool,
 }
 
-impl Default for FieldSelector {
-    fn default() -> Self {
-        Self {
-            from: Default::default(),
-            to: None,
-            settings: Default::default(),
-            needs_tokens: false,
-            needs_selection: false,
-        }
-    }
-}
-
 impl FieldSelector {
     /// Splits this position into the actual position and the attached options.
     fn split_key_options(position: &str) -> (&str, &str) {
@@ -697,33 +814,37 @@ impl FieldSelector {
         }
     }
 
-    fn parse(key: &str, global_settings: &GlobalSettings) -> Self {
+    fn parse(key: &str, global_settings: &GlobalSettings) -> UResult<Self> {
         let mut from_to = key.split(',');
         let (from, from_options) = Self::split_key_options(from_to.next().unwrap());
-        let to = from_to.next().map(|to| Self::split_key_options(to));
+        let to = from_to.next().map(Self::split_key_options);
         let options_are_empty = from_options.is_empty() && matches!(to, None | Some((_, "")));
-        crash_if_err!(
-            2,
-            if options_are_empty {
-                // Inherit the global settings if there are no options attached to this key.
-                (|| {
-                    // This would be ideal for a try block, I think. In the meantime this closure allows
-                    // to use the `?` operator here.
-                    Self::new(
-                        KeyPosition::new(from, 1, global_settings.ignore_leading_blanks)?,
-                        to.map(|(to, _)| {
-                            KeyPosition::new(to, 0, global_settings.ignore_leading_blanks)
-                        })
-                        .transpose()?,
-                        KeySettings::from(global_settings),
-                    )
-                })()
-            } else {
-                // Do not inherit from `global_settings`, as there are options attached to this key.
-                Self::parse_with_options((from, from_options), to)
+
+        if options_are_empty {
+            // Inherit the global settings if there are no options attached to this key.
+            (|| {
+                // This would be ideal for a try block, I think. In the meantime this closure allows
+                // to use the `?` operator here.
+                Self::new(
+                    KeyPosition::new(from, 1, global_settings.ignore_leading_blanks)?,
+                    to.map(|(to, _)| {
+                        KeyPosition::new(to, 0, global_settings.ignore_leading_blanks)
+                    })
+                    .transpose()?,
+                    KeySettings::from(global_settings),
+                )
+            })()
+        } else {
+            // Do not inherit from `global_settings`, as there are options attached to this key.
+            Self::parse_with_options((from, from_options), to)
+        }
+        .map_err(|msg| {
+            SortError::ParseKeyError {
+                key: key.to_owned(),
+                msg,
             }
-            .map_err(|e| format!("failed to parse key `{}`: {}", key, e))
-        )
+            .into()
+        })
     }
 
     fn parse_with_options(
@@ -749,7 +870,7 @@ impl FieldSelector {
                     'R' => key_settings.set_sort_mode(SortMode::Random)?,
                     'r' => key_settings.reverse = true,
                     'V' => key_settings.set_sort_mode(SortMode::Version)?,
-                    c => return Err(format!("invalid option: `{}`", c)),
+                    c => return Err(format!("invalid option: '{}'", c)),
                 }
             }
             Ok(ignore_blanks)
@@ -914,15 +1035,13 @@ impl FieldSelector {
     }
 }
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
-        "{0}
-Usage:
- {0} [OPTION]... [FILE]...
+        "{0} [OPTION]... [FILE]...
 Write the sorted concatenation of all FILE(s) to standard output.
 Mandatory arguments for long options are mandatory for short options too.
 With no FILE, or when FILE is -, read standard input.",
-        NAME
+        uucore::execution_phrase()
     )
 }
 
@@ -937,41 +1056,57 @@ fn make_sort_mode_arg<'a, 'b>(mode: &'a str, short: &'b str, help: &'b str) -> A
     arg
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
-    let usage = get_usage();
+    let usage = usage();
     let mut settings: GlobalSettings = Default::default();
 
-    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
+    let matches = match uu_app().usage(&usage[..]).get_matches_from_safe(args) {
+        Ok(t) => t,
+        Err(e) => {
+            // not all clap "Errors" are because of a failure to parse arguments.
+            // "--version" also causes an Error to be returned, but we should not print to stderr
+            // nor return with a non-zero exit code in this case (we should print to stdout and return 0).
+            // This logic is similar to the code in clap, but we return 2 as the exit code in case of real failure
+            // (clap returns 1).
+            if e.use_stderr() {
+                eprintln!("{}", e.message);
+                set_exit_code(2);
+            } else {
+                println!("{}", e.message);
+            }
+            return Ok(());
+        }
+    };
 
     settings.debug = matches.is_present(options::DEBUG);
 
     // check whether user specified a zero terminated list of files for input, otherwise read files from args
-    let mut files: Vec<String> = if matches.is_present(options::FILES0_FROM) {
-        let files0_from: Vec<String> = matches
-            .values_of(options::FILES0_FROM)
-            .map(|v| v.map(ToString::to_string).collect())
+    let mut files: Vec<OsString> = if matches.is_present(options::FILES0_FROM) {
+        let files0_from: Vec<OsString> = matches
+            .values_of_os(options::FILES0_FROM)
+            .map(|v| v.map(ToOwned::to_owned).collect())
             .unwrap_or_default();
 
         let mut files = Vec::new();
         for path in &files0_from {
-            let reader = open(path.as_str());
+            let reader = open(&path)?;
             let buf_reader = BufReader::new(reader);
             for line in buf_reader.split(b'\0').flatten() {
-                files.push(
+                files.push(OsString::from(
                     std::str::from_utf8(&line)
-                        .expect("Could not parse string from zero terminated input.")
-                        .to_string(),
-                );
+                        .expect("Could not parse string from zero terminated input."),
+                ));
             }
         }
         files
     } else {
         matches
-            .values_of(options::FILES)
-            .map(|v| v.map(ToString::to_string).collect())
+            .values_of_os(options::FILES)
+            .map(|v| v.map(ToOwned::to_owned).collect())
             .unwrap_or_default()
     };
 
@@ -998,7 +1133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     } else if matches.is_present(options::modes::RANDOM)
         || matches.value_of(options::modes::SORT) == Some("random")
     {
-        settings.salt = get_rand_string();
+        settings.salt = Some(get_rand_string());
         SortMode::Random
     } else {
         SortMode::Default
@@ -1015,24 +1150,31 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         env::set_var("RAYON_NUM_THREADS", &settings.threads);
     }
 
-    settings.buffer_size = matches
-        .value_of(options::BUF_SIZE)
-        .map_or(DEFAULT_BUF_SIZE, |s| {
-            GlobalSettings::parse_byte_count(s)
-                .unwrap_or_else(|e| crash!(2, "{}", format_error_message(e, s, options::BUF_SIZE)))
-        });
+    settings.buffer_size =
+        matches
+            .value_of(options::BUF_SIZE)
+            .map_or(Ok(DEFAULT_BUF_SIZE), |s| {
+                GlobalSettings::parse_byte_count(s).map_err(|e| {
+                    USimpleError::new(2, format_error_message(e, s, options::BUF_SIZE))
+                })
+            })?;
 
-    settings.tmp_dir = matches
-        .value_of(options::TMP_DIR)
-        .map(PathBuf::from)
-        .unwrap_or_else(env::temp_dir);
+    let mut tmp_dir = TmpDirWrapper::new(
+        matches
+            .value_of(options::TMP_DIR)
+            .map(PathBuf::from)
+            .unwrap_or_else(env::temp_dir),
+    );
 
     settings.compress_prog = matches.value_of(options::COMPRESS_PROG).map(String::from);
 
     if let Some(n_merge) = matches.value_of(options::BATCH_SIZE) {
-        settings.merge_batch_size = n_merge
-            .parse()
-            .unwrap_or_else(|_| crash!(2, "invalid --batch-size argument '{}'", n_merge));
+        settings.merge_batch_size = n_merge.parse().map_err(|_| {
+            UUsageError::new(
+                2,
+                format!("invalid --batch-size argument {}", n_merge.quote()),
+            )
+        })?;
     }
 
     settings.zero_terminated = matches.is_present(options::ZERO_TERMINATED);
@@ -1053,32 +1195,52 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     settings.ignore_leading_blanks = matches.is_present(options::IGNORE_LEADING_BLANKS);
 
-    settings.output_file = matches.value_of(options::OUTPUT).map(String::from);
     settings.reverse = matches.is_present(options::REVERSE);
     settings.stable = matches.is_present(options::STABLE);
     settings.unique = matches.is_present(options::UNIQUE);
 
     if files.is_empty() {
         /* if no file, default to stdin */
-        files.push("-".to_owned());
+        files.push("-".to_string().into());
     } else if settings.check && files.len() != 1 {
-        crash!(1, "extra operand `{}' not allowed with -c", files[1])
+        return Err(UUsageError::new(
+            2,
+            format!("extra operand {} not allowed with -c", files[1].quote()),
+        ));
     }
 
     if let Some(arg) = matches.args.get(options::SEPARATOR) {
-        let separator = arg.vals[0].to_string_lossy();
-        let separator = separator;
+        let mut separator = arg.vals[0].to_str().ok_or_else(|| {
+            UUsageError::new(
+                2,
+                format!("separator is not valid unicode: {}", arg.vals[0].quote()),
+            )
+        })?;
+        if separator == "\\0" {
+            separator = "\0";
+        }
+        // This rejects non-ASCII codepoints, but perhaps we don't have to.
+        // On the other hand GNU accepts any single byte, valid unicode or not.
+        // (Supporting multi-byte chars would require changes in tokenize_with_separator().)
         if separator.len() != 1 {
-            crash!(1, "separator must be exactly one character long");
+            return Err(UUsageError::new(
+                2,
+                format!(
+                    "separator must be exactly one character long: {}",
+                    separator.quote()
+                ),
+            ));
         }
         settings.separator = Some(separator.chars().next().unwrap())
     }
 
     if let Some(values) = matches.values_of(options::KEY) {
         for value in values {
-            settings
-                .selectors
-                .push(FieldSelector::parse(value, &settings));
+            let selector = FieldSelector::parse(value, &settings)?;
+            if selector.settings.mode == SortMode::Random && settings.salt.is_none() {
+                settings.salt = Some(get_rand_string());
+            }
+            settings.selectors.push(selector);
         }
     }
 
@@ -1099,86 +1261,80 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         );
     }
 
+    // Verify that we can open all input files.
+    // It is the correct behavior to close all files afterwards,
+    // and to reopen them at a later point. This is different from how the output file is handled,
+    // probably to prevent running out of file descriptors.
+    for file in &files {
+        open(file)?;
+    }
+
+    let output = Output::new(matches.value_of(options::OUTPUT))?;
+
     settings.init_precomputed();
 
-    exec(&files, &settings)
+    exec(&mut files, &settings, output, &mut tmp_dir)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
             Arg::with_name(options::modes::SORT)
                 .long(options::modes::SORT)
                 .takes_value(true)
-                .possible_values(
-                    &[
-                        "general-numeric",
-                        "human-numeric",
-                        "month",
-                        "numeric",
-                        "version",
-                        "random",
-                    ]
-                )
-                .conflicts_with_all(&options::modes::ALL_SORT_MODES)
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::HUMAN_NUMERIC,
-                "h",
-                "compare according to human readable sizes, eg 1M > 100k"
-            ),
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::MONTH,
-                "M",
-                "compare according to month name abbreviation"
-            ),
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::NUMERIC,
-                "n",
-                "compare according to string numerical value"
-            ),
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::GENERAL_NUMERIC,
-                "g",
-                "compare according to string general numerical value"
-            ),
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::VERSION,
-                "V",
-                "Sort by SemVer version number, eg 1.12.2 > 1.1.2",
-            ),
-        )
-        .arg(
-            make_sort_mode_arg(
-                options::modes::RANDOM,
-                "R",
-                "shuffle in random order",
-            ),
+                .possible_values(&[
+                    "general-numeric",
+                    "human-numeric",
+                    "month",
+                    "numeric",
+                    "version",
+                    "random",
+                ])
+                .conflicts_with_all(&options::modes::ALL_SORT_MODES),
         )
+        .arg(make_sort_mode_arg(
+            options::modes::HUMAN_NUMERIC,
+            "h",
+            "compare according to human readable sizes, eg 1M > 100k",
+        ))
+        .arg(make_sort_mode_arg(
+            options::modes::MONTH,
+            "M",
+            "compare according to month name abbreviation",
+        ))
+        .arg(make_sort_mode_arg(
+            options::modes::NUMERIC,
+            "n",
+            "compare according to string numerical value",
+        ))
+        .arg(make_sort_mode_arg(
+            options::modes::GENERAL_NUMERIC,
+            "g",
+            "compare according to string general numerical value",
+        ))
+        .arg(make_sort_mode_arg(
+            options::modes::VERSION,
+            "V",
+            "Sort by SemVer version number, eg 1.12.2 > 1.1.2",
+        ))
+        .arg(make_sort_mode_arg(
+            options::modes::RANDOM,
+            "R",
+            "shuffle in random order",
+        ))
         .arg(
             Arg::with_name(options::DICTIONARY_ORDER)
                 .short("d")
                 .long(options::DICTIONARY_ORDER)
                 .help("consider only blanks and alphanumeric characters")
-                .conflicts_with_all(
-                    &[
-                        options::modes::NUMERIC,
-                        options::modes::GENERAL_NUMERIC,
-                        options::modes::HUMAN_NUMERIC,
-                        options::modes::MONTH,
-                    ]
-                ),
+                .conflicts_with_all(&[
+                    options::modes::NUMERIC,
+                    options::modes::GENERAL_NUMERIC,
+                    options::modes::HUMAN_NUMERIC,
+                    options::modes::MONTH,
+                ]),
         )
         .arg(
             Arg::with_name(options::MERGE)
@@ -1206,7 +1362,10 @@ pub fn uu_app() -> App<'static, 'static> {
                 .short("C")
                 .long(options::check::CHECK_SILENT)
                 .conflicts_with(options::OUTPUT)
-                .help("exit successfully if the given file is already sorted, and exit with status 1 otherwise."),
+                .help(
+                    "exit successfully if the given file is already sorted,\
+                and exit with status 1 otherwise.",
+                ),
         )
         .arg(
             Arg::with_name(options::IGNORE_CASE)
@@ -1219,14 +1378,12 @@ pub fn uu_app() -> App<'static, 'static> {
                 .short("i")
                 .long(options::IGNORE_NONPRINTING)
                 .help("ignore nonprinting characters")
-                .conflicts_with_all(
-                    &[
-                        options::modes::NUMERIC,
-                        options::modes::GENERAL_NUMERIC,
-                        options::modes::HUMAN_NUMERIC,
-                        options::modes::MONTH
-                    ]
-                ),
+                .conflicts_with_all(&[
+                    options::modes::NUMERIC,
+                    options::modes::GENERAL_NUMERIC,
+                    options::modes::HUMAN_NUMERIC,
+                    options::modes::MONTH,
+                ]),
         )
         .arg(
             Arg::with_name(options::IGNORE_LEADING_BLANKS)
@@ -1275,7 +1432,8 @@ pub fn uu_app() -> App<'static, 'static> {
                 .short("t")
                 .long(options::SEPARATOR)
                 .help("custom separator for -k")
-                .takes_value(true))
+                .takes_value(true),
+        )
         .arg(
             Arg::with_name(options::ZERO_TERMINATED)
                 .short("z")
@@ -1310,13 +1468,13 @@ pub fn uu_app() -> App<'static, 'static> {
                 .long(options::COMPRESS_PROG)
                 .help("compress temporary files with PROG, decompress with PROG -d")
                 .long_help("PROG has to take input from stdin and output to stdout")
-                .value_name("PROG")
+                .value_name("PROG"),
         )
         .arg(
             Arg::with_name(options::BATCH_SIZE)
                 .long(options::BATCH_SIZE)
                 .help("Merge at most N_MERGE inputs at once.")
-                .value_name("N_MERGE")
+                .value_name("N_MERGE"),
         )
         .arg(
             Arg::with_name(options::FILES0_FROM)
@@ -1331,24 +1489,32 @@ pub fn uu_app() -> App<'static, 'static> {
                 .long(options::DEBUG)
                 .help("underline the parts of the line that are actually used for sorting"),
         )
-        .arg(Arg::with_name(options::FILES).multiple(true).takes_value(true))
+        .arg(
+            Arg::with_name(options::FILES)
+                .multiple(true)
+                .takes_value(true),
+        )
 }
 
-fn exec(files: &[String], settings: &GlobalSettings) -> i32 {
+fn exec(
+    files: &mut [OsString],
+    settings: &GlobalSettings,
+    output: Output,
+    tmp_dir: &mut TmpDirWrapper,
+) -> UResult<()> {
     if settings.merge {
-        let mut file_merger = merge::merge(files.iter().map(open), settings);
-        file_merger.write_all(settings);
+        let file_merger = merge::merge(files, settings, output.as_output_name(), tmp_dir)?;
+        file_merger.write_all(settings, output)
     } else if settings.check {
         if files.len() > 1 {
-            crash!(1, "only one file allowed with -c");
+            Err(UUsageError::new(2, "only one file allowed with -c"))
+        } else {
+            check::check(files.first().unwrap(), settings)
         }
-        return check::check(files.first().unwrap(), settings);
     } else {
         let mut lines = files.iter().map(open);
-
-        ext_sort(&mut lines, settings);
+        ext_sort(&mut lines, settings, output, tmp_dir)
     }
-    0
 }
 
 fn sort_by<'a>(unsorted: &mut Vec<Line<'a>>, settings: &GlobalSettings, line_data: &LineData<'a>) {
@@ -1387,7 +1553,22 @@ fn compare_by<'a>(
         let settings = &selector.settings;
 
         let cmp: Ordering = match settings.mode {
-            SortMode::Random => random_shuffle(a_str, b_str, &global_settings.salt),
+            SortMode::Random => {
+                // check if the two strings are equal
+                if custom_str_cmp(
+                    a_str,
+                    b_str,
+                    settings.ignore_non_printing,
+                    settings.dictionary_order,
+                    settings.ignore_case,
+                ) == Ordering::Equal
+                {
+                    Ordering::Equal
+                } else {
+                    // Only if they are not equal compare by the hash
+                    random_shuffle(a_str, b_str, &global_settings.salt.unwrap())
+                }
+            }
             SortMode::Numeric => {
                 let a_num_info = &a_line_data.num_infos
                     [a.index * global_settings.precomputed.num_infos_per_line + num_info_index];
@@ -1536,12 +1717,8 @@ fn general_numeric_compare(a: &GeneralF64ParseResult, b: &GeneralF64ParseResult)
     a.partial_cmp(b).unwrap()
 }
 
-fn get_rand_string() -> String {
-    thread_rng()
-        .sample_iter(&Alphanumeric)
-        .take(16)
-        .map(char::from)
-        .collect::<String>()
+fn get_rand_string() -> [u8; 16] {
+    thread_rng().sample(rand::distributions::Standard)
 }
 
 fn get_hash<T: Hash>(t: &T) -> u64 {
@@ -1550,10 +1727,9 @@ fn get_hash<T: Hash>(t: &T) -> u64 {
     s.finish()
 }
 
-fn random_shuffle(a: &str, b: &str, salt: &str) -> Ordering {
-    let da = get_hash(&[a, salt].concat());
-    let db = get_hash(&[b, salt].concat());
-
+fn random_shuffle(a: &str, b: &str, salt: &[u8]) -> Ordering {
+    let da = get_hash(&(a, salt));
+    let db = get_hash(&(b, salt));
     da.cmp(&db)
 }
 
@@ -1618,26 +1794,33 @@ fn month_compare(a: &str, b: &str) -> Ordering {
     }
 }
 
-fn print_sorted<'a, T: Iterator<Item = &'a Line<'a>>>(iter: T, settings: &GlobalSettings) {
-    let mut writer = settings.out_writer();
+fn print_sorted<'a, T: Iterator<Item = &'a Line<'a>>>(
+    iter: T,
+    settings: &GlobalSettings,
+    output: Output,
+) {
+    let mut writer = output.into_write();
     for line in iter {
         line.print(&mut writer, settings);
     }
 }
 
-// from cat.rs
-fn open(path: impl AsRef<OsStr>) -> Box<dyn Read + Send> {
+fn open(path: impl AsRef<OsStr>) -> UResult<Box<dyn Read + Send>> {
     let path = path.as_ref();
     if path == "-" {
         let stdin = stdin();
-        return Box::new(stdin) as Box<dyn Read + Send>;
+        return Ok(Box::new(stdin) as Box<dyn Read + Send>);
     }
 
-    match File::open(Path::new(path)) {
-        Ok(f) => Box::new(f) as Box<dyn Read + Send>,
-        Err(e) => {
-            crash!(2, "cannot read: {0:?}: {1}", path, e);
+    let path = Path::new(path);
+
+    match File::open(path) {
+        Ok(f) => Ok(Box::new(f) as Box<dyn Read + Send>),
+        Err(error) => Err(SortError::ReadFailed {
+            path: path.to_owned(),
+            error,
         }
+        .into()),
     }
 }
 
@@ -1646,8 +1829,8 @@ fn format_error_message(error: ParseSizeError, s: &str, option: &str) -> String
     // GNU's sort echos affected flag, -S or --buffer-size, depending user's selection
     // GNU's sort does distinguish between "invalid (suffix in) argument"
     match error {
-        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument '{}'", option, s),
-        ParseSizeError::SizeTooBig(_) => format!("--{} argument '{}' too large", option, s),
+        ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
+        ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
     }
 }
 
diff --git a/src/uu/sort/src/tmp_dir.rs b/src/uu/sort/src/tmp_dir.rs
new file mode 100644
index 000000000..32ffbbf0d
--- /dev/null
+++ b/src/uu/sort/src/tmp_dir.rs
@@ -0,0 +1,85 @@
+use std::{
+    fs::File,
+    path::{Path, PathBuf},
+    sync::{Arc, Mutex},
+};
+
+use tempfile::TempDir;
+use uucore::error::{UResult, USimpleError};
+
+use crate::SortError;
+
+/// A wrapper around TempDir that may only exist once in a process.
+///
+/// `TmpDirWrapper` handles the allocation of new temporary files in this temporary directory and
+/// deleting the whole directory when `SIGINT` is received. Creating a second `TmpDirWrapper` will
+/// fail because `ctrlc::set_handler()` fails when there's already a handler.
+/// The directory is only created once the first file is requested.
+pub struct TmpDirWrapper {
+    temp_dir: Option<TempDir>,
+    parent_path: PathBuf,
+    size: usize,
+    lock: Arc<Mutex<()>>,
+}
+
+impl TmpDirWrapper {
+    pub fn new(path: PathBuf) -> Self {
+        Self {
+            parent_path: path,
+            size: 0,
+            temp_dir: None,
+            lock: Default::default(),
+        }
+    }
+
+    fn init_tmp_dir(&mut self) -> UResult<()> {
+        assert!(self.temp_dir.is_none());
+        assert_eq!(self.size, 0);
+        self.temp_dir = Some(
+            tempfile::Builder::new()
+                .prefix("uutils_sort")
+                .tempdir_in(&self.parent_path)
+                .map_err(|_| SortError::TmpDirCreationFailed)?,
+        );
+
+        let path = self.temp_dir.as_ref().unwrap().path().to_owned();
+        let lock = self.lock.clone();
+        ctrlc::set_handler(move || {
+            // Take the lock so that `next_file_path` returns no new file path.
+            let _lock = lock.lock().unwrap();
+            if let Err(e) = remove_tmp_dir(&path) {
+                show_error!("failed to delete temporary directory: {}", e);
+            }
+            std::process::exit(2)
+        })
+        .map_err(|e| USimpleError::new(2, format!("failed to set up signal handler: {}", e)))
+    }
+
+    pub fn next_file(&mut self) -> UResult<(File, PathBuf)> {
+        if self.temp_dir.is_none() {
+            self.init_tmp_dir()?;
+        }
+
+        let _lock = self.lock.lock().unwrap();
+        let file_name = self.size.to_string();
+        self.size += 1;
+        let path = self.temp_dir.as_ref().unwrap().path().join(file_name);
+        Ok((
+            File::create(&path).map_err(|error| SortError::OpenTmpFileFailed { error })?,
+            path,
+        ))
+    }
+}
+
+/// Remove the directory at `path` by deleting its child files and then itself.
+/// Errors while deleting child files are ignored.
+fn remove_tmp_dir(path: &Path) -> std::io::Result<()> {
+    if let Ok(read_dir) = std::fs::read_dir(&path) {
+        for file in read_dir.flatten() {
+            // if we fail to delete the file here it was probably deleted by another thread
+            // in the meantime, but that's ok.
+            let _ = std::fs::remove_file(file.path());
+        }
+    }
+    std::fs::remove_dir(path)
+}
diff --git a/src/uu/split/Cargo.toml b/src/uu/split/Cargo.toml
index 6583d705e..44d0350b2 100644
--- a/src/uu/split/Cargo.toml
+++ b/src/uu/split/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_split"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "split ~ (uutils) split input into output files"
@@ -16,9 +16,13 @@ path = "src/split.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "split"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs
index ccc98ee5e..581b632d2 100644
--- a/src/uu/split/src/split.rs
+++ b/src/uu/split/src/split.rs
@@ -19,10 +19,9 @@ use std::fs::File;
 use std::io::{stdin, BufRead, BufReader, BufWriter, Read, Write};
 use std::path::Path;
 use std::{char, fs::remove_file};
+use uucore::display::Quotable;
 use uucore::parse_size::parse_size;
 
-static NAME: &str = "split";
-
 static OPT_BYTES: &str = "bytes";
 static OPT_LINE_BYTES: &str = "line-bytes";
 static OPT_LINES: &str = "lines";
@@ -36,8 +35,11 @@ static OPT_VERBOSE: &str = "verbose";
 static ARG_INPUT: &str = "input";
 static ARG_PREFIX: &str = "prefix";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [INPUT [PREFIX]]", NAME)
+fn usage() -> String {
+    format!(
+        "{0} [OPTION]... [INPUT [PREFIX]]",
+        uucore::execution_phrase()
+    )
 }
 fn get_long_usage() -> String {
     format!(
@@ -47,12 +49,12 @@ fn get_long_usage() -> String {
 Output fixed-size pieces of INPUT to PREFIXaa, PREFIX ab, ...; default
 size is 1000, and default PREFIX is 'x'. With no INPUT, or when INPUT is
 -, read standard input.",
-        get_usage()
+        usage()
     )
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let long_usage = get_long_usage();
 
     let matches = uu_app()
@@ -103,7 +105,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     settings.strategy = String::from(OPT_LINES);
     settings.strategy_param = matches.value_of(OPT_LINES).unwrap().to_owned();
     // take any (other) defined strategy
-    for strategy in vec![OPT_LINE_BYTES, OPT_BYTES].into_iter() {
+    for &strategy in &[OPT_LINE_BYTES, OPT_BYTES] {
         if matches.occurrences_of(strategy) > 0 {
             settings.strategy = String::from(strategy);
             settings.strategy_param = matches.value_of(strategy).unwrap().to_owned();
@@ -127,7 +129,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about("Create output files containing consecutive or interleaved sections of input")
         // strategy (mutually exclusive)
@@ -237,7 +239,11 @@ impl LineSplitter {
     fn new(settings: &Settings) -> LineSplitter {
         LineSplitter {
             lines_per_split: settings.strategy_param.parse().unwrap_or_else(|_| {
-                crash!(1, "invalid number of lines: '{}'", settings.strategy_param)
+                crash!(
+                    1,
+                    "invalid number of lines: {}",
+                    settings.strategy_param.quote()
+                )
             }),
         }
     }
@@ -372,8 +378,8 @@ fn split(settings: &Settings) -> i32 {
         let r = File::open(Path::new(&settings.input)).unwrap_or_else(|_| {
             crash!(
                 1,
-                "cannot open '{}' for reading: No such file or directory",
-                settings.input
+                "cannot open {} for reading: No such file or directory",
+                settings.input.quote()
             )
         });
         Box::new(r) as Box<dyn Read>
@@ -382,7 +388,7 @@ fn split(settings: &Settings) -> i32 {
     let mut splitter: Box<dyn Splitter> = match settings.strategy.as_str() {
         s if s == OPT_LINES => Box::new(LineSplitter::new(settings)),
         s if (s == OPT_BYTES || s == OPT_LINE_BYTES) => Box::new(ByteSplitter::new(settings)),
-        a => crash!(1, "strategy {} not supported", a),
+        a => crash!(1, "strategy {} not supported", a.quote()),
     };
 
     let mut fileno = 0;
diff --git a/src/uu/stat/Cargo.toml b/src/uu/stat/Cargo.toml
index dec209ea0..a1f168b14 100644
--- a/src/uu/stat/Cargo.toml
+++ b/src/uu/stat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_stat"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "stat ~ (uutils) display FILE status"
@@ -16,8 +16,8 @@ path = "src/stat.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "stat"
diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs
index 70c06bdf6..fd4a6443d 100644
--- a/src/uu/stat/src/stat.rs
+++ b/src/uu/stat/src/stat.rs
@@ -7,6 +7,7 @@
 
 #[macro_use]
 extern crate uucore;
+use uucore::display::Quotable;
 use uucore::entries;
 use uucore::fs::display_permissions;
 use uucore::fsext::{
@@ -24,7 +25,7 @@ use std::{cmp, fs, iter};
 macro_rules! check_bound {
     ($str: ident, $bound:expr, $beg: expr, $end: expr) => {
         if $end >= $bound {
-            return Err(format!("'{}': invalid directive", &$str[$beg..$end]));
+            return Err(format!("{}: invalid directive", $str[$beg..$end].quote()));
         }
     };
 }
@@ -436,6 +437,7 @@ impl Stater {
                             'f' => tokens.push(Token::Char('\x0C')),
                             'n' => tokens.push(Token::Char('\n')),
                             'r' => tokens.push(Token::Char('\r')),
+                            't' => tokens.push(Token::Char('\t')),
                             'v' => tokens.push(Token::Char('\x0B')),
                             c => {
                                 show_warning!("unrecognized escape '\\{}'", c);
@@ -651,11 +653,7 @@ impl Stater {
                                                     return 1;
                                                 }
                                             };
-                                            arg = format!(
-                                                "`{}' -> `{}'",
-                                                file,
-                                                dst.to_string_lossy()
-                                            );
+                                            arg = format!("{} -> {}", file.quote(), dst.quote());
                                         } else {
                                             arg = file.to_string();
                                         }
@@ -749,7 +747,7 @@ impl Stater {
                     }
                 }
                 Err(e) => {
-                    show_error!("cannot stat '{}': {}", file, e);
+                    show_error!("cannot stat {}: {}", file.quote(), e);
                     return 1;
                 }
             }
@@ -842,7 +840,11 @@ impl Stater {
                     }
                 }
                 Err(e) => {
-                    show_error!("cannot read file system information for '{}': {}", file, e);
+                    show_error!(
+                        "cannot read file system information for {}: {}",
+                        file.quote(),
+                        e
+                    );
                     return 1;
                 }
             }
@@ -881,8 +883,8 @@ impl Stater {
     }
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -944,7 +946,7 @@ for details about the options it supports.
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let long_usage = get_long_usage();
 
     let matches = uu_app()
@@ -962,7 +964,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/stdbuf/Cargo.toml b/src/uu/stdbuf/Cargo.toml
index e9e162803..45863cd0c 100644
--- a/src/uu/stdbuf/Cargo.toml
+++ b/src/uu/stdbuf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_stdbuf"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "stdbuf ~ (uutils) run COMMAND with modified standard stream buffering"
@@ -17,11 +17,11 @@ path = "src/stdbuf.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 tempfile = "3.1"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [build-dependencies]
-libstdbuf = { version="0.0.7", package="uu_stdbuf_libstdbuf", path="src/libstdbuf" }
+libstdbuf = { version="0.0.8", package="uu_stdbuf_libstdbuf", path="src/libstdbuf" }
 
 [[bin]]
 name = "stdbuf"
diff --git a/src/uu/stdbuf/src/libstdbuf/Cargo.toml b/src/uu/stdbuf/src/libstdbuf/Cargo.toml
index 9f86fcd17..069a2ae11 100644
--- a/src/uu/stdbuf/src/libstdbuf/Cargo.toml
+++ b/src/uu/stdbuf/src/libstdbuf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_stdbuf_libstdbuf"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "stdbuf/libstdbuf ~ (uutils); dynamic library required for stdbuf"
@@ -19,8 +19,8 @@ crate-type = ["cdylib", "rlib"] # XXX: note: the rlib is just to prevent Cargo f
 [dependencies]
 cpp = "0.5"
 libc = "0.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../../../uucore_procs" }
 
 [build-dependencies]
 cpp_build = "0.4"
diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs
index 7460a2cb2..77d80f777 100644
--- a/src/uu/stdbuf/src/stdbuf.rs
+++ b/src/uu/stdbuf/src/stdbuf.rs
@@ -47,8 +47,8 @@ mod options {
     pub const COMMAND: &str = "command";
 }
 
-fn get_usage() -> String {
-    format!("{0} OPTION... COMMAND", executable!())
+fn usage() -> String {
+    format!("{0} OPTION... COMMAND", uucore::execution_phrase())
 }
 
 const STDBUF_INJECT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/libstdbuf.so"));
@@ -152,19 +152,25 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let args = args
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
-    let options = ProgramOptions::try_from(&matches)
-        .unwrap_or_else(|e| crash!(125, "{}\nTry 'stdbuf --help' for more information.", e.0));
+    let options = ProgramOptions::try_from(&matches).unwrap_or_else(|e| {
+        crash!(
+            125,
+            "{}\nTry '{} --help' for more information.",
+            e.0,
+            uucore::execution_phrase()
+        )
+    });
 
     let mut command_values = matches.values_of::<&str>(options::COMMAND).unwrap();
     let mut command = Command::new(command_values.next().unwrap());
     let command_params: Vec<&str> = command_values.collect();
 
     let mut tmp_dir = tempdir().unwrap();
-    let (preload_env, libstdbuf) = return_if_err!(1, get_preload_env(&mut tmp_dir));
+    let (preload_env, libstdbuf) = crash_if_err!(1, get_preload_env(&mut tmp_dir));
     command.env(preload_env, libstdbuf);
     set_command_env(&mut command, "_STDBUF_I", options.stdin);
     set_command_env(&mut command, "_STDBUF_O", options.stdout);
@@ -185,7 +191,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help(LONG_HELP)
diff --git a/src/uu/sum/Cargo.toml b/src/uu/sum/Cargo.toml
index 5a212d0d3..273f9dff9 100644
--- a/src/uu/sum/Cargo.toml
+++ b/src/uu/sum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_sum"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "sum ~ (uutils) display checksum and block counts for input"
@@ -16,9 +16,13 @@ path = "src/sum.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "sum"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs
index 0ce612859..c58a1dcdc 100644
--- a/src/uu/sum/src/sum.rs
+++ b/src/uu/sum/src/sum.rs
@@ -14,6 +14,7 @@ use clap::{crate_version, App, Arg};
 use std::fs::File;
 use std::io::{stdin, Read, Result};
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static NAME: &str = "sum";
@@ -75,6 +76,8 @@ fn open(name: &str) -> Result<Box<dyn Read>> {
                     "Is a directory",
                 ));
             };
+            // Silent the warning as we want to the error message
+            #[allow(clippy::question_mark)]
             if path.metadata().is_err() {
                 return Err(std::io::Error::new(
                     std::io::ErrorKind::NotFound,
@@ -118,7 +121,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         let reader = match open(file) {
             Ok(f) => f,
             Err(error) => {
-                show_error!("'{}' {}", file, error);
+                show_error!("{}: {}", file.maybe_quote(), error);
                 exit_code = 2;
                 continue;
             }
@@ -140,7 +143,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(USAGE)
diff --git a/src/uu/sync/Cargo.toml b/src/uu/sync/Cargo.toml
index a745ac6f8..4bf2c60b3 100644
--- a/src/uu/sync/Cargo.toml
+++ b/src/uu/sync/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_sync"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "sync ~ (uutils) synchronize cache writes to storage"
@@ -17,8 +17,8 @@ path = "src/sync.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["wide"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["wide"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "std", "winbase", "winerror"] }
 
 [[bin]]
diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs
index 4fcdf49f9..d6a21f280 100644
--- a/src/uu/sync/src/sync.rs
+++ b/src/uu/sync/src/sync.rs
@@ -14,6 +14,7 @@ extern crate uucore;
 
 use clap::{crate_version, App, Arg};
 use std::path::Path;
+use uucore::display::Quotable;
 
 static EXIT_ERR: i32 = 1;
 
@@ -159,12 +160,12 @@ mod platform {
     }
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... FILE...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... FILE...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -175,7 +176,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     for f in &files {
         if !Path::new(&f).exists() {
-            crash!(EXIT_ERR, "cannot stat '{}': No such file or directory", f);
+            crash!(
+                EXIT_ERR,
+                "cannot stat {}: No such file or directory",
+                f.quote()
+            );
         }
     }
 
@@ -193,7 +198,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/tac/BENCHMARKING.md b/src/uu/tac/BENCHMARKING.md
new file mode 100644
index 000000000..4e6d13ea2
--- /dev/null
+++ b/src/uu/tac/BENCHMARKING.md
@@ -0,0 +1,25 @@
+## Benchmarking `tac`
+
+<!-- spell-checker:ignore wikidatawiki -->
+
+`tac` is often used to process log files in reverse chronological order, i.e. from newer towards older entries. In this case, the performance target to yield results as fast as possible, i.e. without reading in the whole file that is to be reversed line-by-line. Therefore, a sensible benchmark is to read a large log file containing N lines and measure how long it takes to produce the last K lines from that file.
+
+Large text files can for example be found in the [Wikipedia database dumps](https://dumps.wikimedia.org/wikidatawiki/latest/), usually sized at multiple gigabytes and comprising more than 100M lines.
+
+After you have obtained and uncompressed such a file, you need to build `tac` in release mode
+
+```shell
+$ cargo build --release --package uu_tac
+```
+
+and then you can time how it long it takes to extract the last 10M lines by running
+
+```shell
+$ /usr/bin/time ./target/release/tac wikidatawiki-20211001-pages-logging.xml | head -n10000000 >/dev/null
+```
+
+For more systematic measurements that include warm-ups, repetitions and comparisons, [Hyperfine](https://github.com/sharkdp/hyperfine) can be helpful. For example, to compare this implementation to the one provided by your distribution run
+
+```shell
+$ hyperfine "./target/release/tac wikidatawiki-20211001-pages-logging.xml | head -n10000000 >/dev/null" "/usr/bin/tac wikidatawiki-20211001-pages-logging.xml | head -n10000000 >/dev/null"
+```
diff --git a/src/uu/tac/Cargo.toml b/src/uu/tac/Cargo.toml
index 60e5d29ec..6840d6bc3 100644
--- a/src/uu/tac/Cargo.toml
+++ b/src/uu/tac/Cargo.toml
@@ -1,6 +1,8 @@
+# spell-checker:ignore memmap
+
 [package]
 name = "uu_tac"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tac ~ (uutils) concatenate and display input lines in reverse order"
@@ -15,10 +17,17 @@ edition = "2018"
 path = "src/tac.rs"
 
 [dependencies]
+memchr = "2"
+memmap2 = "0.5"
+regex = "1"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "tac"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs
index ae1fd9bc5..cdb2d74e3 100644
--- a/src/uu/tac/src/tac.rs
+++ b/src/uu/tac/src/tac.rs
@@ -5,14 +5,20 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) sbytes slen
+// spell-checker:ignore (ToDO) sbytes slen dlen memmem memmap Mmap mmap SIGBUS
 
 #[macro_use]
 extern crate uucore;
 
 use clap::{crate_version, App, Arg};
-use std::io::{stdin, stdout, BufReader, Read, Stdout, Write};
-use std::{fs::File, path::Path};
+use memchr::memmem;
+use memmap2::Mmap;
+use std::io::{stdin, stdout, BufWriter, Read, Write};
+use std::{
+    fs::{read, File},
+    path::Path,
+};
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static NAME: &str = "tac";
@@ -35,27 +41,23 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let before = matches.is_present(options::BEFORE);
     let regex = matches.is_present(options::REGEX);
-    let separator = match matches.value_of(options::SEPARATOR) {
-        Some(m) => {
-            if m.is_empty() {
-                crash!(1, "separator cannot be empty")
-            } else {
-                m.to_owned()
-            }
-        }
-        None => "\n".to_owned(),
+    let raw_separator = matches.value_of(options::SEPARATOR).unwrap_or("\n");
+    let separator = if raw_separator.is_empty() {
+        "\0"
+    } else {
+        raw_separator
     };
 
-    let files: Vec<String> = match matches.values_of(options::FILE) {
-        Some(v) => v.map(|v| v.to_owned()).collect(),
-        None => vec!["-".to_owned()],
+    let files: Vec<&str> = match matches.values_of(options::FILE) {
+        Some(v) => v.collect(),
+        None => vec!["-"],
     };
 
-    tac(files, before, regex, &separator[..])
+    tac(files, before, regex, separator)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(USAGE)
@@ -71,7 +73,7 @@ pub fn uu_app() -> App<'static, 'static> {
             Arg::with_name(options::REGEX)
                 .short("r")
                 .long(options::REGEX)
-                .help("interpret the sequence as a regular expression (NOT IMPLEMENTED)")
+                .help("interpret the sequence as a regular expression")
                 .takes_value(false),
         )
         .arg(
@@ -84,96 +86,216 @@ pub fn uu_app() -> App<'static, 'static> {
         .arg(Arg::with_name(options::FILE).hidden(true).multiple(true))
 }
 
-fn tac(filenames: Vec<String>, before: bool, _: bool, separator: &str) -> i32 {
-    let mut exit_code = 0;
-    let mut out = stdout();
-    let sbytes = separator.as_bytes();
-    let slen = sbytes.len();
+/// Print lines of a buffer in reverse, with line separator given as a regex.
+///
+/// `data` contains the bytes of the file.
+///
+/// `pattern` is the regular expression given as a
+/// [`regex::bytes::Regex`] (not a [`regex::Regex`], since the input is
+/// given as a slice of bytes). If `before` is `true`, then each match
+/// of this pattern in `data` is interpreted as the start of a line. If
+/// `before` is `false`, then each match of this pattern is interpreted
+/// as the end of a line.
+///
+/// This function writes each line in `data` to [`std::io::Stdout`] in
+/// reverse.
+///
+/// # Errors
+///
+/// If there is a problem writing to `stdout`, then this function
+/// returns [`std::io::Error`].
+fn buffer_tac_regex(
+    data: &[u8],
+    pattern: &regex::bytes::Regex,
+    before: bool,
+) -> std::io::Result<()> {
+    let out = stdout();
+    let mut out = BufWriter::new(out.lock());
 
-    for filename in &filenames {
-        let mut file = BufReader::new(if filename == "-" {
-            Box::new(stdin()) as Box<dyn Read>
+    // The index of the line separator for the current line.
+    //
+    // As we scan through the `data` from right to left, we update this
+    // variable each time we find a new line separator. We restrict our
+    // regular expression search to only those bytes up to the line
+    // separator.
+    let mut this_line_end = data.len();
+
+    // The index of the start of the next line in the `data`.
+    //
+    // As we scan through the `data` from right to left, we update this
+    // variable each time we find a new line.
+    //
+    // If `before` is `true`, then each line starts immediately before
+    // the line separator. Otherwise, each line starts immediately after
+    // the line separator.
+    let mut following_line_start = data.len();
+
+    // Iterate over each byte in the buffer in reverse. When we find a
+    // line separator, write the line to stdout.
+    //
+    // The `before` flag controls whether the line separator appears at
+    // the end of the line (as in "abc\ndef\n") or at the beginning of
+    // the line (as in "/abc/def").
+    for i in (0..data.len()).rev() {
+        // Determine if there is a match for `pattern` starting at index
+        // `i` in `data`. Only search up to the line ending that was
+        // found previously.
+        if let Some(match_) = pattern.find_at(&data[..this_line_end], i) {
+            // Record this index as the ending of the current line.
+            this_line_end = i;
+
+            // The length of the match (that is, the line separator), in bytes.
+            let slen = match_.end() - match_.start();
+
+            if before {
+                out.write_all(&data[i..following_line_start])?;
+                following_line_start = i;
+            } else {
+                out.write_all(&data[i + slen..following_line_start])?;
+                following_line_start = i + slen;
+            }
+        }
+    }
+
+    // After the loop terminates, write whatever bytes are remaining at
+    // the beginning of the buffer.
+    out.write_all(&data[0..following_line_start])?;
+    Ok(())
+}
+
+/// Write lines from `data` to stdout in reverse.
+///
+/// This function writes to [`stdout`] each line appearing in `data`,
+/// starting with the last line and ending with the first line. The
+/// `separator` parameter defines what characters to use as a line
+/// separator.
+///
+/// If `before` is `false`, then this function assumes that the
+/// `separator` appears at the end of each line, as in `"abc\ndef\n"`.
+/// If `before` is `true`, then this function assumes that the
+/// `separator` appears at the beginning of each line, as in
+/// `"/abc/def"`.
+fn buffer_tac(data: &[u8], before: bool, separator: &str) -> std::io::Result<()> {
+    let out = stdout();
+    let mut out = BufWriter::new(out.lock());
+
+    // The number of bytes in the line separator.
+    let slen = separator.as_bytes().len();
+
+    // The index of the start of the next line in the `data`.
+    //
+    // As we scan through the `data` from right to left, we update this
+    // variable each time we find a new line.
+    //
+    // If `before` is `true`, then each line starts immediately before
+    // the line separator. Otherwise, each line starts immediately after
+    // the line separator.
+    let mut following_line_start = data.len();
+
+    // Iterate over each byte in the buffer in reverse. When we find a
+    // line separator, write the line to stdout.
+    //
+    // The `before` flag controls whether the line separator appears at
+    // the end of the line (as in "abc\ndef\n") or at the beginning of
+    // the line (as in "/abc/def").
+    for i in memmem::rfind_iter(data, separator) {
+        if before {
+            out.write_all(&data[i..following_line_start])?;
+            following_line_start = i;
+        } else {
+            out.write_all(&data[i + slen..following_line_start])?;
+            following_line_start = i + slen;
+        }
+    }
+
+    // After the loop terminates, write whatever bytes are remaining at
+    // the beginning of the buffer.
+    out.write_all(&data[0..following_line_start])?;
+    Ok(())
+}
+
+fn tac(filenames: Vec<&str>, before: bool, regex: bool, separator: &str) -> i32 {
+    let mut exit_code = 0;
+
+    let pattern = if regex {
+        Some(crash_if_err!(1, regex::bytes::Regex::new(separator)))
+    } else {
+        None
+    };
+
+    for &filename in &filenames {
+        let mmap;
+        let buf;
+
+        let data: &[u8] = if filename == "-" {
+            if let Some(mmap1) = try_mmap_stdin() {
+                mmap = mmap1;
+                &mmap
+            } else {
+                let mut buf1 = Vec::new();
+                if let Err(e) = stdin().read_to_end(&mut buf1) {
+                    show_error!("failed to read from stdin: {}", e);
+                    exit_code = 1;
+                    continue;
+                }
+                buf = buf1;
+                &buf
+            }
         } else {
             let path = Path::new(filename);
             if path.is_dir() || path.metadata().is_err() {
                 if path.is_dir() {
-                    show_error!("dir: read error: Invalid argument");
+                    show_error!("{}: read error: Invalid argument", filename.maybe_quote());
                 } else {
                     show_error!(
-                        "failed to open '{}' for reading: No such file or directory",
-                        filename
+                        "failed to open {} for reading: No such file or directory",
+                        filename.quote()
                     );
                 }
                 exit_code = 1;
                 continue;
             }
-            match File::open(path) {
-                Ok(f) => Box::new(f) as Box<dyn Read>,
-                Err(e) => {
-                    show_error!("failed to open '{}' for reading: {}", filename, e);
-                    exit_code = 1;
-                    continue;
+
+            if let Some(mmap1) = try_mmap_path(path) {
+                mmap = mmap1;
+                &mmap
+            } else {
+                match read(path) {
+                    Ok(buf1) => {
+                        buf = buf1;
+                        &buf
+                    }
+                    Err(e) => {
+                        show_error!("failed to read {}: {}", filename.quote(), e);
+                        exit_code = 1;
+                        continue;
+                    }
                 }
             }
-        });
-
-        let mut data = Vec::new();
-        if let Err(e) = file.read_to_end(&mut data) {
-            show_error!("failed to read '{}': {}", filename, e);
-            exit_code = 1;
-            continue;
         };
 
-        // find offsets in string of all separators
-        let mut offsets = Vec::new();
-        let mut i = 0;
-        loop {
-            if i + slen > data.len() {
-                break;
-            }
-
-            if &data[i..i + slen] == sbytes {
-                offsets.push(i);
-                i += slen;
-            } else {
-                i += 1;
-            }
+        if let Some(pattern) = &pattern {
+            buffer_tac_regex(data, pattern, before)
+        } else {
+            buffer_tac(data, before, separator)
         }
-
-        // if there isn't a separator at the end of the file, fake it
-        if offsets.is_empty() || *offsets.last().unwrap() < data.len() - slen {
-            offsets.push(data.len());
-        }
-
-        let mut prev = *offsets.last().unwrap();
-        let mut start = true;
-        for off in offsets.iter().rev().skip(1) {
-            // correctly handle case of no final separator in file
-            if start && prev == data.len() {
-                show_line(&mut out, &[], &data[*off + slen..prev], before);
-                start = false;
-            } else {
-                show_line(&mut out, sbytes, &data[*off + slen..prev], before);
-            }
-            prev = *off;
-        }
-        show_line(&mut out, sbytes, &data[0..prev], before);
+        .unwrap_or_else(|e| crash!(1, "failed to write to stdout: {}", e));
     }
-
     exit_code
 }
 
-fn show_line(out: &mut Stdout, sep: &[u8], dat: &[u8], before: bool) {
-    if before {
-        out.write_all(sep)
-            .unwrap_or_else(|e| crash!(1, "failed to write to stdout: {}", e));
-    }
-
-    out.write_all(dat)
-        .unwrap_or_else(|e| crash!(1, "failed to write to stdout: {}", e));
-
-    if !before {
-        out.write_all(sep)
-            .unwrap_or_else(|e| crash!(1, "failed to write to stdout: {}", e));
-    }
+fn try_mmap_stdin() -> Option<Mmap> {
+    // SAFETY: If the file is truncated while we map it, SIGBUS will be raised
+    // and our process will be terminated, thus preventing access of invalid memory.
+    unsafe { Mmap::map(&stdin()).ok() }
+}
+
+fn try_mmap_path(path: &Path) -> Option<Mmap> {
+    let file = File::open(path).ok()?;
+
+    // SAFETY: If the file is truncated while we map it, SIGBUS will be raised
+    // and our process will be terminated, thus preventing access of invalid memory.
+    let mmap = unsafe { Mmap::map(&file).ok()? };
+
+    Some(mmap)
 }
diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml
index bab6c125d..f288846ea 100644
--- a/src/uu/tail/Cargo.toml
+++ b/src/uu/tail/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_tail"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tail ~ (uutils) display the last lines of input"
@@ -17,13 +17,23 @@ path = "src/tail.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["ringbuffer"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["ringbuffer"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+
+[target.'cfg(windows)'.dependencies]
 winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi", "synchapi", "winbase"] }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.1"
+redox_syscall = "0.2"
+
+[target.'cfg(unix)'.dependencies]
+nix = "0.20"
+libc = "0.2"
 
 [[bin]]
 name = "tail"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/tail/README.md b/src/uu/tail/README.md
index b7f92f8e4..94b6816af 100644
--- a/src/uu/tail/README.md
+++ b/src/uu/tail/README.md
@@ -11,7 +11,7 @@
 
 ### Others
 
-- [ ] The current implementation does not handle `-` as an alias for stdin.
+- [ ] The current implementation doesn't follow stdin in non-unix platforms
 
 ## Possible optimizations
 
diff --git a/src/uu/tail/src/platform/mod.rs b/src/uu/tail/src/platform/mod.rs
index 010c5c4ac..7b7fd6fa3 100644
--- a/src/uu/tail/src/platform/mod.rs
+++ b/src/uu/tail/src/platform/mod.rs
@@ -2,25 +2,20 @@
  * This file is part of the uutils coreutils package.
  *
  * (c) Alexander Batischev <eual.jp@gmail.com>
+ * (c) Thomas Queiroz <thomasqueirozb@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 #[cfg(unix)]
-pub use self::unix::{supports_pid_checks, Pid, ProcessChecker};
+pub use self::unix::{stdin_is_pipe_or_fifo, supports_pid_checks, Pid, ProcessChecker};
 
 #[cfg(windows)]
 pub use self::windows::{supports_pid_checks, Pid, ProcessChecker};
 
-#[cfg(target_os = "redox")]
-pub use self::redox::{supports_pid_checks, Pid, ProcessChecker};
-
 #[cfg(unix)]
 mod unix;
 
 #[cfg(windows)]
 mod windows;
-
-#[cfg(target_os = "redox")]
-mod redox;
diff --git a/src/uu/tail/src/platform/redox.rs b/src/uu/tail/src/platform/redox.rs
deleted file mode 100644
index bc6fb5220..000000000
--- a/src/uu/tail/src/platform/redox.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// spell-checker:ignore (ToDO) ENOSYS EPERM
-
-use self::syscall::{Error, ENOSYS, EPERM};
-
-pub type Pid = usize;
-
-pub struct ProcessChecker {
-    pid: self::Pid,
-}
-
-impl ProcessChecker {
-    pub fn new(process_id: self::Pid) -> ProcessChecker {
-        ProcessChecker { pid: process_id }
-    }
-
-    // Borrowing mutably to be aligned with Windows implementation
-    pub fn is_dead(&mut self) -> bool {
-        let res = syscall::kill(self.pid, 0);
-        res != Ok(0) && res != Err(Error::new(EPERM))
-    }
-}
-
-pub fn supports_pid_checks(pid: self::Pid) -> bool {
-    true
-}
diff --git a/src/uu/tail/src/platform/unix.rs b/src/uu/tail/src/platform/unix.rs
index 167f693e6..580a40135 100644
--- a/src/uu/tail/src/platform/unix.rs
+++ b/src/uu/tail/src/platform/unix.rs
@@ -2,6 +2,7 @@
  * This file is part of the uutils coreutils package.
  *
  * (c) Alexander Batischev <eual.jp@gmail.com>
+ * (c) Thomas Queiroz <thomasqueirozb@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -9,7 +10,13 @@
 
 // spell-checker:ignore (ToDO) errno EPERM ENOSYS
 
-use std::io::Error;
+use std::io::{stdin, Error};
+
+use std::os::unix::prelude::AsRawFd;
+
+use nix::sys::stat::fstat;
+
+use libc::{S_IFIFO, S_IFSOCK};
 
 pub type Pid = libc::pid_t;
 
@@ -40,3 +47,16 @@ pub fn supports_pid_checks(pid: self::Pid) -> bool {
 fn get_errno() -> i32 {
     Error::last_os_error().raw_os_error().unwrap()
 }
+
+pub fn stdin_is_pipe_or_fifo() -> bool {
+    let fd = stdin().lock().as_raw_fd();
+    fd >= 0 // GNU tail checks fd >= 0
+                            && match fstat(fd) {
+                                Ok(stat) => {
+                                    let mode = stat.st_mode;
+                                    // NOTE: This is probably not the most correct way to check this
+                                    (mode & S_IFIFO != 0) || (mode & S_IFSOCK != 0)
+                                }
+                                Err(err) => panic!("{}", err),
+                            }
+}
diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs
index 4970cdcc2..eaf7bf8bf 100644
--- a/src/uu/tail/src/tail.rs
+++ b/src/uu/tail/src/tail.rs
@@ -2,6 +2,7 @@
 //  *
 //  * (c) Morten Olsen Lysgaard <morten@lysgaard.no>
 //  * (c) Alexander Batischev <eual.jp@gmail.com>
+//  * (c) Thomas Queiroz <thomasqueirozb@gmail.com>
 //  *
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
@@ -21,7 +22,7 @@ use chunks::ReverseChunks;
 use clap::{App, Arg};
 use std::collections::VecDeque;
 use std::fmt;
-use std::fs::File;
+use std::fs::{File, Metadata};
 use std::io::{stdin, stdout, BufRead, BufReader, Read, Seek, SeekFrom, Write};
 use std::path::Path;
 use std::thread::sleep;
@@ -29,6 +30,20 @@ use std::time::Duration;
 use uucore::parse_size::{parse_size, ParseSizeError};
 use uucore::ringbuffer::RingBuffer;
 
+#[cfg(unix)]
+use crate::platform::stdin_is_pipe_or_fifo;
+#[cfg(unix)]
+use std::os::unix::fs::MetadataExt;
+
+const ABOUT: &str = "\
+                     Print the last 10 lines of each FILE to standard output.\n\
+                     With more than one FILE, precede each with a header giving the file name.\n\
+                     With no FILE, or when FILE is -, read standard input.\n\
+                     \n\
+                     Mandatory arguments to long flags are mandatory for short flags too.\
+                     ";
+const USAGE: &str = "tail [FLAG]... [FILE]...";
+
 pub mod options {
     pub mod verbosity {
         pub static QUIET: &str = "quiet";
@@ -130,58 +145,90 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let files: Vec<String> = matches
         .values_of(options::ARG_FILES)
         .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_default();
+        .unwrap_or_else(|| vec![String::from("-")]);
 
-    if files.is_empty() {
-        let mut buffer = BufReader::new(stdin());
-        unbounded_tail(&mut buffer, &settings);
-    } else {
-        let multiple = files.len() > 1;
-        let mut first_header = true;
-        let mut readers = Vec::new();
+    let multiple = files.len() > 1;
+    let mut first_header = true;
+    let mut readers: Vec<(Box<dyn BufRead>, &String)> = Vec::new();
 
-        for filename in &files {
-            if (multiple || verbose) && !quiet {
-                if !first_header {
-                    println!();
-                }
+    #[cfg(unix)]
+    let stdin_string = String::from("standard input");
+
+    for filename in &files {
+        let use_stdin = filename.as_str() == "-";
+        if (multiple || verbose) && !quiet {
+            if !first_header {
+                println!();
+            }
+            if use_stdin {
+                println!("==> standard input <==");
+            } else {
                 println!("==> {} <==", filename);
             }
-            first_header = false;
+        }
+        first_header = false;
 
+        if use_stdin {
+            let mut reader = BufReader::new(stdin());
+            unbounded_tail(&mut reader, &settings);
+
+            // Don't follow stdin since there are no checks for pipes/FIFOs
+            //
+            // FIXME windows has GetFileType which can determine if the file is a pipe/FIFO
+            // so this check can also be performed
+
+            #[cfg(unix)]
+            {
+                /*
+                POSIX specification regarding tail -f
+
+                If the input file is a regular file or if the file operand specifies a FIFO, do not
+                terminate after the last line of the input file has been copied, but read and copy
+                further bytes from the input file when they become available. If no file operand is
+                specified and standard input is a pipe or FIFO, the -f option shall be ignored. If
+                the input file is not a FIFO, pipe, or regular file, it is unspecified whether or
+                not the -f option shall be ignored.
+                */
+
+                if settings.follow && !stdin_is_pipe_or_fifo() {
+                    readers.push((Box::new(reader), &stdin_string));
+                }
+            }
+        } else {
             let path = Path::new(filename);
             if path.is_dir() {
                 continue;
             }
             let mut file = File::open(&path).unwrap();
-            if is_seekable(&mut file) {
+            let md = file.metadata().unwrap();
+            if is_seekable(&mut file) && get_block_size(&md) > 0 {
                 bounded_tail(&mut file, &settings);
                 if settings.follow {
                     let reader = BufReader::new(file);
-                    readers.push(reader);
+                    readers.push((Box::new(reader), filename));
                 }
             } else {
                 let mut reader = BufReader::new(file);
                 unbounded_tail(&mut reader, &settings);
                 if settings.follow {
-                    readers.push(reader);
+                    readers.push((Box::new(reader), filename));
                 }
             }
         }
+    }
 
-        if settings.follow {
-            follow(&mut readers[..], &files[..], &settings);
-        }
+    if settings.follow {
+        follow(&mut readers[..], &settings);
     }
 
     0
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
-        .about("output the last part of files")
-        // TODO: add usage
+        .about(ABOUT)
+        .usage(USAGE)
         .arg(
             Arg::with_name(options::BYTES)
                 .short("c")
@@ -248,8 +295,12 @@ pub fn uu_app() -> App<'static, 'static> {
         )
 }
 
-fn follow<T: Read>(readers: &mut [BufReader<T>], filenames: &[String], settings: &Settings) {
+fn follow<T: BufRead>(readers: &mut [(T, &String)], settings: &Settings) {
     assert!(settings.follow);
+    if readers.is_empty() {
+        return;
+    }
+
     let mut last = readers.len() - 1;
     let mut read_some = false;
     let mut process = platform::ProcessChecker::new(settings.pid);
@@ -260,7 +311,7 @@ fn follow<T: Read>(readers: &mut [BufReader<T>], filenames: &[String], settings:
         let pid_is_dead = !read_some && settings.pid != 0 && process.is_dead();
         read_some = false;
 
-        for (i, reader) in readers.iter_mut().enumerate() {
+        for (i, (reader, filename)) in readers.iter_mut().enumerate() {
             // Print all new content since the last pass
             loop {
                 let mut datum = String::new();
@@ -269,7 +320,7 @@ fn follow<T: Read>(readers: &mut [BufReader<T>], filenames: &[String], settings:
                     Ok(_) => {
                         read_some = true;
                         if i != last {
-                            println!("\n==> {} <==", filenames[i]);
+                            println!("\n==> {} <==", filename);
                             last = i;
                         }
                         print!("{}", datum);
@@ -398,6 +449,8 @@ fn unbounded_tail<T: Read>(reader: &mut BufReader<T>, settings: &Settings) {
 
 fn is_seekable<T: Seek>(file: &mut T) -> bool {
     file.seek(SeekFrom::Current(0)).is_ok()
+        && file.seek(SeekFrom::End(0)).is_ok()
+        && file.seek(SeekFrom::Start(0)).is_ok()
 }
 
 #[inline]
@@ -425,3 +478,14 @@ fn parse_num(src: &str) -> Result<(usize, bool), ParseSizeError> {
 
     parse_size(size_string).map(|n| (n, starting_with))
 }
+
+fn get_block_size(md: &Metadata) -> u64 {
+    #[cfg(unix)]
+    {
+        md.blocks()
+    }
+    #[cfg(not(unix))]
+    {
+        md.len()
+    }
+}
diff --git a/src/uu/tee/Cargo.toml b/src/uu/tee/Cargo.toml
index 01c190698..00a250565 100644
--- a/src/uu/tee/Cargo.toml
+++ b/src/uu/tee/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_tee"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tee ~ (uutils) display input and copy to FILE"
@@ -18,9 +18,13 @@ path = "src/tee.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 retain_mut = "0.1.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["libc"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "tee"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs
index a207dee63..d2fb015bf 100644
--- a/src/uu/tee/src/tee.rs
+++ b/src/uu/tee/src/tee.rs
@@ -12,7 +12,8 @@ use clap::{crate_version, App, Arg};
 use retain_mut::RetainMut;
 use std::fs::OpenOptions;
 use std::io::{copy, sink, stdin, stdout, Error, ErrorKind, Read, Result, Write};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
+use uucore::display::Quotable;
 
 #[cfg(unix)]
 use uucore::libc;
@@ -32,12 +33,12 @@ struct Options {
     files: Vec<String>,
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -57,7 +58,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .after_help("If a FILE is -, it refers to a file named - .")
@@ -167,7 +168,7 @@ impl Write for MultiWriter {
             let result = writer.write_all(buf);
             match result {
                 Err(f) => {
-                    show_error!("{}: {}", writer.name, f.to_string());
+                    show_error!("{}: {}", writer.name.maybe_quote(), f);
                     false
                 }
                 _ => true,
@@ -181,7 +182,7 @@ impl Write for MultiWriter {
             let result = writer.flush();
             match result {
                 Err(f) => {
-                    show_error!("{}: {}", writer.name, f.to_string());
+                    show_error!("{}: {}", writer.name.maybe_quote(), f);
                     false
                 }
                 _ => true,
@@ -214,7 +215,7 @@ impl Read for NamedReader {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
         match self.inner.read(buf) {
             Err(f) => {
-                show_error!("{}: {}", Path::new("stdin").display(), f.to_string());
+                show_error!("stdin: {}", f);
                 Err(f)
             }
             okay => okay,
diff --git a/src/uu/test/Cargo.toml b/src/uu/test/Cargo.toml
index f69918446..633e0f323 100644
--- a/src/uu/test/Cargo.toml
+++ b/src/uu/test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_test"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "test ~ (uutils) evaluate comparison and file type expressions"
@@ -17,12 +17,16 @@ path = "src/test.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.1"
+redox_syscall = "0.2"
 
 [[bin]]
 name = "test"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/test/src/parser.rs b/src/uu/test/src/parser.rs
index 5eec781ba..ce4c0dec0 100644
--- a/src/uu/test/src/parser.rs
+++ b/src/uu/test/src/parser.rs
@@ -10,6 +10,24 @@
 use std::ffi::OsString;
 use std::iter::Peekable;
 
+use uucore::display::Quotable;
+use uucore::show_error;
+
+/// Represents one of the binary comparison operators for strings, integers, or files
+#[derive(Debug, PartialEq)]
+pub enum Operator {
+    String(OsString),
+    Int(OsString),
+    File(OsString),
+}
+
+/// Represents one of the unary test operators for strings or files
+#[derive(Debug, PartialEq)]
+pub enum UnaryOperator {
+    StrlenOp(OsString),
+    FiletestOp(OsString),
+}
+
 /// Represents a parsed token from a test expression
 #[derive(Debug, PartialEq)]
 pub enum Symbol {
@@ -17,11 +35,8 @@ pub enum Symbol {
     Bang,
     BoolOp(OsString),
     Literal(OsString),
-    StringOp(OsString),
-    IntOp(OsString),
-    FileOp(OsString),
-    StrlenOp(OsString),
-    FiletestOp(OsString),
+    Op(Operator),
+    UnaryOp(UnaryOperator),
     None,
 }
 
@@ -31,17 +46,22 @@ impl Symbol {
     /// Returns Symbol::None in place of None
     fn new(token: Option<OsString>) -> Symbol {
         match token {
-            Some(s) => match s.to_string_lossy().as_ref() {
-                "(" => Symbol::LParen,
-                "!" => Symbol::Bang,
-                "-a" | "-o" => Symbol::BoolOp(s),
-                "=" | "==" | "!=" => Symbol::StringOp(s),
-                "-eq" | "-ge" | "-gt" | "-le" | "-lt" | "-ne" => Symbol::IntOp(s),
-                "-ef" | "-nt" | "-ot" => Symbol::FileOp(s),
-                "-n" | "-z" => Symbol::StrlenOp(s),
-                "-b" | "-c" | "-d" | "-e" | "-f" | "-g" | "-G" | "-h" | "-k" | "-L" | "-O"
-                | "-p" | "-r" | "-s" | "-S" | "-t" | "-u" | "-w" | "-x" => Symbol::FiletestOp(s),
-                _ => Symbol::Literal(s),
+            Some(s) => match s.to_str() {
+                Some(t) => match t {
+                    "(" => Symbol::LParen,
+                    "!" => Symbol::Bang,
+                    "-a" | "-o" => Symbol::BoolOp(s),
+                    "=" | "==" | "!=" => Symbol::Op(Operator::String(s)),
+                    "-eq" | "-ge" | "-gt" | "-le" | "-lt" | "-ne" => Symbol::Op(Operator::Int(s)),
+                    "-ef" | "-nt" | "-ot" => Symbol::Op(Operator::File(s)),
+                    "-n" | "-z" => Symbol::UnaryOp(UnaryOperator::StrlenOp(s)),
+                    "-b" | "-c" | "-d" | "-e" | "-f" | "-g" | "-G" | "-h" | "-k" | "-L" | "-O"
+                    | "-p" | "-r" | "-s" | "-S" | "-t" | "-u" | "-w" | "-x" => {
+                        Symbol::UnaryOp(UnaryOperator::FiletestOp(s))
+                    }
+                    _ => Symbol::Literal(s),
+                },
+                None => Symbol::Literal(s),
             },
             None => Symbol::None,
         }
@@ -60,11 +80,11 @@ impl Symbol {
             Symbol::Bang => OsString::from("!"),
             Symbol::BoolOp(s)
             | Symbol::Literal(s)
-            | Symbol::StringOp(s)
-            | Symbol::IntOp(s)
-            | Symbol::FileOp(s)
-            | Symbol::StrlenOp(s)
-            | Symbol::FiletestOp(s) => s,
+            | Symbol::Op(Operator::String(s))
+            | Symbol::Op(Operator::Int(s))
+            | Symbol::Op(Operator::File(s))
+            | Symbol::UnaryOp(UnaryOperator::StrlenOp(s))
+            | Symbol::UnaryOp(UnaryOperator::FiletestOp(s)) => s,
             Symbol::None => panic!(),
         })
     }
@@ -78,7 +98,6 @@ impl Symbol {
 ///
 ///   EXPR → TERM | EXPR BOOLOP EXPR
 ///   TERM → ( EXPR )
-///   TERM → ( )
 ///   TERM → ! EXPR
 ///   TERM → UOP str
 ///   UOP → STRLEN | FILETEST
@@ -113,6 +132,20 @@ impl Parser {
         Symbol::new(self.tokens.next())
     }
 
+    /// Consume the next token & verify that it matches the provided value.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the next token does not match the provided value.
+    ///
+    /// TODO: remove panics and convert Parser to return error messages.
+    fn expect(&mut self, value: &str) {
+        match self.next_token() {
+            Symbol::Literal(s) if s == value => (),
+            _ => panic!("expected ‘{}’", value),
+        }
+    }
+
     /// Peek at the next token from the input stream, returning it as a Symbol.
     /// The stream is unchanged and will return the same Symbol on subsequent
     /// calls to `next()` or `peek()`.
@@ -144,8 +177,7 @@ impl Parser {
         match symbol {
             Symbol::LParen => self.lparen(),
             Symbol::Bang => self.bang(),
-            Symbol::StrlenOp(_) => self.uop(symbol),
-            Symbol::FiletestOp(_) => self.uop(symbol),
+            Symbol::UnaryOp(_) => self.uop(symbol),
             Symbol::None => self.stack.push(symbol),
             literal => self.literal(literal),
         }
@@ -154,21 +186,75 @@ impl Parser {
     /// Parse a (possibly) parenthesized expression.
     ///
     /// test has no reserved keywords, so "(" will be interpreted as a literal
-    /// if it is followed by nothing or a comparison operator OP.
+    /// in certain cases:
+    ///
+    /// * when found at the end of the token stream
+    /// * when followed by a binary operator that is not _itself_ interpreted
+    ///   as a literal
+    ///
     fn lparen(&mut self) {
-        match self.peek() {
-            // lparen is a literal when followed by nothing or comparison
-            Symbol::None | Symbol::StringOp(_) | Symbol::IntOp(_) | Symbol::FileOp(_) => {
+        // Look ahead up to 3 tokens to determine if the lparen is being used
+        // as a grouping operator or should be treated as a literal string
+        let peek3: Vec<Symbol> = self
+            .tokens
+            .clone()
+            .take(3)
+            .map(|token| Symbol::new(Some(token)))
+            .collect();
+
+        match peek3.as_slice() {
+            // case 1: lparen is a literal when followed by nothing
+            [] => self.literal(Symbol::LParen.into_literal()),
+
+            // case 2: error if end of stream is `( <any_token>`
+            [symbol] => {
+                show_error!("missing argument after ‘{:?}’", symbol);
+                std::process::exit(2);
+            }
+
+            // case 3: `( uop <any_token> )` → parenthesized unary operation;
+            //         this case ensures we don’t get confused by `( -f ) )`
+            //         or `( -f ( )`, for example
+            [Symbol::UnaryOp(_), _, Symbol::Literal(s)] if s == ")" => {
+                let symbol = self.next_token();
+                self.uop(symbol);
+                self.expect(")");
+            }
+
+            // case 4: binary comparison of literal lparen, e.g. `( != )`
+            [Symbol::Op(_), Symbol::Literal(s)] | [Symbol::Op(_), Symbol::Literal(s), _]
+                if s == ")" =>
+            {
                 self.literal(Symbol::LParen.into_literal());
             }
-            // empty parenthetical
-            Symbol::Literal(s) if s == ")" => {}
+
+            // case 5: after handling the prior cases, any single token inside
+            //         parentheses is a literal, e.g. `( -f )`
+            [_, Symbol::Literal(s)] | [_, Symbol::Literal(s), _] if s == ")" => {
+                let symbol = self.next_token();
+                self.literal(symbol);
+                self.expect(")");
+            }
+
+            // case 6: two binary ops in a row, treat the first op as a literal
+            [Symbol::Op(_), Symbol::Op(_), _] => {
+                let symbol = self.next_token();
+                self.literal(symbol);
+                self.expect(")");
+            }
+
+            // case 7: if earlier cases didn’t match, `( op <any_token>…`
+            //         indicates binary comparison of literal lparen with
+            //         anything _except_ ")" (case 4)
+            [Symbol::Op(_), _] | [Symbol::Op(_), _, _] => {
+                self.literal(Symbol::LParen.into_literal());
+            }
+
+            // Otherwise, lparen indicates the start of a parenthesized
+            // expression
             _ => {
                 self.expr();
-                match self.next_token() {
-                    Symbol::Literal(s) if s == ")" => (),
-                    _ => panic!("expected ')'"),
-                }
+                self.expect(")");
             }
         }
     }
@@ -192,7 +278,7 @@ impl Parser {
     ///
     fn bang(&mut self) {
         match self.peek() {
-            Symbol::StringOp(_) | Symbol::IntOp(_) | Symbol::FileOp(_) | Symbol::BoolOp(_) => {
+            Symbol::Op(_) | Symbol::BoolOp(_) => {
                 // we need to peek ahead one more token to disambiguate the first
                 // three cases listed above
                 let peek2 = Symbol::new(self.tokens.clone().nth(1));
@@ -200,7 +286,7 @@ impl Parser {
                 match peek2 {
                     // case 1: `! <OP as literal>`
                     // case 3: `! = OP str`
-                    Symbol::StringOp(_) | Symbol::None => {
+                    Symbol::Op(_) | Symbol::None => {
                         // op is literal
                         let op = self.next_token().into_literal();
                         self.literal(op);
@@ -293,18 +379,15 @@ impl Parser {
         self.stack.push(token.into_literal());
 
         // EXPR → str OP str
-        match self.peek() {
-            Symbol::StringOp(_) | Symbol::IntOp(_) | Symbol::FileOp(_) => {
-                let op = self.next_token();
+        if let Symbol::Op(_) = self.peek() {
+            let op = self.next_token();
 
-                match self.next_token() {
-                    Symbol::None => panic!("missing argument after {:?}", op),
-                    token => self.stack.push(token.into_literal()),
-                }
-
-                self.stack.push(op);
+            match self.next_token() {
+                Symbol::None => panic!("missing argument after {:?}", op),
+                token => self.stack.push(token.into_literal()),
             }
-            _ => {}
+
+            self.stack.push(op);
         }
     }
 
@@ -314,7 +397,7 @@ impl Parser {
         self.expr();
 
         match self.tokens.next() {
-            Some(token) => Err(format!("extra argument '{}'", token.to_string_lossy())),
+            Some(token) => Err(format!("extra argument {}", token.quote())),
             None => Ok(()),
         }
     }
diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs
index bed1472e2..5ce798bfa 100644
--- a/src/uu/test/src/test.rs
+++ b/src/uu/test/src/test.rs
@@ -11,10 +11,9 @@
 mod parser;
 
 use clap::{crate_version, App, AppSettings};
-use parser::{parse, Symbol};
+use parser::{parse, Operator, Symbol, UnaryOperator};
 use std::ffi::{OsStr, OsString};
-use std::path::Path;
-use uucore::executable;
+use uucore::{display::Quotable, show_error};
 
 const USAGE: &str = "test EXPRESSION
 or:  test
@@ -87,17 +86,14 @@ the version described here.  Please refer to your shell's documentation
 for details about the options it supports.";
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .setting(AppSettings::DisableHelpFlags)
         .setting(AppSettings::DisableVersion)
 }
 
 pub fn uumain(mut args: impl uucore::Args) -> i32 {
     let program = args.next().unwrap_or_else(|| OsString::from("test"));
-    let binary_name = Path::new(&program)
-        .file_name()
-        .unwrap_or_else(|| OsStr::new("test"))
-        .to_string_lossy();
+    let binary_name = uucore::util_name();
     let mut args: Vec<_> = args.collect();
 
     if binary_name.ends_with('[') {
@@ -117,8 +113,8 @@ pub fn uumain(mut args: impl uucore::Args) -> i32 {
         }
         // If invoked via name '[', matching ']' must be in the last arg
         let last = args.pop();
-        if last != Some(OsString::from("]")) {
-            eprintln!("[: missing ']'");
+        if last.as_deref() != Some(OsStr::new("]")) {
+            show_error!("missing ']'");
             return 2;
         }
     }
@@ -134,7 +130,7 @@ pub fn uumain(mut args: impl uucore::Args) -> i32 {
             }
         }
         Err(e) => {
-            eprintln!("test: {}", e);
+            show_error!("{}", e);
             2
         }
     }
@@ -160,19 +156,19 @@ fn eval(stack: &mut Vec<Symbol>) -> Result<bool, String> {
 
             Ok(!result)
         }
-        Some(Symbol::StringOp(op)) => {
+        Some(Symbol::Op(Operator::String(op))) => {
             let b = stack.pop();
             let a = stack.pop();
             Ok(if op == "!=" { a != b } else { a == b })
         }
-        Some(Symbol::IntOp(op)) => {
+        Some(Symbol::Op(Operator::Int(op))) => {
             let b = pop_literal!();
             let a = pop_literal!();
 
             Ok(integers(&a, &b, &op)?)
         }
-        Some(Symbol::FileOp(_op)) => unimplemented!(),
-        Some(Symbol::StrlenOp(op)) => {
+        Some(Symbol::Op(Operator::File(_op))) => unimplemented!(),
+        Some(Symbol::UnaryOp(UnaryOperator::StrlenOp(op))) => {
             let s = match stack.pop() {
                 Some(Symbol::Literal(s)) => s,
                 Some(Symbol::None) => OsString::from(""),
@@ -190,12 +186,12 @@ fn eval(stack: &mut Vec<Symbol>) -> Result<bool, String> {
                 !s.is_empty()
             })
         }
-        Some(Symbol::FiletestOp(op)) => {
-            let op = op.to_string_lossy();
+        Some(Symbol::UnaryOp(UnaryOperator::FiletestOp(op))) => {
+            let op = op.to_str().unwrap();
 
             let f = pop_literal!();
 
-            Ok(match op.as_ref() {
+            Ok(match op {
                 "-b" => path(&f, PathCondition::BlockSpecial),
                 "-c" => path(&f, PathCondition::CharacterSpecial),
                 "-d" => path(&f, PathCondition::Directory),
@@ -232,31 +228,33 @@ fn eval(stack: &mut Vec<Symbol>) -> Result<bool, String> {
 }
 
 fn integers(a: &OsStr, b: &OsStr, op: &OsStr) -> Result<bool, String> {
-    let format_err = |value| format!("invalid integer '{}'", value);
+    let format_err = |value: &OsStr| format!("invalid integer {}", value.quote());
 
-    let a = a.to_string_lossy();
-    let a: i64 = a.parse().map_err(|_| format_err(a))?;
+    let a: i64 = a
+        .to_str()
+        .and_then(|s| s.parse().ok())
+        .ok_or_else(|| format_err(a))?;
 
-    let b = b.to_string_lossy();
-    let b: i64 = b.parse().map_err(|_| format_err(b))?;
+    let b: i64 = b
+        .to_str()
+        .and_then(|s| s.parse().ok())
+        .ok_or_else(|| format_err(b))?;
 
-    let operator = op.to_string_lossy();
-    Ok(match operator.as_ref() {
-        "-eq" => a == b,
-        "-ne" => a != b,
-        "-gt" => a > b,
-        "-ge" => a >= b,
-        "-lt" => a < b,
-        "-le" => a <= b,
-        _ => return Err(format!("unknown operator '{}'", operator)),
+    Ok(match op.to_str() {
+        Some("-eq") => a == b,
+        Some("-ne") => a != b,
+        Some("-gt") => a > b,
+        Some("-ge") => a >= b,
+        Some("-lt") => a < b,
+        Some("-le") => a <= b,
+        _ => return Err(format!("unknown operator {}", op.quote())),
     })
 }
 
 fn isatty(fd: &OsStr) -> Result<bool, String> {
-    let fd = fd.to_string_lossy();
-
-    fd.parse()
-        .map_err(|_| format!("invalid integer '{}'", fd))
+    fd.to_str()
+        .and_then(|s| s.parse().ok())
+        .ok_or_else(|| format!("invalid integer {}", fd.quote()))
         .map(|i| {
             #[cfg(not(target_os = "redox"))]
             unsafe {
diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml
index 3e17669e0..13afe8435 100644
--- a/src/uu/timeout/Cargo.toml
+++ b/src/uu/timeout/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_timeout"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "timeout ~ (uutils) run COMMAND with a DURATION time limit"
@@ -18,8 +18,8 @@ path = "src/timeout.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 nix = "0.20.0"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["process", "signals"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["process", "signals"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 
 [[bin]]
diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
index 464414c5e..f686dde3b 100644
--- a/src/uu/timeout/src/timeout.rs
+++ b/src/uu/timeout/src/timeout.rs
@@ -16,14 +16,18 @@ use clap::{crate_version, App, AppSettings, Arg};
 use std::io::ErrorKind;
 use std::process::{Command, Stdio};
 use std::time::Duration;
+use uucore::display::Quotable;
 use uucore::process::ChildExt;
 use uucore::signals::{signal_by_name_or_value, signal_name_by_value};
 use uucore::InvalidEncodingHandling;
 
 static ABOUT: &str = "Start COMMAND, and kill it if still running after DURATION.";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION] DURATION COMMAND...", executable!())
+fn usage() -> String {
+    format!(
+        "{0} [OPTION] DURATION COMMAND...",
+        uucore::execution_phrase()
+    )
 }
 
 const ERR_EXIT_STATUS: i32 = 125;
@@ -58,7 +62,7 @@ impl Config {
                 let signal_result = signal_by_name_or_value(signal_);
                 match signal_result {
                     None => {
-                        unreachable!("invalid signal '{}'", signal_);
+                        unreachable!("invalid signal {}", signal_.quote());
                     }
                     Some(signal_value) => signal_value,
                 }
@@ -100,7 +104,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
 
     let app = uu_app().usage(&usage[..]);
 
@@ -213,12 +217,12 @@ fn timeout(
         Ok(None) => {
             if verbose {
                 show_error!(
-                    "sending signal {} to command '{}'",
+                    "sending signal {} to command {}",
                     signal_name_by_value(signal).unwrap(),
-                    cmd[0]
+                    cmd[0].quote()
                 );
             }
-            return_if_err!(ERR_EXIT_STATUS, process.send_signal(signal));
+            crash_if_err!(ERR_EXIT_STATUS, process.send_signal(signal));
             if let Some(kill_after) = kill_after {
                 match process.wait_or_timeout(kill_after) {
                     Ok(Some(status)) => {
@@ -230,15 +234,15 @@ fn timeout(
                     }
                     Ok(None) => {
                         if verbose {
-                            show_error!("sending signal KILL to command '{}'", cmd[0]);
+                            show_error!("sending signal KILL to command {}", cmd[0].quote());
                         }
-                        return_if_err!(
+                        crash_if_err!(
                             ERR_EXIT_STATUS,
                             process.send_signal(
                                 uucore::signals::signal_by_name_or_value("KILL").unwrap()
                             )
                         );
-                        return_if_err!(ERR_EXIT_STATUS, process.wait());
+                        crash_if_err!(ERR_EXIT_STATUS, process.wait());
                         137
                     }
                     Err(_) => 124,
@@ -248,7 +252,7 @@ fn timeout(
             }
         }
         Err(_) => {
-            return_if_err!(ERR_EXIT_STATUS, process.send_signal(signal));
+            crash_if_err!(ERR_EXIT_STATUS, process.send_signal(signal));
             ERR_EXIT_STATUS
         }
     }
diff --git a/src/uu/touch/Cargo.toml b/src/uu/touch/Cargo.toml
index 5bb5822ec..b21e2dfa3 100644
--- a/src/uu/touch/Cargo.toml
+++ b/src/uu/touch/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_touch"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "touch ~ (uutils) change FILE timestamps"
@@ -18,8 +18,8 @@ path = "src/touch.rs"
 filetime = "0.2.1"
 clap = { version = "2.33", features = ["wrap_help"] }
 time = "0.1.40"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["libc"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "touch"
diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs
index dd2b05d0e..6997def09 100644
--- a/src/uu/touch/src/touch.rs
+++ b/src/uu/touch/src/touch.rs
@@ -6,7 +6,7 @@
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) filetime strptime utcoff strs datetime MMDDhhmm
+// spell-checker:ignore (ToDO) filetime strptime utcoff strs datetime MMDDhhmm clapv
 
 pub extern crate filetime;
 
@@ -17,7 +17,8 @@ use clap::{crate_version, App, Arg, ArgGroup};
 use filetime::*;
 use std::fs::{self, File};
 use std::path::Path;
-use uucore::error::{FromIo, UResult, USimpleError};
+use uucore::display::Quotable;
+use uucore::error::{FromIo, UError, UResult, USimpleError};
 
 static ABOUT: &str = "Update the access and modification times of each FILE to the current time.";
 pub mod options {
@@ -47,13 +48,13 @@ fn local_tm_to_filetime(tm: time::Tm) -> FileTime {
     FileTime::from_unix_time(ts.sec as i64, ts.nsec as u32)
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [USER]", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [USER]", uucore::execution_phrase())
 }
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
@@ -82,7 +83,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             }
 
             if let Err(e) = File::create(path) {
-                show!(e.map_err_context(|| format!("cannot touch '{}'", path.display())));
+                show!(e.map_err_context(|| format!("cannot touch {}", path.quote())));
                 continue;
             };
 
@@ -122,14 +123,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         } else {
             filetime::set_file_times(path, atime, mtime)
         }
-        .map_err_context(|| format!("setting times of '{}'", path.display()))?;
+        .map_err_context(|| format!("setting times of {}", path.quote()))?;
     }
 
     Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -175,6 +176,7 @@ pub fn uu_app() -> App<'static, 'static> {
             Arg::with_name(options::sources::REFERENCE)
                 .short("r")
                 .long(options::sources::REFERENCE)
+                .alias("ref") // clapv3
                 .help("use this file's times instead of the current time")
                 .value_name("FILE"),
         )
@@ -209,7 +211,7 @@ fn stat(path: &Path, follow: bool) -> UResult<(FileTime, FileTime)> {
     } else {
         fs::metadata(path)
     }
-    .map_err_context(|| format!("failed to get attributes of '{}'", path.display()))?;
+    .map_err_context(|| format!("failed to get attributes of {}", path.quote()))?;
 
     Ok((
         FileTime::from_last_access_time(&metadata),
@@ -249,11 +251,16 @@ fn parse_timestamp(s: &str) -> UResult<FileTime> {
         10 => ("%y%m%d%H%M", s.to_owned()),
         11 => ("%Y%m%d%H%M.%S", format!("{}{}", now.tm_year + 1900, s)),
         8 => ("%Y%m%d%H%M", format!("{}{}", now.tm_year + 1900, s)),
-        _ => return Err(USimpleError::new(1, format!("invalid date format '{}'", s))),
+        _ => {
+            return Err(USimpleError::new(
+                1,
+                format!("invalid date format {}", s.quote()),
+            ))
+        }
     };
 
     let tm = time::strptime(&ts, format)
-        .map_err(|_| USimpleError::new(1, format!("invalid date format '{}'", s)))?;
+        .map_err(|_| USimpleError::new(1, format!("invalid date format {}", s.quote())))?;
 
     let mut local = to_local(tm);
     local.tm_isdst = -1;
@@ -269,7 +276,10 @@ fn parse_timestamp(s: &str) -> UResult<FileTime> {
     };
     let tm2 = time::at(ts);
     if tm.tm_hour != tm2.tm_hour {
-        return Err(USimpleError::new(1, format!("invalid date format '{}'", s)));
+        return Err(USimpleError::new(
+            1,
+            format!("invalid date format {}", s.quote()),
+        ));
     }
 
     Ok(ft)
diff --git a/src/uu/tr/Cargo.toml b/src/uu/tr/Cargo.toml
index f75a540ee..8792938a9 100644
--- a/src/uu/tr/Cargo.toml
+++ b/src/uu/tr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_tr"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tr ~ (uutils) translate characters within input and display"
@@ -18,9 +18,13 @@ path = "src/tr.rs"
 bit-set = "0.5.0"
 fnv = "1.0.5"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "tr"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs
index 6dd81badf..fbc4bab9b 100644
--- a/src/uu/tr/src/tr.rs
+++ b/src/uu/tr/src/tr.rs
@@ -21,7 +21,7 @@ use fnv::FnvHashMap;
 use std::io::{stdin, stdout, BufRead, BufWriter, Write};
 
 use crate::expand::ExpandSet;
-use uucore::InvalidEncodingHandling;
+use uucore::{display::Quotable, InvalidEncodingHandling};
 
 static ABOUT: &str = "translate or delete characters";
 
@@ -228,8 +228,8 @@ fn translate_input<T: SymbolTranslator>(
     }
 }
 
-fn get_usage() -> String {
-    format!("{} [OPTION]... SET1 [SET2]", executable!())
+fn usage() -> String {
+    format!("{} [OPTION]... SET1 [SET2]", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -243,7 +243,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -263,17 +263,17 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     if sets.is_empty() {
         show_error!(
-            "missing operand\nTry `{} --help` for more information.",
-            executable!()
+            "missing operand\nTry '{} --help' for more information.",
+            uucore::execution_phrase()
         );
         return 1;
     }
 
     if !(delete_flag || squeeze_flag) && sets.len() < 2 {
         show_error!(
-            "missing operand after '{}'\nTry `{} --help` for more information.",
-            sets[0],
-            executable!()
+            "missing operand after {}\nTry '{} --help' for more information.",
+            sets[0].quote(),
+            uucore::execution_phrase()
         );
         return 1;
     }
@@ -312,7 +312,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/true/Cargo.toml b/src/uu/true/Cargo.toml
index 36ea0f991..369bbb51f 100644
--- a/src/uu/true/Cargo.toml
+++ b/src/uu/true/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_true"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "true ~ (uutils) do nothing and succeed"
@@ -16,8 +16,8 @@ path = "src/true.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "true"
diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs
index f84a89176..b5fbf7c9d 100644
--- a/src/uu/true/src/true.rs
+++ b/src/uu/true/src/true.rs
@@ -5,12 +5,8 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::App;
 use uucore::error::UResult;
-use uucore::executable;
 
 #[uucore_procs::gen_uumain]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
@@ -19,5 +15,5 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
 }
diff --git a/src/uu/truncate/Cargo.toml b/src/uu/truncate/Cargo.toml
index 6441f2e14..811aa6ef6 100644
--- a/src/uu/truncate/Cargo.toml
+++ b/src/uu/truncate/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_truncate"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "truncate ~ (uutils) truncate (or extend) FILE to SIZE"
@@ -16,9 +16,13 @@ path = "src/truncate.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "truncate"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs
index bb7aa61d4..6fb1f06f6 100644
--- a/src/uu/truncate/src/truncate.rs
+++ b/src/uu/truncate/src/truncate.rs
@@ -15,6 +15,7 @@ use std::convert::TryFrom;
 use std::fs::{metadata, OpenOptions};
 use std::io::ErrorKind;
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::parse_size::{parse_size, ParseSizeError};
 
 #[derive(Debug, Eq, PartialEq)]
@@ -63,8 +64,8 @@ pub mod options {
     pub static ARG_FILES: &str = "files";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [FILE]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]... [FILE]...", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -90,7 +91,7 @@ fn get_long_usage() -> String {
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let long_usage = get_long_usage();
 
     let matches = uu_app()
@@ -120,8 +121,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                     let reference = matches.value_of(options::REFERENCE).map(String::from);
                     crash!(
                         1,
-                        "cannot stat '{}': No such file or directory",
-                        reference.unwrap_or_else(|| "".to_string())
+                        "cannot stat {}: No such file or directory",
+                        reference.as_deref().unwrap_or("").quote()
                     ); // TODO: fix '--no-create' see test_reference and test_truncate_bytes_size
                 }
                 _ => crash!(1, "{}", e.to_string()),
@@ -133,7 +134,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/tsort/Cargo.toml b/src/uu/tsort/Cargo.toml
index ec9dd05f9..bcc2dd757 100644
--- a/src/uu/tsort/Cargo.toml
+++ b/src/uu/tsort/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_tsort"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tsort ~ (uutils) topologically sort input (partially ordered) pairs"
@@ -16,9 +16,13 @@ path = "src/tsort.rs"
 
 [dependencies]
 clap= "2.33"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "tsort"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs
index 0a323f837..11798db13 100644
--- a/src/uu/tsort/src/tsort.rs
+++ b/src/uu/tsort/src/tsort.rs
@@ -14,6 +14,7 @@ use std::collections::{HashMap, HashSet};
 use std::fs::File;
 use std::io::{stdin, BufRead, BufReader, Read};
 use std::path::Path;
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static SUMMARY: &str = "Topological sort the strings in FILE.
@@ -45,7 +46,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         file_buf = match File::open(Path::new(&input)) {
             Ok(a) => a,
             _ => {
-                show_error!("{}: No such file or directory", input);
+                show_error!("{}: No such file or directory", input.maybe_quote());
                 return 1;
             }
         };
@@ -68,7 +69,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                 for ab in tokens.chunks(2) {
                     match ab.len() {
                         2 => g.add_edge(&ab[0], &ab[1]),
-                        _ => crash!(1, "{}: input contains an odd number of tokens", input),
+                        _ => crash!(
+                            1,
+                            "{}: input contains an odd number of tokens",
+                            input.maybe_quote()
+                        ),
                     }
                 }
             }
@@ -90,7 +95,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .usage(USAGE)
         .about(SUMMARY)
diff --git a/src/uu/tty/Cargo.toml b/src/uu/tty/Cargo.toml
index 6a4cb73a6..5b2e18cd2 100644
--- a/src/uu/tty/Cargo.toml
+++ b/src/uu/tty/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_tty"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "tty ~ (uutils) display the name of the terminal connected to standard input"
@@ -18,8 +18,8 @@ path = "src/tty.rs"
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
 atty = "0.2"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["fs"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "tty"
diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs
index 7412cdf45..94e2e6b24 100644
--- a/src/uu/tty/src/tty.rs
+++ b/src/uu/tty/src/tty.rs
@@ -9,9 +9,6 @@
 
 // spell-checker:ignore (ToDO) ttyname filedesc
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::ffi::CStr;
 use std::io::Write;
@@ -23,12 +20,12 @@ mod options {
     pub const SILENT: &str = "silent";
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]...", uucore::execution_phrase())
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -78,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/uname/Cargo.toml b/src/uu/uname/Cargo.toml
index a12b095aa..90a103075 100644
--- a/src/uu/uname/Cargo.toml
+++ b/src/uu/uname/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_uname"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "uname ~ (uutils) display system information"
@@ -17,8 +17,8 @@ path = "src/uname.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 platform-info = "0.1"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "uname"
diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs
index abd50d1b8..2c396081e 100644
--- a/src/uu/uname/src/uname.rs
+++ b/src/uu/uname/src/uname.rs
@@ -50,10 +50,10 @@ const HOST_OS: &str = "Fuchsia";
 const HOST_OS: &str = "Redox";
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = format!("{} [OPTION]...", executable!());
+    let usage = format!("{} [OPTION]...", uucore::execution_phrase());
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
-    let uname = return_if_err!(1, PlatformInfo::new());
+    let uname = crash_if_err!(1, PlatformInfo::new());
     let mut output = String::new();
 
     let all = matches.is_present(options::ALL);
@@ -119,7 +119,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(Arg::with_name(options::ALL)
diff --git a/src/uu/unexpand/Cargo.toml b/src/uu/unexpand/Cargo.toml
index a0aa3c1de..026a12872 100644
--- a/src/uu/unexpand/Cargo.toml
+++ b/src/uu/unexpand/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_unexpand"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "unexpand ~ (uutils) convert input spaces to tabs"
@@ -17,9 +17,13 @@ path = "src/unexpand.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 unicode-width = "0.1.5"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "unexpand"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs
index 50e3f186d..95383b89d 100644
--- a/src/uu/unexpand/src/unexpand.rs
+++ b/src/uu/unexpand/src/unexpand.rs
@@ -16,6 +16,7 @@ use std::fs::File;
 use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Stdout, Write};
 use std::str::from_utf8;
 use unicode_width::UnicodeWidthChar;
+use uucore::display::Quotable;
 use uucore::InvalidEncodingHandling;
 
 static NAME: &str = "unexpand";
@@ -102,7 +103,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .name(NAME)
         .version(crate_version!())
         .usage(USAGE)
@@ -141,9 +142,9 @@ fn open(path: String) -> BufReader<Box<dyn Read + 'static>> {
     if path == "-" {
         BufReader::new(Box::new(stdin()) as Box<dyn Read>)
     } else {
-        file_buf = match File::open(&path[..]) {
+        file_buf = match File::open(&path) {
             Ok(a) => a,
-            Err(e) => crash!(1, "{}: {}", &path[..], e),
+            Err(e) => crash!(1, "{}: {}", path.maybe_quote(), e),
         };
         BufReader::new(Box::new(file_buf) as Box<dyn Read>)
     }
@@ -178,13 +179,13 @@ fn write_tabs(
                 break;
             }
 
-            safe_unwrap!(output.write_all(b"\t"));
+            crash_if_err!(1, output.write_all(b"\t"));
             scol += nts;
         }
     }
 
     while col > scol {
-        safe_unwrap!(output.write_all(b" "));
+        crash_if_err!(1, output.write_all(b" "));
         scol += 1;
     }
 }
@@ -272,7 +273,7 @@ fn unexpand(options: Options) {
                         init,
                         true,
                     );
-                    safe_unwrap!(output.write_all(&buf[byte..]));
+                    crash_if_err!(1, output.write_all(&buf[byte..]));
                     scol = col;
                     break;
                 }
@@ -292,7 +293,7 @@ fn unexpand(options: Options) {
                         };
 
                         if !tabs_buffered {
-                            safe_unwrap!(output.write_all(&buf[byte..byte + nbytes]));
+                            crash_if_err!(1, output.write_all(&buf[byte..byte + nbytes]));
                             scol = col; // now printed up to this column
                         }
                     }
@@ -317,7 +318,7 @@ fn unexpand(options: Options) {
                         } else {
                             0
                         };
-                        safe_unwrap!(output.write_all(&buf[byte..byte + nbytes]));
+                        crash_if_err!(1, output.write_all(&buf[byte..byte + nbytes]));
                         scol = col; // we've now printed up to this column
                     }
                 }
@@ -336,7 +337,7 @@ fn unexpand(options: Options) {
                 init,
                 true,
             );
-            safe_unwrap!(output.flush());
+            crash_if_err!(1, output.flush());
             buf.truncate(0); // clear out the buffer
         }
     }
diff --git a/src/uu/uniq/Cargo.toml b/src/uu/uniq/Cargo.toml
index aed487b59..a6fcebc92 100644
--- a/src/uu/uniq/Cargo.toml
+++ b/src/uu/uniq/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_uniq"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "uniq ~ (uutils) filter identical adjacent lines from input"
@@ -16,11 +16,15 @@ path = "src/uniq.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-strum = "0.20"
-strum_macros = "0.20"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+strum = "0.21"
+strum_macros = "0.21"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "uniq"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs
index 20639c850..c6c6a444d 100644
--- a/src/uu/uniq/src/uniq.rs
+++ b/src/uu/uniq/src/uniq.rs
@@ -5,15 +5,14 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg, ArgMatches};
 use std::fs::File;
-use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Result, Write};
+use std::io::{self, stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
 use std::path::Path;
 use std::str::FromStr;
 use strum_macros::{AsRefStr, EnumString};
+use uucore::display::Quotable;
+use uucore::error::{FromIo, UResult, USimpleError};
 
 static ABOUT: &str = "Report or omit repeated lines.";
 pub mod options {
@@ -54,36 +53,45 @@ struct Uniq {
     zero_terminated: bool,
 }
 
+macro_rules! write_line_terminator {
+    ($writer:expr, $line_terminator:expr) => {
+        $writer
+            .write_all(&[$line_terminator])
+            .map_err_context(|| "Could not write line terminator".to_string())
+    };
+}
+
 impl Uniq {
     pub fn print_uniq<R: Read, W: Write>(
         &self,
         reader: &mut BufReader<R>,
         writer: &mut BufWriter<W>,
-    ) {
+    ) -> UResult<()> {
         let mut first_line_printed = false;
         let mut group_count = 1;
         let line_terminator = self.get_line_terminator();
         let mut lines = reader.split(line_terminator).map(get_line_string);
         let mut line = match lines.next() {
-            Some(l) => l,
-            None => return,
+            Some(l) => l?,
+            None => return Ok(()),
         };
 
         // compare current `line` with consecutive lines (`next_line`) of the input
         // and if needed, print `line` based on the command line options provided
         for next_line in lines {
+            let next_line = next_line?;
             if self.cmp_keys(&line, &next_line) {
                 if (group_count == 1 && !self.repeats_only)
                     || (group_count > 1 && !self.uniques_only)
                 {
-                    self.print_line(writer, &line, group_count, first_line_printed);
+                    self.print_line(writer, &line, group_count, first_line_printed)?;
                     first_line_printed = true;
                 }
                 line = next_line;
                 group_count = 1;
             } else {
                 if self.all_repeated {
-                    self.print_line(writer, &line, group_count, first_line_printed);
+                    self.print_line(writer, &line, group_count, first_line_printed)?;
                     first_line_printed = true;
                     line = next_line;
                 }
@@ -91,14 +99,15 @@ impl Uniq {
             }
         }
         if (group_count == 1 && !self.repeats_only) || (group_count > 1 && !self.uniques_only) {
-            self.print_line(writer, &line, group_count, first_line_printed);
+            self.print_line(writer, &line, group_count, first_line_printed)?;
             first_line_printed = true;
         }
         if (self.delimiters == Delimiters::Append || self.delimiters == Delimiters::Both)
             && first_line_printed
         {
-            crash_if_err!(1, writer.write_all(&[line_terminator]));
+            write_line_terminator!(writer, line_terminator)?;
         }
+        Ok(())
     }
 
     fn skip_fields<'a>(&self, line: &'a str) -> &'a str {
@@ -190,39 +199,51 @@ impl Uniq {
         line: &str,
         count: usize,
         first_line_printed: bool,
-    ) {
+    ) -> UResult<()> {
         let line_terminator = self.get_line_terminator();
 
         if self.should_print_delimiter(count, first_line_printed) {
-            crash_if_err!(1, writer.write_all(&[line_terminator]));
+            write_line_terminator!(writer, line_terminator)?;
         }
 
-        crash_if_err!(
-            1,
-            if self.show_counts {
-                writer.write_all(format!("{:7} {}", count, line).as_bytes())
-            } else {
-                writer.write_all(line.as_bytes())
-            }
-        );
-        crash_if_err!(1, writer.write_all(&[line_terminator]));
+        if self.show_counts {
+            writer.write_all(format!("{:7} {}", count, line).as_bytes())
+        } else {
+            writer.write_all(line.as_bytes())
+        }
+        .map_err_context(|| "Failed to write line".to_string())?;
+
+        write_line_terminator!(writer, line_terminator)
     }
 }
 
-fn get_line_string(io_line: Result<Vec<u8>>) -> String {
-    let line_bytes = crash_if_err!(1, io_line);
-    crash_if_err!(1, String::from_utf8(line_bytes))
+fn get_line_string(io_line: io::Result<Vec<u8>>) -> UResult<String> {
+    let line_bytes = io_line.map_err_context(|| "failed to split lines".to_string())?;
+    String::from_utf8(line_bytes)
+        .map_err(|e| USimpleError::new(1, format!("failed to convert line to utf8: {}", e)))
 }
 
-fn opt_parsed<T: FromStr>(opt_name: &str, matches: &ArgMatches) -> Option<T> {
-    matches.value_of(opt_name).map(|arg_str| {
-        let opt_val: Option<T> = arg_str.parse().ok();
-        opt_val.unwrap_or_else(|| crash!(1, "Invalid argument for {}: {}", opt_name, arg_str))
+fn opt_parsed<T: FromStr>(opt_name: &str, matches: &ArgMatches) -> UResult<Option<T>> {
+    Ok(match matches.value_of(opt_name) {
+        Some(arg_str) => Some(arg_str.parse().map_err(|_| {
+            USimpleError::new(
+                1,
+                format!(
+                    "Invalid argument for {}: {}",
+                    opt_name,
+                    arg_str.maybe_quote()
+                ),
+            )
+        })?),
+        None => None,
     })
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [INPUT [OUTPUT]]...", executable!())
+fn usage() -> String {
+    format!(
+        "{0} [OPTION]... [INPUT [OUTPUT]]...",
+        uucore::execution_phrase()
+    )
 }
 
 fn get_long_usage() -> String {
@@ -234,8 +255,9 @@ fn get_long_usage() -> String {
     )
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let long_usage = get_long_usage();
 
     let matches = uu_app()
@@ -253,8 +275,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         1 => (files[0].clone(), "-".to_owned()),
         2 => (files[0].clone(), files[1].clone()),
         _ => {
-            // Cannot happen as clap will fail earlier
-            crash!(1, "Extra operand: {}", files[2]);
+            unreachable!() // Cannot happen as clap will fail earlier
         }
     };
 
@@ -266,22 +287,20 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
             || matches.is_present(options::GROUP),
         delimiters: get_delimiter(&matches),
         show_counts: matches.is_present(options::COUNT),
-        skip_fields: opt_parsed(options::SKIP_FIELDS, &matches),
-        slice_start: opt_parsed(options::SKIP_CHARS, &matches),
-        slice_stop: opt_parsed(options::CHECK_CHARS, &matches),
+        skip_fields: opt_parsed(options::SKIP_FIELDS, &matches)?,
+        slice_start: opt_parsed(options::SKIP_CHARS, &matches)?,
+        slice_stop: opt_parsed(options::CHECK_CHARS, &matches)?,
         ignore_case: matches.is_present(options::IGNORE_CASE),
         zero_terminated: matches.is_present(options::ZERO_TERMINATED),
     };
     uniq.print_uniq(
-        &mut open_input_file(in_file_name),
-        &mut open_output_file(out_file_name),
-    );
-
-    0
+        &mut open_input_file(in_file_name)?,
+        &mut open_output_file(out_file_name)?,
+    )
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -377,7 +396,7 @@ fn get_delimiter(matches: &ArgMatches) -> Delimiters {
         .value_of(options::ALL_REPEATED)
         .or_else(|| matches.value_of(options::GROUP));
     if let Some(delimiter_arg) = value {
-        crash_if_err!(1, Delimiters::from_str(delimiter_arg))
+        Delimiters::from_str(delimiter_arg).unwrap() // All possible values for ALL_REPEATED are &str's of Delimiters
     } else if matches.is_present(options::GROUP) {
         Delimiters::Separate
     } else {
@@ -385,26 +404,26 @@ fn get_delimiter(matches: &ArgMatches) -> Delimiters {
     }
 }
 
-fn open_input_file(in_file_name: String) -> BufReader<Box<dyn Read + 'static>> {
+fn open_input_file(in_file_name: String) -> UResult<BufReader<Box<dyn Read + 'static>>> {
     let in_file = if in_file_name == "-" {
         Box::new(stdin()) as Box<dyn Read>
     } else {
         let path = Path::new(&in_file_name[..]);
-        let in_file = File::open(&path);
-        let r = crash_if_err!(1, in_file);
-        Box::new(r) as Box<dyn Read>
+        let in_file = File::open(&path)
+            .map_err_context(|| format!("Could not open {}", in_file_name.maybe_quote()))?;
+        Box::new(in_file) as Box<dyn Read>
     };
-    BufReader::new(in_file)
+    Ok(BufReader::new(in_file))
 }
 
-fn open_output_file(out_file_name: String) -> BufWriter<Box<dyn Write + 'static>> {
+fn open_output_file(out_file_name: String) -> UResult<BufWriter<Box<dyn Write + 'static>>> {
     let out_file = if out_file_name == "-" {
         Box::new(stdout()) as Box<dyn Write>
     } else {
         let path = Path::new(&out_file_name[..]);
-        let in_file = File::create(&path);
-        let w = crash_if_err!(1, in_file);
-        Box::new(w) as Box<dyn Write>
+        let out_file = File::create(&path)
+            .map_err_context(|| format!("Could not create {}", out_file_name.maybe_quote()))?;
+        Box::new(out_file) as Box<dyn Write>
     };
-    BufWriter::new(out_file)
+    Ok(BufWriter::new(out_file))
 }
diff --git a/src/uu/unlink/Cargo.toml b/src/uu/unlink/Cargo.toml
index 3f13a7231..c4b7d49cb 100644
--- a/src/uu/unlink/Cargo.toml
+++ b/src/uu/unlink/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_unlink"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "unlink ~ (uutils) remove a (file system) link to FILE"
@@ -16,9 +16,8 @@ path = "src/unlink.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-libc = "0.2.42"
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "unlink"
diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs
index 49f17cb12..58bb5442c 100644
--- a/src/uu/unlink/src/unlink.rs
+++ b/src/uu/unlink/src/unlink.rs
@@ -7,96 +7,29 @@
 
 /* last synced with: unlink (GNU coreutils) 8.21 */
 
-// spell-checker:ignore (ToDO) lstat IFLNK IFMT IFREG
-
-#[macro_use]
-extern crate uucore;
+use std::fs::remove_file;
+use std::path::Path;
 
 use clap::{crate_version, App, Arg};
-use libc::{lstat, stat, unlink};
-use libc::{S_IFLNK, S_IFMT, S_IFREG};
-use std::ffi::CString;
-use std::io::{Error, ErrorKind};
-use uucore::InvalidEncodingHandling;
 
-static ABOUT: &str = "Unlink the file at [FILE].";
+use uucore::display::Quotable;
+use uucore::error::{FromIo, UResult};
+
+static ABOUT: &str = "Unlink the file at FILE.";
 static OPT_PATH: &str = "FILE";
 
-fn get_usage() -> String {
-    format!("{} [OPTION]... FILE", executable!())
-}
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let matches = uu_app().get_matches_from(args);
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let args = args
-        .collect_str(InvalidEncodingHandling::ConvertLossy)
-        .accept_any();
+    let path: &Path = matches.value_of_os(OPT_PATH).unwrap().as_ref();
 
-    let usage = get_usage();
-
-    let matches = uu_app().usage(&usage[..]).get_matches_from(args);
-
-    let paths: Vec<String> = matches
-        .values_of(OPT_PATH)
-        .map(|v| v.map(ToString::to_string).collect())
-        .unwrap_or_default();
-
-    if paths.is_empty() {
-        crash!(
-            1,
-            "missing operand\nTry '{0} --help' for more information.",
-            executable!()
-        );
-    } else if paths.len() > 1 {
-        crash!(
-            1,
-            "extra operand: '{1}'\nTry '{0} --help' for more information.",
-            executable!(),
-            paths[1]
-        );
-    }
-
-    let c_string = CString::new(paths[0].clone()).unwrap(); // unwrap() cannot fail, the string comes from argv so it cannot contain a \0.
-
-    let st_mode = {
-        #[allow(deprecated)]
-        let mut buf: stat = unsafe { std::mem::uninitialized() };
-        let result = unsafe { lstat(c_string.as_ptr(), &mut buf as *mut stat) };
-
-        if result < 0 {
-            crash!(1, "Cannot stat '{}': {}", paths[0], Error::last_os_error());
-        }
-
-        buf.st_mode & S_IFMT
-    };
-
-    let result = if st_mode != S_IFREG && st_mode != S_IFLNK {
-        Err(Error::new(
-            ErrorKind::Other,
-            "Not a regular file or symlink",
-        ))
-    } else {
-        let result = unsafe { unlink(c_string.as_ptr()) };
-
-        if result < 0 {
-            Err(Error::last_os_error())
-        } else {
-            Ok(())
-        }
-    };
-
-    match result {
-        Ok(_) => (),
-        Err(e) => {
-            crash!(1, "cannot unlink '{0}': {1}", paths[0], e);
-        }
-    }
-
-    0
+    remove_file(path).map_err_context(|| format!("cannot unlink {}", path.quote()))
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
-        .arg(Arg::with_name(OPT_PATH).hidden(true).multiple(true))
+        .arg(Arg::with_name(OPT_PATH).required(true).hidden(true))
 }
diff --git a/src/uu/uptime/Cargo.toml b/src/uu/uptime/Cargo.toml
index a5b7a3177..785955afc 100644
--- a/src/uu/uptime/Cargo.toml
+++ b/src/uu/uptime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_uptime"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "uptime ~ (uutils) display dynamic system information"
@@ -17,8 +17,8 @@ path = "src/uptime.rs"
 [dependencies]
 chrono = "0.4"
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc", "utmpx"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["libc", "utmpx"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "uptime"
diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs
index 35270093c..eabcd1abf 100644
--- a/src/uu/uptime/src/uptime.rs
+++ b/src/uu/uptime/src/uptime.rs
@@ -11,12 +11,12 @@
 use chrono::{Local, TimeZone, Utc};
 use clap::{crate_version, App, Arg};
 
-#[macro_use]
-extern crate uucore;
 // import crate time from utmpx
 pub use uucore::libc;
 use uucore::libc::time_t;
 
+use uucore::error::{UResult, USimpleError};
+
 static ABOUT: &str = "Display the current time, the length of time the system has been up,\n\
                       the number of users on the system, and the average number of jobs\n\
                       in the run queue over the last 1, 5 and 15 minutes.";
@@ -32,25 +32,24 @@ extern "C" {
     fn GetTickCount() -> uucore::libc::uint32_t;
 }
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]...", executable!())
+fn usage() -> String {
+    format!("{0} [OPTION]...", uucore::execution_phrase())
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let (boot_time, user_count) = process_utmpx();
     let uptime = get_uptime(boot_time);
     if uptime < 0 {
-        show_error!("could not retrieve system uptime");
-
-        1
+        Err(USimpleError::new(1, "could not retrieve system uptime"))
     } else {
         if matches.is_present(options::SINCE) {
             let initial_date = Local.timestamp(Utc::now().timestamp() - uptime, 0);
             println!("{}", initial_date.format("%Y-%m-%d %H:%M:%S"));
-            return 0;
+            return Ok(());
         }
 
         print_time();
@@ -59,12 +58,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         print_nusers(user_count);
         print_loadavg();
 
-        0
+        Ok(())
     }
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
diff --git a/src/uu/users/Cargo.toml b/src/uu/users/Cargo.toml
index ec4f0785e..05872e8bf 100644
--- a/src/uu/users/Cargo.toml
+++ b/src/uu/users/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_users"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "users ~ (uutils) display names of currently logged-in users"
@@ -16,8 +16,8 @@ path = "src/users.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["utmpx"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]
 name = "users"
diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs
index ef878497c..d0768d8d1 100644
--- a/src/uu/users/src/users.rs
+++ b/src/uu/users/src/users.rs
@@ -8,18 +8,18 @@
 
 // spell-checker:ignore (paths) wtmp
 
-#[macro_use]
-extern crate uucore;
+use std::path::Path;
 
 use clap::{crate_version, App, Arg};
+use uucore::error::UResult;
 use uucore::utmpx::{self, Utmpx};
 
 static ABOUT: &str = "Print the user names of users currently logged in to the current host";
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
-    format!("{0} [FILE]", executable!())
+fn usage() -> String {
+    format!("{0} [FILE]", uucore::execution_phrase())
 }
 
 fn get_long_usage() -> String {
@@ -30,8 +30,9 @@ If FILE is not specified, use {}.  /var/log/wtmp as FILE is common.",
     )
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -39,19 +40,18 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .after_help(&after_help[..])
         .get_matches_from(args);
 
-    let files: Vec<String> = matches
-        .values_of(ARG_FILES)
-        .map(|v| v.map(ToString::to_string).collect())
+    let files: Vec<&Path> = matches
+        .values_of_os(ARG_FILES)
+        .map(|v| v.map(AsRef::as_ref).collect())
         .unwrap_or_default();
 
     let filename = if !files.is_empty() {
-        files[0].as_ref()
+        files[0]
     } else {
-        utmpx::DEFAULT_FILE
+        utmpx::DEFAULT_FILE.as_ref()
     };
 
-    let mut users = Utmpx::iter_all_records()
-        .read_from(filename)
+    let mut users = Utmpx::iter_all_records_from(filename)
         .filter(Utmpx::is_user_process)
         .map(|ut| ut.user())
         .collect::<Vec<_>>();
@@ -61,11 +61,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         println!("{}", users.join(" "));
     }
 
-    0
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(Arg::with_name(ARG_FILES).takes_value(true).max_values(1))
diff --git a/src/uu/wc/BENCHMARKING.md b/src/uu/wc/BENCHMARKING.md
new file mode 100644
index 000000000..b9d8cc22d
--- /dev/null
+++ b/src/uu/wc/BENCHMARKING.md
@@ -0,0 +1,124 @@
+# Benchmarking wc
+
+<!-- spell-checker:ignore (words) uuwc uucat largefile somefile Mshortlines moby lwcm cmds tablefmt -->
+
+Much of what makes wc fast is avoiding unnecessary work. It has multiple strategies, depending on which data is requested.
+
+## Strategies
+
+### Counting bytes
+
+In the case of `wc -c` the content of the input doesn't have to be inspected at all, only the size has to be known. That enables a few optimizations.
+
+#### File size
+
+If it can, wc reads the file size directly. This is not interesting to benchmark, except to see if it still works. Try `wc -c largefile`.
+
+#### `splice()`
+
+On Linux `splice()` is used to get the input's length while discarding it directly.
+
+The best way I've found to generate a fast input to test `splice()` is to pipe the output of uutils `cat` into it. Note that GNU `cat` is slower and therefore less suitable, and that if a file is given as its input directly (as in `wc -c < largefile`) the first strategy kicks in. Try `uucat somefile | wc -c`.
+
+### Counting lines
+
+In the case of `wc -l` or `wc -cl` the input doesn't have to be decoded. It's read in chunks and the `bytecount` crate is used to count the newlines.
+
+It's useful to vary the line length in the input. GNU wc seems particularly bad at short lines.
+
+### Processing unicode
+
+This is the most general strategy, and it's necessary for counting words, characters, and line lengths. Individual steps are still switched on and off depending on what must be reported.
+
+Try varying which of the `-w`, `-m`, `-l` and `-L` flags are used. (The `-c` flag is unlikely to make a difference.)
+
+Passing no flags is equivalent to passing `-wcl`. That case should perhaps be given special attention as it's the default.
+
+## Generating files
+
+To generate a file with many very short lines, run `yes | head -c50000000 > 25Mshortlines`.
+
+To get a file with less artificial contents, download a book from Project Gutenberg and concatenate it a lot of times:
+
+```
+wget https://www.gutenberg.org/files/2701/2701-0.txt -O moby.txt
+cat moby.txt moby.txt moby.txt moby.txt > moby4.txt
+cat moby4.txt moby4.txt moby4.txt moby4.txt > moby16.txt
+cat moby16.txt moby16.txt moby16.txt moby16.txt > moby64.txt
+```
+
+And get one with lots of unicode too:
+
+```
+wget https://www.gutenberg.org/files/30613/30613-0.txt -O odyssey.txt
+cat odyssey.txt odyssey.txt odyssey.txt odyssey.txt > odyssey4.txt
+cat odyssey4.txt odyssey4.txt odyssey4.txt odyssey4.txt > odyssey16.txt
+cat odyssey16.txt odyssey16.txt odyssey16.txt odyssey16.txt > odyssey64.txt
+cat odyssey64.txt odyssey64.txt odyssey64.txt odyssey64.txt > odyssey256.txt
+```
+
+Finally, it's interesting to try a binary file. Look for one with `du -sh /usr/bin/* | sort -h`. On my system `/usr/bin/docker` is a good candidate as it's fairly large.
+
+## Running benchmarks
+
+Use [`hyperfine`](https://github.com/sharkdp/hyperfine) to compare the performance. For example, `hyperfine 'wc somefile' 'uuwc somefile'`.
+
+If you want to get fancy and exhaustive, generate a table:
+
+|                        |   moby64.txt |   odyssey256.txt |   25Mshortlines |   /usr/bin/docker |
+|------------------------|--------------|------------------|-----------------|-------------------|
+| `wc <FILE>`            |       1.3965 |           1.6182 |          5.2967 |            2.2294 |
+| `wc -c <FILE>`         |       0.8134 |           1.2774 |          0.7732 |            0.9106 |
+| `uucat <FILE> | wc -c` |       2.7760 |           2.5565 |          2.3769 |            2.3982 |
+| `wc -l <FILE>`         |       1.1441 |           1.2854 |          2.9681 |            1.1493 |
+| `wc -L <FILE>`         |       2.1087 |           1.2551 |          5.4577 |            2.1490 |
+| `wc -m <FILE>`         |       2.7272 |           2.1704 |          7.3371 |            3.4347 |
+| `wc -w <FILE>`         |       1.9007 |           1.5206 |          4.7851 |            2.8529 |
+| `wc -lwcmL <FILE>`     |       1.1687 |           0.9169 |          4.4092 |            2.0663 |
+
+Beware that:
+- Results are fuzzy and change from run to run
+- You'll often want to check versions of uutils wc against each other instead of against GNU
+- This takes a lot of time to generate
+- This only shows the relative speedup, not the absolute time, which may be misleading if the time is very short
+
+Created by the following Python script:
+```python
+import json
+import subprocess
+
+from tabulate import tabulate
+
+bins = ["wc", "uuwc"]
+files = ["moby64.txt", "odyssey256.txt", "25Mshortlines", "/usr/bin/docker"]
+cmds = [
+    "{cmd} {file}",
+    "{cmd} -c {file}",
+    "uucat {file} | {cmd} -c",
+    "{cmd} -l {file}",
+    "{cmd} -L {file}",
+    "{cmd} -m {file}",
+    "{cmd} -w {file}",
+    "{cmd} -lwcmL {file}",
+]
+
+table = []
+for cmd in cmds:
+    row = ["`" + cmd.format(cmd="wc", file="<FILE>") + "`"]
+    for file in files:
+        subprocess.run(
+            [
+                "hyperfine",
+                cmd.format(cmd=bins[0], file=file),
+                cmd.format(cmd=bins[1], file=file),
+                "--export-json=out.json",
+            ],
+            check=True,
+        )
+        with open("out.json") as f:
+            res = json.load(f)["results"]
+        row.append(round(res[0]["mean"] / res[1]["mean"], 4))
+    table.append(row)
+print(tabulate(table, [""] + files, tablefmt="github"))
+```
+(You may have to adjust the `bins` and `files` variables depending on your setup, and please do add other interesting cases to `cmds`.)
diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml
index 31a7ac7af..d76e0b176 100644
--- a/src/uu/wc/Cargo.toml
+++ b/src/uu/wc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_wc"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "wc ~ (uutils) display newline, word, and byte counts for input"
@@ -16,9 +16,11 @@ path = "src/wc.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
-thiserror = "1.0"
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["pipes"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
+bytecount = "0.6.2"
+utf-8 = "0.7.6"
+unicode-width = "0.1.8"
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.20"
@@ -27,3 +29,7 @@ libc = "0.2"
 [[bin]]
 name = "wc"
 path = "src/main.rs"
+
+[package.metadata.cargo-udeps.ignore]
+# Necessary for "make all"
+normal = ["uucore_procs"]
diff --git a/src/uu/wc/src/count_bytes.rs b/src/uu/wc/src/count_bytes.rs
deleted file mode 100644
index 7f06f8171..000000000
--- a/src/uu/wc/src/count_bytes.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use super::{WcResult, WordCountable};
-
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use std::fs::OpenOptions;
-use std::io::ErrorKind;
-
-#[cfg(unix)]
-use libc::S_IFREG;
-#[cfg(unix)]
-use nix::sys::stat::fstat;
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use std::os::unix::io::{AsRawFd, RawFd};
-
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use libc::S_IFIFO;
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use nix::fcntl::{splice, SpliceFFlags};
-#[cfg(any(target_os = "linux", target_os = "android"))]
-use nix::unistd::pipe;
-
-const BUF_SIZE: usize = 16384;
-
-/// Splice wrapper which handles short writes
-#[cfg(any(target_os = "linux", target_os = "android"))]
-#[inline]
-fn splice_exact(read_fd: RawFd, write_fd: RawFd, num_bytes: usize) -> nix::Result<()> {
-    let mut left = num_bytes;
-    loop {
-        let written = splice(read_fd, None, write_fd, None, left, SpliceFFlags::empty())?;
-        left -= written;
-        if left == 0 {
-            break;
-        }
-    }
-    Ok(())
-}
-
-/// This is a Linux-specific function to count the number of bytes using the
-/// `splice` system call, which is faster than using `read`.
-#[inline]
-#[cfg(any(target_os = "linux", target_os = "android"))]
-fn count_bytes_using_splice(fd: RawFd) -> nix::Result<usize> {
-    let null_file = OpenOptions::new()
-        .write(true)
-        .open("/dev/null")
-        .map_err(|_| nix::Error::last())?;
-    let null = null_file.as_raw_fd();
-    let (pipe_rd, pipe_wr) = pipe()?;
-
-    let mut byte_count = 0;
-    loop {
-        let res = splice(fd, None, pipe_wr, None, BUF_SIZE, SpliceFFlags::empty())?;
-        if res == 0 {
-            break;
-        }
-        byte_count += res;
-        splice_exact(pipe_rd, null, res)?;
-    }
-
-    Ok(byte_count)
-}
-
-/// In the special case where we only need to count the number of bytes. There
-/// are several optimizations we can do:
-///   1. On Unix,  we can simply `stat` the file if it is regular.
-///   2. On Linux -- if the above did not work -- we can use splice to count
-///      the number of bytes if the file is a FIFO.
-///   3. Otherwise, we just read normally, but without the overhead of counting
-///      other things such as lines and words.
-#[inline]
-pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> WcResult<usize> {
-    #[cfg(unix)]
-    {
-        let fd = handle.as_raw_fd();
-        if let Ok(stat) = fstat(fd) {
-            // If the file is regular, then the `st_size` should hold
-            // the file's size in bytes.
-            if (stat.st_mode & S_IFREG) != 0 {
-                return Ok(stat.st_size as usize);
-            }
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            {
-                // Else, if we're on Linux and our file is a FIFO pipe
-                // (or stdin), we use splice to count the number of bytes.
-                if (stat.st_mode & S_IFIFO) != 0 {
-                    if let Ok(n) = count_bytes_using_splice(fd) {
-                        return Ok(n);
-                    }
-                }
-            }
-        }
-    }
-
-    // Fall back on `read`, but without the overhead of counting words and lines.
-    let mut buf = [0_u8; BUF_SIZE];
-    let mut byte_count = 0;
-    loop {
-        match handle.read(&mut buf) {
-            Ok(0) => return Ok(byte_count),
-            Ok(n) => {
-                byte_count += n;
-            }
-            Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
-            Err(e) => return Err(e.into()),
-        }
-    }
-}
diff --git a/src/uu/wc/src/count_fast.rs b/src/uu/wc/src/count_fast.rs
new file mode 100644
index 000000000..e4f6be6c1
--- /dev/null
+++ b/src/uu/wc/src/count_fast.rs
@@ -0,0 +1,130 @@
+use crate::word_count::WordCount;
+
+use super::WordCountable;
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use std::fs::OpenOptions;
+use std::io::{self, ErrorKind, Read};
+
+#[cfg(unix)]
+use libc::S_IFREG;
+#[cfg(unix)]
+use nix::sys::stat;
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use std::os::unix::io::AsRawFd;
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use libc::S_IFIFO;
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use uucore::pipes::{pipe, splice, splice_exact};
+
+const BUF_SIZE: usize = 16 * 1024;
+#[cfg(any(target_os = "linux", target_os = "android"))]
+const SPLICE_SIZE: usize = 128 * 1024;
+
+/// This is a Linux-specific function to count the number of bytes using the
+/// `splice` system call, which is faster than using `read`.
+///
+/// On error it returns the number of bytes it did manage to read, since the
+/// caller will fall back to a simpler method.
+#[inline]
+#[cfg(any(target_os = "linux", target_os = "android"))]
+fn count_bytes_using_splice(fd: &impl AsRawFd) -> Result<usize, usize> {
+    let null_file = OpenOptions::new()
+        .write(true)
+        .open("/dev/null")
+        .map_err(|_| 0_usize)?;
+    let null_rdev = stat::fstat(null_file.as_raw_fd())
+        .map_err(|_| 0_usize)?
+        .st_rdev;
+    if (stat::major(null_rdev), stat::minor(null_rdev)) != (1, 3) {
+        // This is not a proper /dev/null, writing to it is probably bad
+        // Bit of an edge case, but it has been known to happen
+        return Err(0);
+    }
+    let (pipe_rd, pipe_wr) = pipe().map_err(|_| 0_usize)?;
+
+    let mut byte_count = 0;
+    loop {
+        match splice(fd, &pipe_wr, SPLICE_SIZE) {
+            Ok(0) => break,
+            Ok(res) => {
+                byte_count += res;
+                // Silent the warning as we want to the error message
+                #[allow(clippy::question_mark)]
+                if splice_exact(&pipe_rd, &null_file, res).is_err() {
+                    return Err(byte_count);
+                }
+            }
+            Err(_) => return Err(byte_count),
+        };
+    }
+
+    Ok(byte_count)
+}
+
+/// In the special case where we only need to count the number of bytes. There
+/// are several optimizations we can do:
+///   1. On Unix,  we can simply `stat` the file if it is regular.
+///   2. On Linux -- if the above did not work -- we can use splice to count
+///      the number of bytes if the file is a FIFO.
+///   3. Otherwise, we just read normally, but without the overhead of counting
+///      other things such as lines and words.
+#[inline]
+pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> (usize, Option<io::Error>) {
+    let mut byte_count = 0;
+
+    #[cfg(unix)]
+    {
+        let fd = handle.as_raw_fd();
+        if let Ok(stat) = stat::fstat(fd) {
+            // If the file is regular, then the `st_size` should hold
+            // the file's size in bytes.
+            if (stat.st_mode & S_IFREG) != 0 {
+                return (stat.st_size as usize, None);
+            }
+            #[cfg(any(target_os = "linux", target_os = "android"))]
+            {
+                // Else, if we're on Linux and our file is a FIFO pipe
+                // (or stdin), we use splice to count the number of bytes.
+                if (stat.st_mode & S_IFIFO) != 0 {
+                    match count_bytes_using_splice(handle) {
+                        Ok(n) => return (n, None),
+                        Err(n) => byte_count = n,
+                    }
+                }
+            }
+        }
+    }
+
+    // Fall back on `read`, but without the overhead of counting words and lines.
+    let mut buf = [0_u8; BUF_SIZE];
+    loop {
+        match handle.read(&mut buf) {
+            Ok(0) => return (byte_count, None),
+            Ok(n) => {
+                byte_count += n;
+            }
+            Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+            Err(e) => return (byte_count, Some(e)),
+        }
+    }
+}
+
+pub(crate) fn count_bytes_and_lines_fast<R: Read>(
+    handle: &mut R,
+) -> (WordCount, Option<io::Error>) {
+    let mut total = WordCount::default();
+    let mut buf = [0; BUF_SIZE];
+    loop {
+        match handle.read(&mut buf) {
+            Ok(0) => return (total, None),
+            Ok(n) => {
+                total.bytes += n;
+                total.lines += bytecount::count(&buf[..n], b'\n');
+            }
+            Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
+            Err(e) => return (total, Some(e)),
+        }
+    }
+}
diff --git a/src/uu/wc/src/countable.rs b/src/uu/wc/src/countable.rs
index 3da910a03..a14623559 100644
--- a/src/uu/wc/src/countable.rs
+++ b/src/uu/wc/src/countable.rs
@@ -4,7 +4,7 @@
 //! for some common file-like objects. Use the [`WordCountable::lines`]
 //! method to get an iterator over lines of a file-like object.
 use std::fs::File;
-use std::io::{self, BufRead, BufReader, Read, StdinLock};
+use std::io::{BufRead, BufReader, Read, StdinLock};
 
 #[cfg(unix)]
 use std::os::unix::io::AsRawFd;
@@ -12,61 +12,26 @@ use std::os::unix::io::AsRawFd;
 #[cfg(unix)]
 pub trait WordCountable: AsRawFd + Read {
     type Buffered: BufRead;
-    fn lines(self) -> Lines<Self::Buffered>;
+    fn buffered(self) -> Self::Buffered;
 }
 
 #[cfg(not(unix))]
 pub trait WordCountable: Read {
     type Buffered: BufRead;
-    fn lines(self) -> Lines<Self::Buffered>;
+    fn buffered(self) -> Self::Buffered;
 }
 
 impl WordCountable for StdinLock<'_> {
     type Buffered = Self;
 
-    fn lines(self) -> Lines<Self::Buffered>
-    where
-        Self: Sized,
-    {
-        Lines { buf: self }
+    fn buffered(self) -> Self::Buffered {
+        self
     }
 }
 impl WordCountable for File {
     type Buffered = BufReader<Self>;
 
-    fn lines(self) -> Lines<Self::Buffered>
-    where
-        Self: Sized,
-    {
-        Lines {
-            buf: BufReader::new(self),
-        }
-    }
-}
-
-/// An iterator over the lines of an instance of `BufRead`.
-///
-/// Similar to [`io::Lines`] but yields each line as a `Vec<u8>` and
-/// includes the newline character (`\n`, the `0xA` byte) that
-/// terminates the line.
-///
-/// [`io::Lines`]:: io::Lines
-pub struct Lines<B> {
-    buf: B,
-}
-
-impl<B: BufRead> Iterator for Lines<B> {
-    type Item = io::Result<Vec<u8>>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut line = Vec::new();
-
-        // reading from a TTY seems to raise a condition on, rather than return Some(0) like a file.
-        // hence the option wrapped in a result here
-        match self.buf.read_until(b'\n', &mut line) {
-            Ok(0) => None,
-            Ok(_n) => Some(Ok(line)),
-            Err(e) => Some(Err(e)),
-        }
+    fn buffered(self) -> Self::Buffered {
+        BufReader::new(self)
     }
 }
diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs
index 0bcc66664..16522a0a7 100644
--- a/src/uu/wc/src/wc.rs
+++ b/src/uu/wc/src/wc.rs
@@ -8,33 +8,27 @@
 #[macro_use]
 extern crate uucore;
 
-mod count_bytes;
+mod count_fast;
 mod countable;
 mod word_count;
-use count_bytes::count_bytes_fast;
+use count_fast::{count_bytes_and_lines_fast, count_bytes_fast};
 use countable::WordCountable;
+use unicode_width::UnicodeWidthChar;
+use utf8::{BufReadDecoder, BufReadDecoderError};
 use word_count::{TitledWordCount, WordCount};
 
 use clap::{crate_version, App, Arg, ArgMatches};
-use thiserror::Error;
 
+use std::cmp::max;
 use std::fs::{self, File};
-use std::io::{self, ErrorKind, Write};
-use std::path::Path;
+use std::io::{self, Write};
+use std::path::{Path, PathBuf};
+
+use uucore::display::{Quotable, Quoted};
 
 /// The minimum character width for formatting counts when reading from stdin.
 const MINIMUM_WIDTH: usize = 7;
 
-#[derive(Error, Debug)]
-pub enum WcError {
-    #[error("{0}")]
-    Io(#[from] io::Error),
-    #[error("Expected a file, found directory {0}")]
-    IsDirectory(String),
-}
-
-type WcResult<T> = Result<T, WcError>;
-
 struct Settings {
     show_bytes: bool,
     show_chars: bool,
@@ -95,11 +89,11 @@ pub mod options {
 
 static ARG_FILES: &str = "files";
 
-fn get_usage() -> String {
+fn usage() -> String {
     format!(
         "{0} [OPTION]... [FILE]...
  With no FILE, or when FILE is -, read standard input.",
-        executable!()
+        uucore::execution_phrase()
     )
 }
 
@@ -114,7 +108,7 @@ enum StdinKind {
 /// Supported inputs.
 enum Input {
     /// A regular file.
-    Path(String),
+    Path(PathBuf),
 
     /// Standard input.
     Stdin(StdinKind),
@@ -122,28 +116,35 @@ enum Input {
 
 impl Input {
     /// Converts input to title that appears in stats.
-    fn to_title(&self) -> Option<&str> {
+    fn to_title(&self) -> Option<&Path> {
         match self {
             Input::Path(path) => Some(path),
-            Input::Stdin(StdinKind::Explicit) => Some("-"),
+            Input::Stdin(StdinKind::Explicit) => Some("-".as_ref()),
             Input::Stdin(StdinKind::Implicit) => None,
         }
     }
+
+    fn path_display(&self) -> Quoted<'_> {
+        match self {
+            Input::Path(path) => path.maybe_quote(),
+            Input::Stdin(_) => "standard input".maybe_quote(),
+        }
+    }
 }
 
 pub fn uumain(args: impl uucore::Args) -> i32 {
-    let usage = get_usage();
+    let usage = usage();
 
     let matches = uu_app().usage(&usage[..]).get_matches_from(args);
 
     let mut inputs: Vec<Input> = matches
-        .values_of(ARG_FILES)
+        .values_of_os(ARG_FILES)
         .map(|v| {
             v.map(|i| {
                 if i == "-" {
                     Input::Stdin(StdinKind::Explicit)
                 } else {
-                    Input::Path(ToString::to_string(i))
+                    Input::Path(i.into())
                 }
             })
             .collect()
@@ -164,7 +165,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -203,55 +204,125 @@ pub fn uu_app() -> App<'static, 'static> {
 fn word_count_from_reader<T: WordCountable>(
     mut reader: T,
     settings: &Settings,
-    path: &str,
-) -> WcResult<WordCount> {
+) -> (WordCount, Option<io::Error>) {
     let only_count_bytes = settings.show_bytes
         && (!(settings.show_chars
             || settings.show_lines
             || settings.show_max_line_length
             || settings.show_words));
     if only_count_bytes {
-        return Ok(WordCount {
-            bytes: count_bytes_fast(&mut reader)?,
-            ..WordCount::default()
-        });
+        let (bytes, error) = count_bytes_fast(&mut reader);
+        return (
+            WordCount {
+                bytes,
+                ..WordCount::default()
+            },
+            error,
+        );
     }
 
     // we do not need to decode the byte stream if we're only counting bytes/newlines
     let decode_chars = settings.show_chars || settings.show_words || settings.show_max_line_length;
 
-    // Sum the WordCount for each line. Show a warning for each line
-    // that results in an IO error when trying to read it.
-    let total = reader
-        .lines()
-        .filter_map(|res| match res {
-            Ok(line) => Some(line),
-            Err(e) => {
-                show_warning!("Error while reading {}: {}", path, e);
-                None
+    if !decode_chars {
+        return count_bytes_and_lines_fast(&mut reader);
+    }
+
+    let mut total = WordCount::default();
+    let mut reader = BufReadDecoder::new(reader.buffered());
+    let mut in_word = false;
+    let mut current_len = 0;
+
+    while let Some(chunk) = reader.next_strict() {
+        match chunk {
+            Ok(text) => {
+                for ch in text.chars() {
+                    if settings.show_words {
+                        if ch.is_whitespace() {
+                            in_word = false;
+                        } else if ch.is_ascii_control() {
+                            // These count as characters but do not affect the word state
+                        } else if !in_word {
+                            in_word = true;
+                            total.words += 1;
+                        }
+                    }
+                    if settings.show_max_line_length {
+                        match ch {
+                            '\n' => {
+                                total.max_line_length = max(current_len, total.max_line_length);
+                                current_len = 0;
+                            }
+                            // '\x0c' = '\f'
+                            '\r' | '\x0c' => {
+                                total.max_line_length = max(current_len, total.max_line_length);
+                                current_len = 0;
+                            }
+                            '\t' => {
+                                current_len -= current_len % 8;
+                                current_len += 8;
+                            }
+                            _ => {
+                                current_len += ch.width().unwrap_or(0);
+                            }
+                        }
+                    }
+                    if settings.show_lines && ch == '\n' {
+                        total.lines += 1;
+                    }
+                    if settings.show_chars {
+                        total.chars += 1;
+                    }
+                }
+                total.bytes += text.len();
             }
-        })
-        .map(|line| WordCount::from_line(&line, decode_chars))
-        .sum();
-    Ok(total)
+            Err(BufReadDecoderError::InvalidByteSequence(bytes)) => {
+                // GNU wc treats invalid data as neither word nor char nor whitespace,
+                // so no other counters are affected
+                total.bytes += bytes.len();
+            }
+            Err(BufReadDecoderError::Io(e)) => {
+                return (total, Some(e));
+            }
+        }
+    }
+
+    total.max_line_length = max(current_len, total.max_line_length);
+
+    (total, None)
 }
 
-fn word_count_from_input(input: &Input, settings: &Settings) -> WcResult<WordCount> {
+enum CountResult {
+    /// Nothing went wrong.
+    Success(WordCount),
+    /// Managed to open but failed to read.
+    Interrupted(WordCount, io::Error),
+    /// Didn't even manage to open.
+    Failure(io::Error),
+}
+
+/// If we fail opening a file we only show the error. If we fail reading it
+/// we show a count for what we managed to read.
+///
+/// Therefore the reading implementations always return a total and sometimes
+/// return an error: (WordCount, Option<io::Error>).
+fn word_count_from_input(input: &Input, settings: &Settings) -> CountResult {
     match input {
         Input::Stdin(_) => {
             let stdin = io::stdin();
             let stdin_lock = stdin.lock();
-            word_count_from_reader(stdin_lock, settings, "-")
-        }
-        Input::Path(path) => {
-            let path_obj = Path::new(path);
-            if path_obj.is_dir() {
-                Err(WcError::IsDirectory(path.to_owned()))
-            } else {
-                let file = File::open(path)?;
-                word_count_from_reader(file, settings, path)
+            match word_count_from_reader(stdin_lock, settings) {
+                (total, Some(error)) => CountResult::Interrupted(total, error),
+                (total, None) => CountResult::Success(total),
             }
         }
+        Input::Path(path) => match File::open(path) {
+            Err(error) => CountResult::Failure(error),
+            Ok(file) => match word_count_from_reader(file, settings) {
+                (total, Some(error)) => CountResult::Interrupted(total, error),
+                (total, None) => CountResult::Success(total),
+            },
+        },
     }
 }
 
@@ -264,18 +335,8 @@ fn word_count_from_input(input: &Input, settings: &Settings) -> WcResult<WordCou
 /// ```rust,ignore
 /// show_error(Input::Path("/tmp"), WcError::IsDirectory("/tmp"))
 /// ```
-fn show_error(input: &Input, err: WcError) {
-    match (input, err) {
-        (_, WcError::IsDirectory(path)) => {
-            show_error_custom_description!(path, "Is a directory");
-        }
-        (Input::Path(path), WcError::Io(e)) if e.kind() == ErrorKind::NotFound => {
-            show_error_custom_description!(path, "No such file or directory");
-        }
-        (_, e) => {
-            show_error!("{}", e);
-        }
-    };
+fn show_error(input: &Input, err: io::Error) {
+    show_error!("{}: {}", input.path_display(), err);
 }
 
 /// Compute the number of digits needed to represent any count for this input.
@@ -297,9 +358,9 @@ fn show_error(input: &Input, err: WcError) {
 /// let input = Input::Stdin(StdinKind::Explicit);
 /// assert_eq!(7, digit_width(input));
 /// ```
-fn digit_width(input: &Input) -> WcResult<Option<usize>> {
+fn digit_width(input: &Input) -> io::Result<usize> {
     match input {
-        Input::Stdin(_) => Ok(Some(MINIMUM_WIDTH)),
+        Input::Stdin(_) => Ok(MINIMUM_WIDTH),
         Input::Path(filename) => {
             let path = Path::new(filename);
             let metadata = fs::metadata(path)?;
@@ -310,9 +371,9 @@ fn digit_width(input: &Input) -> WcResult<Option<usize>> {
                 // instead). See GitHub issue #2201.
                 let num_bytes = metadata.len();
                 let num_digits = num_bytes.to_string().len();
-                Ok(Some(num_digits))
+                Ok(num_digits)
             } else {
-                Ok(None)
+                Ok(MINIMUM_WIDTH)
             }
         }
     }
@@ -350,13 +411,8 @@ fn digit_width(input: &Input) -> WcResult<Option<usize>> {
 fn max_width(inputs: &[Input]) -> usize {
     let mut result = 1;
     for input in inputs {
-        match digit_width(input) {
-            Ok(maybe_n) => {
-                if let Some(n) = maybe_n {
-                    result = result.max(n);
-                }
-            }
-            Err(_) => continue,
+        if let Ok(n) = digit_width(input) {
+            result = result.max(n);
         }
     }
     result
@@ -368,60 +424,68 @@ fn wc(inputs: Vec<Input>, settings: &Settings) -> Result<(), u32> {
     // The width is the number of digits needed to print the number of
     // bytes in the largest file. This is true regardless of whether
     // the `settings` indicate that the bytes will be displayed.
-    let mut error_count = 0;
-    let max_width = max_width(&inputs);
+    //
+    // If we only need to display a single number, set this to 0 to
+    // prevent leading spaces.
+    let mut failure = false;
+    let max_width = if settings.number_enabled() <= 1 {
+        0
+    } else {
+        max_width(&inputs)
+    };
 
     let mut total_word_count = WordCount::default();
 
     let num_inputs = inputs.len();
 
     for input in &inputs {
-        let word_count = word_count_from_input(input, settings).unwrap_or_else(|err| {
-            show_error(input, err);
-            error_count += 1;
-            WordCount::default()
-        });
+        let word_count = match word_count_from_input(input, settings) {
+            CountResult::Success(word_count) => word_count,
+            CountResult::Interrupted(word_count, error) => {
+                show_error(input, error);
+                failure = true;
+                word_count
+            }
+            CountResult::Failure(error) => {
+                show_error(input, error);
+                failure = true;
+                continue;
+            }
+        };
         total_word_count += word_count;
         let result = word_count.with_title(input.to_title());
         if let Err(err) = print_stats(settings, &result, max_width) {
             show_warning!(
                 "failed to print result for {}: {}",
-                result.title.unwrap_or("<stdin>"),
+                result
+                    .title
+                    .unwrap_or_else(|| "<stdin>".as_ref())
+                    .maybe_quote(),
                 err
             );
-            error_count += 1;
+            failure = true;
         }
     }
 
     if num_inputs > 1 {
-        let total_result = total_word_count.with_title(Some("total"));
+        let total_result = total_word_count.with_title(Some("total".as_ref()));
         if let Err(err) = print_stats(settings, &total_result, max_width) {
             show_warning!("failed to print total: {}", err);
-            error_count += 1;
+            failure = true;
         }
     }
 
-    if error_count == 0 {
-        Ok(())
+    if failure {
+        Err(1)
     } else {
-        Err(error_count)
+        Ok(())
     }
 }
 
-fn print_stats(
-    settings: &Settings,
-    result: &TitledWordCount,
-    mut min_width: usize,
-) -> WcResult<()> {
+fn print_stats(settings: &Settings, result: &TitledWordCount, min_width: usize) -> io::Result<()> {
     let stdout = io::stdout();
     let mut stdout_lock = stdout.lock();
 
-    if settings.number_enabled() <= 1 {
-        // Prevent a leading space in case we only need to display a single
-        // number.
-        min_width = 0;
-    }
-
     let mut is_first: bool = true;
 
     if settings.show_lines {
@@ -438,13 +502,6 @@ fn print_stats(
         write!(stdout_lock, "{:1$}", result.count.words, min_width)?;
         is_first = false;
     }
-    if settings.show_bytes {
-        if !is_first {
-            write!(stdout_lock, " ")?;
-        }
-        write!(stdout_lock, "{:1$}", result.count.bytes, min_width)?;
-        is_first = false;
-    }
     if settings.show_chars {
         if !is_first {
             write!(stdout_lock, " ")?;
@@ -452,6 +509,13 @@ fn print_stats(
         write!(stdout_lock, "{:1$}", result.count.chars, min_width)?;
         is_first = false;
     }
+    if settings.show_bytes {
+        if !is_first {
+            write!(stdout_lock, " ")?;
+        }
+        write!(stdout_lock, "{:1$}", result.count.bytes, min_width)?;
+        is_first = false;
+    }
     if settings.show_max_line_length {
         if !is_first {
             write!(stdout_lock, " ")?;
@@ -464,7 +528,7 @@ fn print_stats(
     }
 
     if let Some(title) = result.title {
-        writeln!(stdout_lock, " {}", title)?;
+        writeln!(stdout_lock, " {}", title.maybe_quote())?;
     } else {
         writeln!(stdout_lock)?;
     }
diff --git a/src/uu/wc/src/word_count.rs b/src/uu/wc/src/word_count.rs
index bdb510f58..617b811fc 100644
--- a/src/uu/wc/src/word_count.rs
+++ b/src/uu/wc/src/word_count.rs
@@ -1,19 +1,6 @@
 use std::cmp::max;
-use std::iter::Sum;
 use std::ops::{Add, AddAssign};
-use std::str::from_utf8;
-
-const CR: u8 = b'\r';
-const LF: u8 = b'\n';
-const SPACE: u8 = b' ';
-const TAB: u8 = b'\t';
-const SYN: u8 = 0x16_u8;
-const FF: u8 = 0x0C_u8;
-
-#[inline(always)]
-fn is_word_separator(byte: u8) -> bool {
-    byte == SPACE || byte == TAB || byte == CR || byte == SYN || byte == FF
-}
+use std::path::Path;
 
 #[derive(Debug, Default, Copy, Clone)]
 pub struct WordCount {
@@ -44,80 +31,10 @@ impl AddAssign for WordCount {
     }
 }
 
-impl Sum for WordCount {
-    fn sum<I>(iter: I) -> WordCount
-    where
-        I: Iterator<Item = WordCount>,
-    {
-        iter.fold(WordCount::default(), |acc, x| acc + x)
-    }
-}
-
 impl WordCount {
-    /// Count the characters and whitespace-separated words in the given bytes.
-    ///
-    /// `line` is a slice of bytes that will be decoded as ASCII characters.
-    fn ascii_word_and_char_count(line: &[u8]) -> (usize, usize) {
-        let word_count = line.split(|&x| is_word_separator(x)).count();
-        let char_count = line.iter().filter(|c| c.is_ascii()).count();
-        (word_count, char_count)
-    }
-
-    /// Create a [`WordCount`] from a sequence of bytes representing a line.
-    ///
-    /// If the last byte of `line` encodes a newline character (`\n`),
-    /// then the [`lines`] field will be set to 1. Otherwise, it will
-    /// be set to 0. The [`bytes`] field is simply the length of
-    /// `line`.
-    ///
-    /// If `decode_chars` is `false`, the [`chars`] and [`words`]
-    /// fields will be set to 0. If it is `true`, this function will
-    /// attempt to decode the bytes first as UTF-8, and failing that,
-    /// as ASCII.
-    pub fn from_line(line: &[u8], decode_chars: bool) -> WordCount {
-        // GNU 'wc' only counts lines that end in LF as lines
-        let lines = (*line.last().unwrap() == LF) as usize;
-        let bytes = line.len();
-        let (words, chars) = if decode_chars {
-            WordCount::word_and_char_count(line)
-        } else {
-            (0, 0)
-        };
-        // -L is a GNU 'wc' extension so same behavior on LF
-        let max_line_length = if chars > 0 { chars - lines } else { 0 };
-        WordCount {
-            bytes,
-            chars,
-            lines,
-            words,
-            max_line_length,
-        }
-    }
-
-    /// Count the UTF-8 characters and words in the given string slice.
-    ///
-    /// `s` is a string slice that is assumed to be a UTF-8 string.
-    fn utf8_word_and_char_count(s: &str) -> (usize, usize) {
-        let word_count = s.split_whitespace().count();
-        let char_count = s.chars().count();
-        (word_count, char_count)
-    }
-
-    pub fn with_title(self, title: Option<&str>) -> TitledWordCount {
+    pub fn with_title(self, title: Option<&Path>) -> TitledWordCount {
         TitledWordCount { title, count: self }
     }
-
-    /// Count the characters and words in the given slice of bytes.
-    ///
-    /// `line` is a slice of bytes that will be decoded as UTF-8
-    /// characters, or if that fails, as ASCII characters.
-    fn word_and_char_count(line: &[u8]) -> (usize, usize) {
-        // try and convert the bytes to UTF-8 first
-        match from_utf8(line) {
-            Ok(s) => WordCount::utf8_word_and_char_count(s),
-            Err(..) => WordCount::ascii_word_and_char_count(line),
-        }
-    }
 }
 
 /// This struct supplements the actual word count with an optional title that is
@@ -126,6 +43,6 @@ impl WordCount {
 /// it would result in unnecessary copying of `String`.
 #[derive(Debug, Default, Clone)]
 pub struct TitledWordCount<'a> {
-    pub title: Option<&'a str>,
+    pub title: Option<&'a Path>,
     pub count: WordCount,
 }
diff --git a/src/uu/who/Cargo.toml b/src/uu/who/Cargo.toml
index 1b3abe91e..c660be59d 100644
--- a/src/uu/who/Cargo.toml
+++ b/src/uu/who/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_who"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "who ~ (uutils) display information about currently logged-in users"
@@ -15,8 +15,8 @@ edition = "2018"
 path = "src/who.rs"
 
 [dependencies]
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["utmpx"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 clap = { version = "2.33", features = ["wrap_help"] }
 
 [[bin]]
diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs
index 6a9c88710..a975c82ba 100644
--- a/src/uu/who/src/who.rs
+++ b/src/uu/who/src/who.rs
@@ -44,8 +44,11 @@ static RUNLEVEL_HELP: &str = "print current runlevel";
 #[cfg(not(target_os = "linux"))]
 static RUNLEVEL_HELP: &str = "print current runlevel (This is meaningless on non Linux)";
 
-fn get_usage() -> String {
-    format!("{0} [OPTION]... [ FILE | ARG1 ARG2 ]", executable!())
+fn usage() -> String {
+    format!(
+        "{0} [OPTION]... [ FILE | ARG1 ARG2 ]",
+        uucore::execution_phrase()
+    )
 }
 
 fn get_long_usage() -> String {
@@ -61,7 +64,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         .collect_str(InvalidEncodingHandling::Ignore)
         .accept_any();
 
-    let usage = get_usage();
+    let usage = usage();
     let after_help = get_long_usage();
 
     let matches = uu_app()
@@ -160,7 +163,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    App::new(executable!())
+    App::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .arg(
@@ -338,15 +341,14 @@ impl Who {
             utmpx::DEFAULT_FILE
         };
         if self.short_list {
-            let users = Utmpx::iter_all_records()
-                .read_from(f)
+            let users = Utmpx::iter_all_records_from(f)
                 .filter(Utmpx::is_user_process)
                 .map(|ut| ut.user())
                 .collect::<Vec<_>>();
             println!("{}", users.join(" "));
             println!("# users={}", users.len());
         } else {
-            let records = Utmpx::iter_all_records().read_from(f).peekable();
+            let records = Utmpx::iter_all_records_from(f).peekable();
 
             if self.include_heading {
                 self.print_heading()
@@ -489,7 +491,7 @@ impl Who {
         };
 
         let s = if self.do_lookup {
-            safe_unwrap!(ut.canon_host())
+            crash_if_err!(1, ut.canon_host())
         } else {
             ut.host()
         };
diff --git a/src/uu/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml
index 919aab2e5..5af93579f 100644
--- a/src/uu/whoami/Cargo.toml
+++ b/src/uu/whoami/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_whoami"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "whoami ~ (uutils) display user name of current effective user ID"
@@ -16,12 +16,15 @@ path = "src/whoami.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "wide"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["entries"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["lmcons"] }
 
+[target.'cfg(unix)'.dependencies]
+libc = "0.2.42"
+
 [[bin]]
 name = "whoami"
 path = "src/main.rs"
diff --git a/src/uu/whoami/src/platform/unix.rs b/src/uu/whoami/src/platform/unix.rs
index 3d5fc6f54..1c0ea15d5 100644
--- a/src/uu/whoami/src/platform/unix.rs
+++ b/src/uu/whoami/src/platform/unix.rs
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-// spell-checker:ignore (ToDO) getusername
+use std::ffi::OsString;
+use std::io;
 
-use std::io::Result;
 use uucore::entries::uid2usr;
-use uucore::libc::geteuid;
 
-pub unsafe fn get_username() -> Result<String> {
-    // Get effective user id
-    let uid = geteuid();
-    uid2usr(uid)
+pub fn get_username() -> io::Result<OsString> {
+    // SAFETY: getuid() does nothing with memory and is always successful.
+    let uid = unsafe { libc::geteuid() };
+    // uid2usr should arguably return an OsString but currently doesn't
+    uid2usr(uid).map(Into::into)
 }
diff --git a/src/uu/whoami/src/platform/windows.rs b/src/uu/whoami/src/platform/windows.rs
index 3fe8eb1e7..a627bed8e 100644
--- a/src/uu/whoami/src/platform/windows.rs
+++ b/src/uu/whoami/src/platform/windows.rs
@@ -7,22 +7,21 @@
  * file that was distributed with this source code.
  */
 
-extern crate winapi;
+use std::ffi::OsString;
+use std::io;
+use std::os::windows::ffi::OsStringExt;
 
-use self::winapi::shared::lmcons;
-use self::winapi::shared::minwindef;
-use self::winapi::um::{winbase, winnt};
-use std::io::{Error, Result};
-use std::mem;
-use uucore::wide::FromWide;
+use winapi::shared::lmcons;
+use winapi::shared::minwindef::DWORD;
+use winapi::um::winbase;
 
-pub unsafe fn get_username() -> Result<String> {
-    #[allow(deprecated)]
-    let mut buffer: [winnt::WCHAR; lmcons::UNLEN as usize + 1] = mem::uninitialized();
-    let mut len = buffer.len() as minwindef::DWORD;
-    if winbase::GetUserNameW(buffer.as_mut_ptr(), &mut len) == 0 {
-        return Err(Error::last_os_error());
+pub fn get_username() -> io::Result<OsString> {
+    const BUF_LEN: DWORD = lmcons::UNLEN + 1;
+    let mut buffer = [0_u16; BUF_LEN as usize];
+    let mut len = BUF_LEN;
+    // SAFETY: buffer.len() == len
+    if unsafe { winbase::GetUserNameW(buffer.as_mut_ptr(), &mut len) } == 0 {
+        return Err(io::Error::last_os_error());
     }
-    let username = String::from_wide(&buffer[..len as usize - 1]);
-    Ok(username)
+    Ok(OsString::from_wide(&buffer[..len as usize - 1]))
 }
diff --git a/src/uu/whoami/src/whoami.rs b/src/uu/whoami/src/whoami.rs
index bd2eea1e3..0820588ee 100644
--- a/src/uu/whoami/src/whoami.rs
+++ b/src/uu/whoami/src/whoami.rs
@@ -1,5 +1,3 @@
-use clap::App;
-
 //  * This file is part of the uutils coreutils package.
 //  *
 //  * (c) Jordi Boggiano <j.boggiano@seld.be>
@@ -11,43 +9,26 @@ use clap::App;
 
 #[macro_use]
 extern crate clap;
-#[macro_use]
-extern crate uucore;
+
+use clap::App;
+
+use uucore::display::println_verbatim;
+use uucore::error::{FromIo, UResult};
 
 mod platform;
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let app = uu_app();
+static ABOUT: &str = "Print the current username.";
 
-    if let Err(err) = app.get_matches_from_safe(args) {
-        if err.kind == clap::ErrorKind::HelpDisplayed
-            || err.kind == clap::ErrorKind::VersionDisplayed
-        {
-            println!("{}", err);
-            0
-        } else {
-            show_error!("{}", err);
-            1
-        }
-    } else {
-        exec();
-
-        0
-    }
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    uu_app().get_matches_from(args);
+    let username = platform::get_username().map_err_context(|| "failed to get username".into())?;
+    println_verbatim(&username).map_err_context(|| "failed to print username".into())?;
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
-    app_from_crate!()
-}
-
-pub fn exec() {
-    unsafe {
-        match platform::get_username() {
-            Ok(username) => println!("{}", username),
-            Err(err) => match err.raw_os_error() {
-                Some(0) | None => crash!(1, "failed to get username"),
-                Some(_) => crash!(1, "failed to get username: {}", err),
-            },
-        }
-    }
+    App::new(uucore::util_name())
+        .version(crate_version!())
+        .about(ABOUT)
 }
diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml
index ff8465557..ad8a87b46 100644
--- a/src/uu/yes/Cargo.toml
+++ b/src/uu/yes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uu_yes"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["uutils developers"]
 license = "MIT"
 description = "yes ~ (uutils) repeatedly display a line with STRING (or 'y')"
@@ -16,13 +16,11 @@ path = "src/yes.rs"
 
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
-uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["zero-copy"] }
-uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
+uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["pipes"] }
+uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
-[features]
-default = []
-#
-latency = []
+[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+nix = "0.20.0"
 
 [[bin]]
 name = "yes"
diff --git a/src/uu/yes/src/splice.rs b/src/uu/yes/src/splice.rs
new file mode 100644
index 000000000..6f025d6a9
--- /dev/null
+++ b/src/uu/yes/src/splice.rs
@@ -0,0 +1,70 @@
+//! On Linux we can use vmsplice() to write data more efficiently.
+//!
+//! This does not always work. We're not allowed to splice to some targets,
+//! and on some systems (notably WSL 1) it isn't supported at all.
+//!
+//! If we get an error code that suggests splicing isn't supported then we
+//! tell that to the caller so it can fall back to a robust naïve method. If
+//! we get another kind of error we bubble it up as normal.
+//!
+//! vmsplice() can only splice into a pipe, so if the output is not a pipe
+//! we make our own and use splice() to bridge the gap from the pipe to the
+//! output.
+//!
+//! We assume that an "unsupported" error will only ever happen before any
+//! data was successfully written to the output. That way we don't have to
+//! make any effort to rescue data from the pipe if splice() fails, we can
+//! just fall back and start over from the beginning.
+
+use std::{io, os::unix::io::AsRawFd};
+
+use nix::{errno::Errno, libc::S_IFIFO, sys::stat::fstat};
+
+use uucore::pipes::{pipe, splice_exact, vmsplice};
+
+pub(crate) fn splice_data(bytes: &[u8], out: &impl AsRawFd) -> Result<()> {
+    let is_pipe = fstat(out.as_raw_fd())?.st_mode & S_IFIFO != 0;
+
+    if is_pipe {
+        loop {
+            let mut bytes = bytes;
+            while !bytes.is_empty() {
+                let len = vmsplice(out, bytes).map_err(maybe_unsupported)?;
+                bytes = &bytes[len..];
+            }
+        }
+    } else {
+        let (read, write) = pipe()?;
+        loop {
+            let mut bytes = bytes;
+            while !bytes.is_empty() {
+                let len = vmsplice(&write, bytes).map_err(maybe_unsupported)?;
+                splice_exact(&read, out, len).map_err(maybe_unsupported)?;
+                bytes = &bytes[len..];
+            }
+        }
+    }
+}
+
+pub(crate) enum Error {
+    Unsupported,
+    Io(io::Error),
+}
+
+type Result<T> = std::result::Result<T, Error>;
+
+impl From<nix::Error> for Error {
+    fn from(error: nix::Error) -> Self {
+        match error {
+            nix::Error::Sys(errno) => Error::Io(io::Error::from_raw_os_error(errno as i32)),
+            _ => Error::Io(io::Error::last_os_error()),
+        }
+    }
+}
+
+fn maybe_unsupported(error: nix::Error) -> Error {
+    match error.as_errno() {
+        Some(Errno::EINVAL) | Some(Errno::ENOSYS) | Some(Errno::EBADF) => Error::Unsupported,
+        _ => error.into(),
+    }
+}
diff --git a/src/uu/yes/src/yes.rs b/src/uu/yes/src/yes.rs
index 2c0d43000..bbedc0af1 100644
--- a/src/uu/yes/src/yes.rs
+++ b/src/uu/yes/src/yes.rs
@@ -7,37 +7,25 @@
 
 /* last synced with: yes (GNU coreutils) 8.13 */
 
-#[macro_use]
-extern crate clap;
-#[macro_use]
-extern crate uucore;
-
-use clap::{App, Arg};
 use std::borrow::Cow;
 use std::io::{self, Write};
-use uucore::zero_copy::ZeroCopyWriter;
+
+#[macro_use]
+extern crate clap;
+
+use clap::{App, Arg};
+use uucore::error::{UResult, USimpleError};
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+mod splice;
 
 // it's possible that using a smaller or larger buffer might provide better performance on some
 // systems, but honestly this is good enough
 const BUF_SIZE: usize = 16 * 1024;
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
-    let app = uu_app();
-
-    let matches = match app.get_matches_from_safe(args) {
-        Ok(m) => m,
-        Err(ref e)
-            if e.kind == clap::ErrorKind::HelpDisplayed
-                || e.kind == clap::ErrorKind::VersionDisplayed =>
-        {
-            println!("{}", e);
-            return 0;
-        }
-        Err(f) => {
-            show_error!("{}", f);
-            return 1;
-        }
-    };
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let matches = uu_app().get_matches_from(args);
 
     let string = if let Some(values) = matches.values_of("STRING") {
         let mut result = values.fold(String::new(), |res, s| res + s + " ");
@@ -51,16 +39,17 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let mut buffer = [0; BUF_SIZE];
     let bytes = prepare_buffer(&string, &mut buffer);
 
-    exec(bytes);
-
-    0
+    match exec(bytes) {
+        Ok(()) => Ok(()),
+        Err(err) if err.kind() == io::ErrorKind::BrokenPipe => Ok(()),
+        Err(err) => Err(USimpleError::new(1, format!("standard output: {}", err))),
+    }
 }
 
 pub fn uu_app() -> App<'static, 'static> {
     app_from_crate!().arg(Arg::with_name("STRING").index(1).multiple(true))
 }
 
-#[cfg(not(feature = "latency"))]
 fn prepare_buffer<'a>(input: &'a str, buffer: &'a mut [u8; BUF_SIZE]) -> &'a [u8] {
     if input.len() < BUF_SIZE / 2 {
         let mut size = 0;
@@ -75,16 +64,20 @@ fn prepare_buffer<'a>(input: &'a str, buffer: &'a mut [u8; BUF_SIZE]) -> &'a [u8
     }
 }
 
-#[cfg(feature = "latency")]
-fn prepare_buffer<'a>(input: &'a str, _buffer: &'a mut [u8; BUF_SIZE]) -> &'a [u8] {
-    input.as_bytes()
-}
+pub fn exec(bytes: &[u8]) -> io::Result<()> {
+    let stdout = io::stdout();
+    let mut stdout = stdout.lock();
+
+    #[cfg(any(target_os = "linux", target_os = "android"))]
+    {
+        match splice::splice_data(bytes, &stdout) {
+            Ok(_) => return Ok(()),
+            Err(splice::Error::Io(err)) => return Err(err),
+            Err(splice::Error::Unsupported) => (),
+        }
+    }
 
-pub fn exec(bytes: &[u8]) {
-    let mut stdout_raw = io::stdout();
-    let mut writer = ZeroCopyWriter::with_default(&mut stdout_raw, |stdout| stdout.lock());
     loop {
-        // TODO: needs to check if pipe fails
-        writer.write_all(bytes).unwrap();
+        stdout.write_all(bytes)?;
     }
 }
diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
index d62d89393..952eecc28 100644
--- a/src/uucore/Cargo.toml
+++ b/src/uucore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uucore"
-version = "0.0.9"
+version = "0.0.10"
 authors = ["uutils developers"]
 license = "MIT"
 description = "uutils ~ 'core' uutils code library (cross-platform)"
@@ -16,19 +16,24 @@ edition = "2018"
 path="src/lib/lib.rs"
 
 [dependencies]
-dns-lookup = "1.0.5"
+clap = "2.33.3"
+dns-lookup = { version="1.0.5", optional=true }
 dunce = "1.0.0"
 getopts = "<= 0.2.21"
-wild = "2.0.4"
+wild = "2.0"
 # * optional
 thiserror = { version="1.0", optional=true }
-lazy_static = { version="1.3", optional=true }
-nix = { version="<= 0.13", optional=true }
-platform-info = { version="<= 0.1", optional=true }
 time = { version="<= 0.1.43", optional=true }
 # * "problem" dependencies (pinned)
-data-encoding = { version="~2.1", optional=true } ## data-encoding: require v2.1; but v2.2.0 breaks the build for MinSRV v1.31.0
-libc = { version="0.2.15, <= 0.2.85", optional=true } ## libc: initial utmp support added in v0.2.15; but v0.2.68 breaks the build for MinSRV v1.31.0
+data-encoding = { version="2.1", optional=true }
+data-encoding-macro = { version="0.1.12", optional=true }
+z85 = { version="3.0.3", optional=true }
+libc = { version="0.2.15", optional=true }
+once_cell = "1.8.0"
+
+[target.'cfg(unix)'.dependencies]
+walkdir = { version="2.3.2", optional=true }
+nix = { version="0.20", optional=true }
 
 [dev-dependencies]
 clap = "2.33.3"
@@ -43,16 +48,16 @@ termion = "1.5"
 [features]
 default = []
 # * non-default features
-encoding = ["data-encoding", "thiserror"]
+encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
 entries = ["libc"]
 fs = ["libc"]
 fsext = ["libc", "time"]
 mode = ["libc"]
-perms = ["libc"]
+perms = ["libc", "walkdir"]
 process = ["libc"]
 ringbuffer = []
 signals = []
 utf8 = []
-utmpx = ["time", "libc"]
+utmpx = ["time", "libc", "dns-lookup"]
 wide = []
-zero-copy = ["nix", "libc", "lazy_static", "platform-info"]
+pipes = ["nix"]
diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs
index c1e1ec31e..546cbea87 100644
--- a/src/uucore/src/lib/features.rs
+++ b/src/uucore/src/lib/features.rs
@@ -8,11 +8,9 @@ pub mod fs;
 pub mod fsext;
 #[cfg(feature = "ringbuffer")]
 pub mod ringbuffer;
-#[cfg(feature = "zero-copy")]
-pub mod zero_copy;
 
 // * (platform-specific) feature-gated modules
-// ** non-windows
+// ** non-windows (i.e. Unix + Fuchsia)
 #[cfg(all(not(windows), feature = "mode"))]
 pub mod mode;
 
@@ -21,6 +19,8 @@ pub mod mode;
 pub mod entries;
 #[cfg(all(unix, feature = "perms"))]
 pub mod perms;
+#[cfg(all(unix, feature = "pipes"))]
+pub mod pipes;
 #[cfg(all(unix, feature = "process"))]
 pub mod process;
 
@@ -29,6 +29,7 @@ pub mod signals;
 #[cfg(all(
     unix,
     not(target_os = "fuchsia"),
+    not(target_os = "redox"),
     not(target_env = "musl"),
     feature = "utmpx"
 ))]
diff --git a/src/uucore/src/lib/features/encoding.rs b/src/uucore/src/lib/features/encoding.rs
index 03fa0ed8b..100866609 100644
--- a/src/uucore/src/lib/features/encoding.rs
+++ b/src/uucore/src/lib/features/encoding.rs
@@ -5,45 +5,95 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (strings) ABCDEFGHIJKLMNOPQRSTUVWXYZ
+// spell-checker:ignore (strings) ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKLMNOPQRSTUV
+// spell-checker:ignore (encodings) lsbf msbf hexupper
 
-extern crate data_encoding;
-
-use self::data_encoding::{DecodeError, BASE32, BASE64};
+use data_encoding::{self, BASE32, BASE64};
 
 use std::io::{self, Read, Write};
 
+use data_encoding::{Encoding, BASE32HEX, BASE64URL, HEXUPPER};
+use data_encoding_macro::new_encoding;
 #[cfg(feature = "thiserror")]
 use thiserror::Error;
 
 #[derive(Debug, Error)]
-pub enum EncodingError {
+pub enum DecodeError {
     #[error("{}", _0)]
-    Decode(#[from] DecodeError),
+    Decode(#[from] data_encoding::DecodeError),
+    #[error("{}", _0)]
+    DecodeZ85(#[from] z85::DecodeError),
     #[error("{}", _0)]
     Io(#[from] io::Error),
 }
 
-pub type DecodeResult = Result<Vec<u8>, EncodingError>;
+pub enum EncodeError {
+    Z85InputLenNotMultipleOf4,
+}
+
+pub type DecodeResult = Result<Vec<u8>, DecodeError>;
 
 #[derive(Clone, Copy)]
 pub enum Format {
-    Base32,
     Base64,
+    Base64Url,
+    Base32,
+    Base32Hex,
+    Base16,
+    Base2Lsbf,
+    Base2Msbf,
+    Z85,
 }
 use self::Format::*;
 
-pub fn encode(f: Format, input: &[u8]) -> String {
-    match f {
+const BASE2LSBF: Encoding = new_encoding! {
+    symbols: "01",
+    bit_order: LeastSignificantFirst,
+};
+const BASE2MSBF: Encoding = new_encoding! {
+    symbols: "01",
+    bit_order: MostSignificantFirst,
+};
+
+pub fn encode(f: Format, input: &[u8]) -> Result<String, EncodeError> {
+    Ok(match f {
         Base32 => BASE32.encode(input),
         Base64 => BASE64.encode(input),
-    }
+        Base64Url => BASE64URL.encode(input),
+        Base32Hex => BASE32HEX.encode(input),
+        Base16 => HEXUPPER.encode(input),
+        Base2Lsbf => BASE2LSBF.encode(input),
+        Base2Msbf => BASE2MSBF.encode(input),
+        Z85 => {
+            // According to the spec we should not accept inputs whose len is not a multiple of 4.
+            // However, the z85 crate implements a padded encoding and accepts such inputs. We have to manually check for them.
+            if input.len() % 4 != 0 {
+                return Err(EncodeError::Z85InputLenNotMultipleOf4);
+            } else {
+                z85::encode(input)
+            }
+        }
+    })
 }
 
 pub fn decode(f: Format, input: &[u8]) -> DecodeResult {
     Ok(match f {
         Base32 => BASE32.decode(input)?,
         Base64 => BASE64.decode(input)?,
+        Base64Url => BASE64URL.decode(input)?,
+        Base32Hex => BASE32HEX.decode(input)?,
+        Base16 => HEXUPPER.decode(input)?,
+        Base2Lsbf => BASE2LSBF.decode(input)?,
+        Base2Msbf => BASE2MSBF.decode(input)?,
+        Z85 => {
+            // The z85 crate implements a padded encoding by using a leading '#' which is otherwise not allowed.
+            // We manually check for a leading '#' and return an error ourselves.
+            if input.starts_with(&[b'#']) {
+                return Err(z85::DecodeError::InvalidByte(0, b'#').into());
+            } else {
+                z85::decode(input)?
+            }
+        }
     })
 }
 
@@ -65,6 +115,12 @@ impl<R: Read> Data<R> {
             alphabet: match format {
                 Base32 => b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=",
                 Base64 => b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789=+/",
+                Base64Url => b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789=_-",
+                Base32Hex => b"0123456789ABCDEFGHIJKLMNOPQRSTUV=",
+                Base16 => b"0123456789ABCDEF",
+                Base2Lsbf => b"01",
+                Base2Msbf => b"01",
+                Z85 => b"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-:+=^!/*?&<>()[]{}@%$#",
             },
         }
     }
@@ -90,7 +146,7 @@ impl<R: Read> Data<R> {
         decode(self.format, &buf)
     }
 
-    pub fn encode(&mut self) -> String {
+    pub fn encode(&mut self) -> Result<String, EncodeError> {
         let mut buf: Vec<u8> = vec![];
         self.input.read_to_end(&mut buf).unwrap();
         encode(self.format, buf.as_slice())
diff --git a/src/uucore/src/lib/features/entries.rs b/src/uucore/src/lib/features/entries.rs
index 6b986e616..f139d6871 100644
--- a/src/uucore/src/lib/features/entries.rs
+++ b/src/uucore/src/lib/features/entries.rs
@@ -37,7 +37,9 @@
 #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
 use libc::time_t;
 use libc::{c_char, c_int, gid_t, uid_t};
-use libc::{getgrgid, getgrnam, getgroups, getpwnam, getpwuid, group, passwd};
+#[cfg(not(target_os = "redox"))]
+use libc::{getgrgid, getgrnam, getgroups};
+use libc::{getpwnam, getpwuid, group, passwd};
 
 use std::borrow::Cow;
 use std::ffi::{CStr, CString};
@@ -65,6 +67,7 @@ extern "C" {
 /// > supplementary group IDs for the process is returned.  This allows
 /// > the caller to determine the size of a dynamically allocated list
 /// > to be used in a further call to getgroups().
+#[cfg(not(target_os = "redox"))]
 pub fn get_groups() -> IOResult<Vec<gid_t>> {
     let ngroups = unsafe { getgroups(0, ptr::null_mut()) };
     if ngroups == -1 {
@@ -104,7 +107,7 @@ pub fn get_groups() -> IOResult<Vec<gid_t>> {
 /// > groups is the same (in the mathematical sense of ``set''). (The
 /// > history of a process and its parents could affect the details of
 /// > the result.)
-#[cfg(all(unix, feature = "process"))]
+#[cfg(all(unix, not(target_os = "redox"), feature = "process"))]
 pub fn get_groups_gnu(arg_id: Option<u32>) -> IOResult<Vec<gid_t>> {
     let groups = get_groups()?;
     let egid = arg_id.unwrap_or_else(crate::features::process::getegid);
@@ -319,6 +322,7 @@ macro_rules! f {
 }
 
 f!(getpwnam, getpwuid, uid_t, Passwd);
+#[cfg(not(target_os = "redox"))]
 f!(getgrnam, getgrgid, gid_t, Group);
 
 #[inline]
@@ -326,6 +330,7 @@ pub fn uid2usr(id: uid_t) -> IOResult<String> {
     Passwd::locate(id).map(|p| p.name().into_owned())
 }
 
+#[cfg(not(target_os = "redox"))]
 #[inline]
 pub fn gid2grp(id: gid_t) -> IOResult<String> {
     Group::locate(id).map(|p| p.name().into_owned())
@@ -336,6 +341,7 @@ pub fn usr2uid(name: &str) -> IOResult<uid_t> {
     Passwd::locate(name).map(|p| p.uid())
 }
 
+#[cfg(not(target_os = "redox"))]
 #[inline]
 pub fn grp2gid(name: &str) -> IOResult<gid_t> {
     Group::locate(name).map(|p| p.gid())
diff --git a/src/uucore/src/lib/features/fs.rs b/src/uucore/src/lib/features/fs.rs
index 36bdbfed0..0b8079a5c 100644
--- a/src/uucore/src/lib/features/fs.rs
+++ b/src/uucore/src/lib/features/fs.rs
@@ -6,6 +6,8 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
+//! Set of functions to manage files and symlinks
+
 #[cfg(unix)]
 use libc::{
     mode_t, S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFREG, S_IFSOCK, S_IRGRP,
@@ -15,8 +17,7 @@ use libc::{
 use std::borrow::Cow;
 use std::env;
 use std::fs;
-#[cfg(target_os = "redox")]
-use std::io;
+use std::io::Error as IOError;
 use std::io::Result as IOResult;
 use std::io::{Error, ErrorKind};
 #[cfg(any(unix, target_os = "redox"))]
@@ -56,11 +57,8 @@ pub fn resolve_relative_path(path: &Path) -> Cow<Path> {
 
 /// Controls how symbolic links should be handled when canonicalizing a path.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum CanonicalizeMode {
-    /// Do not resolve any symbolic links.
-    None,
-
-    /// Resolve all symbolic links.
+pub enum MissingHandling {
+    /// Return an error if any part of the path is missing.
     Normal,
 
     /// Resolve symbolic links, ignoring errors on the final component.
@@ -70,6 +68,19 @@ pub enum CanonicalizeMode {
     Missing,
 }
 
+/// Controls when symbolic links are resolved
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum ResolveMode {
+    /// Do not resolve any symbolic links.
+    None,
+
+    /// Resolve symlinks as encountered when processing the path
+    Physical,
+
+    /// Resolve '..' elements before symlinks
+    Logical,
+}
+
 // copied from https://github.com/rust-lang/cargo/blob/2e4cfc2b7d43328b207879228a2ca7d427d188bb/src/cargo/util/paths.rs#L65-L90
 // both projects are MIT https://github.com/rust-lang/cargo/blob/master/LICENSE-MIT
 // for std impl progress see rfc https://github.com/rust-lang/rfcs/issues/2208
@@ -101,26 +112,42 @@ pub fn normalize_path(path: &Path) -> PathBuf {
     ret
 }
 
-fn resolve<P: AsRef<Path>>(original: P) -> IOResult<PathBuf> {
+fn resolve<P: AsRef<Path>>(original: P) -> Result<PathBuf, (PathBuf, IOError)> {
     const MAX_LINKS_FOLLOWED: u32 = 255;
     let mut followed = 0;
     let mut result = original.as_ref().to_path_buf();
+
+    let mut first_resolution = None;
     loop {
         if followed == MAX_LINKS_FOLLOWED {
-            return Err(Error::new(
-                ErrorKind::InvalidInput,
-                "maximum links followed",
+            return Err((
+                // When we hit MAX_LINKS_FOLLOWED we should return the first resolution (that's what GNU does - for whatever reason)
+                first_resolution.unwrap(),
+                Error::new(ErrorKind::InvalidInput, "maximum links followed"),
             ));
         }
 
-        if !fs::symlink_metadata(&result)?.file_type().is_symlink() {
-            break;
+        match fs::symlink_metadata(&result) {
+            Ok(meta) => {
+                if !meta.file_type().is_symlink() {
+                    break;
+                }
+            }
+            Err(e) => return Err((result, e)),
         }
 
         followed += 1;
-        let path = fs::read_link(&result)?;
-        result.pop();
-        result.push(path);
+        match fs::read_link(&result) {
+            Ok(path) => {
+                result.pop();
+                result.push(path);
+            }
+            Err(e) => return Err((result, e)),
+        }
+
+        if first_resolution.is_none() {
+            first_resolution = Some(result.clone());
+        }
     }
     Ok(result)
 }
@@ -130,20 +157,32 @@ fn resolve<P: AsRef<Path>>(original: P) -> IOResult<PathBuf> {
 /// This function is a generalization of [`std::fs::canonicalize`] that
 /// allows controlling how symbolic links are resolved and how to deal
 /// with missing components. It returns the canonical, absolute form of
-/// a path. The `can_mode` parameter controls how symbolic links are
-/// resolved:
+/// a path.
+/// The `miss_mode` parameter controls how missing path elements are handled
 ///
-/// * [`CanonicalizeMode::Normal`] makes this function behave like
+/// * [`MissingHandling::Normal`] makes this function behave like
 ///   [`std::fs::canonicalize`], resolving symbolic links and returning
 ///   an error if the path does not exist.
-/// * [`CanonicalizeMode::Missing`] makes this function ignore non-final
+/// * [`MissingHandling::Missing`] makes this function ignore non-final
 ///   components of the path that could not be resolved.
-/// * [`CanonicalizeMode::Existing`] makes this function return an error
+/// * [`MissingHandling::Existing`] makes this function return an error
 ///   if the final component of the path does not exist.
-/// * [`CanonicalizeMode::None`] makes this function not try to resolve
-///   any symbolic links.
 ///
-pub fn canonicalize<P: AsRef<Path>>(original: P, can_mode: CanonicalizeMode) -> IOResult<PathBuf> {
+/// The `res_mode` parameter controls how symbolic links are
+/// resolved:
+///
+/// * [`ResolveMode::None`] makes this function not try to resolve
+///   any symbolic links.
+/// * [`ResolveMode::Physical`] makes this function resolve symlinks as they
+///   are encountered
+/// * [`ResolveMode::Logical`] makes this function resolve '..' components
+///   before symlinks
+///
+pub fn canonicalize<P: AsRef<Path>>(
+    original: P,
+    miss_mode: MissingHandling,
+    res_mode: ResolveMode,
+) -> IOResult<PathBuf> {
     // Create an absolute path
     let original = original.as_ref();
     let original = if original.is_absolute() {
@@ -167,7 +206,11 @@ pub fn canonicalize<P: AsRef<Path>>(original: P, can_mode: CanonicalizeMode) ->
             }
             Component::CurDir => (),
             Component::ParentDir => {
-                parts.pop();
+                if res_mode == ResolveMode::Logical {
+                    parts.pop();
+                } else {
+                    parts.push(part.as_os_str());
+                }
             }
             Component::Normal(_) => {
                 parts.push(part.as_os_str());
@@ -180,35 +223,40 @@ pub fn canonicalize<P: AsRef<Path>>(original: P, can_mode: CanonicalizeMode) ->
         for part in parts[..parts.len() - 1].iter() {
             result.push(part);
 
-            if can_mode == CanonicalizeMode::None {
+            //resolve as we go to handle long relative paths on windows
+            if res_mode == ResolveMode::Physical {
+                result = normalize_path(&result);
+            }
+
+            if res_mode == ResolveMode::None {
                 continue;
             }
 
             match resolve(&result) {
-                Err(_) if can_mode == CanonicalizeMode::Missing => continue,
-                Err(e) => return Err(e),
+                Err((path, _)) if miss_mode == MissingHandling::Missing => result = path,
+                Err((_, e)) => return Err(e),
                 Ok(path) => {
-                    result.pop();
-                    result.push(path);
+                    result = path;
                 }
             }
         }
 
         result.push(parts.last().unwrap());
 
-        if can_mode == CanonicalizeMode::None {
+        if res_mode == ResolveMode::None {
             return Ok(result);
         }
 
         match resolve(&result) {
-            Err(e) if can_mode == CanonicalizeMode::Existing => {
+            Err((_, e)) if miss_mode == MissingHandling::Existing => {
                 return Err(e);
             }
-            Ok(path) => {
-                result.pop();
-                result.push(path);
+            Ok(path) | Err((path, _)) => {
+                result = path;
             }
-            Err(_) => (),
+        }
+        if res_mode == ResolveMode::Physical {
+            result = normalize_path(&result);
         }
     }
     Ok(result)
diff --git a/src/uucore/src/lib/features/fsext.rs b/src/uucore/src/lib/features/fsext.rs
index d3eec468a..97c1da79c 100644
--- a/src/uucore/src/lib/features/fsext.rs
+++ b/src/uucore/src/lib/features/fsext.rs
@@ -7,6 +7,8 @@
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
 
+//! Set of functions to manage file systems
+
 // spell-checker:ignore (arch) bitrig ; (fs) cifs smbfs
 
 extern crate time;
@@ -24,16 +26,12 @@ const MAX_PATH: usize = 266;
 static EXIT_ERR: i32 = 1;
 
 #[cfg(windows)]
-use std::ffi::OsString;
+use std::ffi::OsStr;
 #[cfg(windows)]
 use std::os::windows::ffi::OsStrExt;
 #[cfg(windows)]
-use std::os::windows::ffi::OsStringExt;
-#[cfg(windows)]
 use winapi::shared::minwindef::DWORD;
 #[cfg(windows)]
-use winapi::um::errhandlingapi::GetLastError;
-#[cfg(windows)]
 use winapi::um::fileapi::GetDiskFreeSpaceW;
 #[cfg(windows)]
 use winapi::um::fileapi::{
@@ -45,11 +43,12 @@ use winapi::um::handleapi::INVALID_HANDLE_VALUE;
 #[cfg(windows)]
 use winapi::um::winbase::DRIVE_REMOTE;
 
+// Warning: the pointer has to be used *immediately* or the Vec
+// it points to will be dropped!
 #[cfg(windows)]
 macro_rules! String2LPWSTR {
     ($str: expr) => {
-        OsString::from($str.clone())
-            .as_os_str()
+        OsStr::new(&$str)
             .encode_wide()
             .chain(Some(0))
             .collect::<Vec<u16>>()
@@ -60,10 +59,8 @@ macro_rules! String2LPWSTR {
 #[cfg(windows)]
 #[allow(non_snake_case)]
 fn LPWSTR2String(buf: &[u16]) -> String {
-    let len = unsafe { libc::wcslen(buf.as_ptr()) };
-    OsString::from_wide(&buf[..len as usize])
-        .into_string()
-        .unwrap()
+    let len = buf.iter().position(|&n| n == 0).unwrap();
+    String::from_utf16(&buf[..len]).unwrap()
 }
 
 use self::time::Timespec;
@@ -75,7 +72,6 @@ use std::borrow::Cow;
 use std::convert::{AsRef, From};
 #[cfg(unix)]
 use std::ffi::CString;
-#[cfg(unix)]
 use std::io::Error as IOError;
 #[cfg(unix)]
 use std::mem;
@@ -86,15 +82,15 @@ use std::time::UNIX_EPOCH;
     target_os = "linux",
     target_vendor = "apple",
     target_os = "android",
-    target_os = "freebsd"
+    target_os = "freebsd",
+    target_os = "openbsd"
 ))]
 pub use libc::statfs as StatFs;
 #[cfg(any(
-    target_os = "openbsd",
     target_os = "netbsd",
-    target_os = "openbsd",
     target_os = "bitrig",
-    target_os = "dragonfly"
+    target_os = "dragonfly",
+    target_os = "redox"
 ))]
 pub use libc::statvfs as StatFs;
 
@@ -102,15 +98,15 @@ pub use libc::statvfs as StatFs;
     target_os = "linux",
     target_vendor = "apple",
     target_os = "android",
-    target_os = "freebsd"
+    target_os = "freebsd",
+    target_os = "openbsd",
 ))]
 pub use libc::statfs as statfs_fn;
 #[cfg(any(
-    target_os = "openbsd",
     target_os = "netbsd",
-    target_os = "openbsd",
     target_os = "bitrig",
-    target_os = "dragonfly"
+    target_os = "dragonfly",
+    target_os = "redox"
 ))]
 pub use libc::statvfs as statfs_fn;
 
@@ -155,16 +151,14 @@ impl MountInfo {
     fn set_missing_fields(&mut self) {
         #[cfg(unix)]
         {
+            use std::os::unix::fs::MetadataExt;
             // We want to keep the dev_id on Windows
             // but set dev_id
-            let path = CString::new(self.mount_dir.clone()).unwrap();
-            unsafe {
-                let mut stat = mem::zeroed();
-                if libc::stat(path.as_ptr(), &mut stat) == 0 {
-                    self.dev_id = (stat.st_dev as i32).to_string();
-                } else {
-                    self.dev_id = "".to_string();
-                }
+            if let Ok(stat) = std::fs::metadata(&self.mount_dir) {
+                // Why do we cast this to i32?
+                self.dev_id = (stat.dev() as i32).to_string()
+            } else {
+                self.dev_id = "".to_string();
             }
         }
         // set MountInfo::dummy
@@ -245,8 +239,7 @@ impl MountInfo {
         volume_name.pop();
         unsafe {
             QueryDosDeviceW(
-                OsString::from(volume_name.clone())
-                    .as_os_str()
+                OsStr::new(&volume_name)
                     .encode_wide()
                     .chain(Some(0))
                     .skip(4)
@@ -307,9 +300,19 @@ impl MountInfo {
     }
 }
 
-#[cfg(any(target_vendor = "apple", target_os = "freebsd"))]
+#[cfg(any(
+    target_vendor = "apple",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 use std::ffi::CStr;
-#[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
+#[cfg(any(
+    target_os = "freebsd",
+    target_vendor = "apple",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 impl From<StatFs> for MountInfo {
     fn from(statfs: StatFs) -> Self {
         let mut info = MountInfo {
@@ -342,9 +345,19 @@ impl From<StatFs> for MountInfo {
     }
 }
 
-#[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
+#[cfg(any(
+    target_os = "freebsd",
+    target_vendor = "apple",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 use libc::c_int;
-#[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
+#[cfg(any(
+    target_os = "freebsd",
+    target_vendor = "apple",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 extern "C" {
     #[cfg(all(target_vendor = "apple", target_arch = "x86_64"))]
     #[link_name = "getmntinfo$INODE64"] // spell-checker:disable-line
@@ -352,6 +365,8 @@ extern "C" {
 
     #[cfg(any(
         all(target_os = "freebsd"),
+        all(target_os = "netbsd"),
+        all(target_os = "openbsd"),
         all(target_vendor = "apple", target_arch = "aarch64")
     ))]
     #[link_name = "getmntinfo"] // spell-checker:disable-line
@@ -362,9 +377,20 @@ extern "C" {
 use std::fs::File;
 #[cfg(target_os = "linux")]
 use std::io::{BufRead, BufReader};
-#[cfg(any(target_vendor = "apple", target_os = "freebsd", target_os = "windows"))]
+#[cfg(any(
+    target_vendor = "apple",
+    target_os = "freebsd",
+    target_os = "windows",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 use std::ptr;
-#[cfg(any(target_vendor = "apple", target_os = "freebsd"))]
+#[cfg(any(
+    target_vendor = "apple",
+    target_os = "freebsd",
+    target_os = "netbsd",
+    target_os = "openbsd"
+))]
 use std::slice;
 /// Read file system list.
 pub fn read_fs_list() -> Vec<MountInfo> {
@@ -384,7 +410,12 @@ pub fn read_fs_list() -> Vec<MountInfo> {
             })
             .collect::<Vec<_>>()
     }
-    #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
+    #[cfg(any(
+        target_os = "freebsd",
+        target_vendor = "apple",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    ))]
     {
         let mut mount_buffer_ptr: *mut StatFs = ptr::null_mut();
         let len = unsafe { get_mount_info(&mut mount_buffer_ptr, 1_i32) };
@@ -405,9 +436,11 @@ pub fn read_fs_list() -> Vec<MountInfo> {
             FindFirstVolumeW(volume_name_buf.as_mut_ptr(), volume_name_buf.len() as DWORD)
         };
         if INVALID_HANDLE_VALUE == find_handle {
-            crash!(EXIT_ERR, "FindFirstVolumeW failed: {}", unsafe {
-                GetLastError()
-            });
+            crash!(
+                EXIT_ERR,
+                "FindFirstVolumeW failed: {}",
+                IOError::last_os_error()
+            );
         }
         let mut mounts = Vec::<MountInfo>::new();
         loop {
@@ -426,8 +459,9 @@ pub fn read_fs_list() -> Vec<MountInfo> {
                     volume_name_buf.len() as DWORD,
                 )
             } {
-                let err = unsafe { GetLastError() };
-                if err != winapi::shared::winerror::ERROR_NO_MORE_FILES {
+                let err = IOError::last_os_error();
+                if err.raw_os_error() != Some(winapi::shared::winerror::ERROR_NO_MORE_FILES as i32)
+                {
                     crash!(EXIT_ERR, "FindNextVolumeW failed: {}", err);
                 }
                 break;
@@ -438,6 +472,11 @@ pub fn read_fs_list() -> Vec<MountInfo> {
         }
         mounts
     }
+    #[cfg(target_os = "redox")]
+    {
+        // No method to read mounts, yet
+        Vec::new()
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -482,7 +521,7 @@ impl FsUsage {
             crash!(
                 EXIT_ERR,
                 "GetVolumePathNamesForVolumeNameW failed: {}",
-                unsafe { GetLastError() }
+                IOError::last_os_error()
             );
         }
 
@@ -502,9 +541,11 @@ impl FsUsage {
         };
         if 0 == success {
             // Fails in case of CD for example
-            //crash!(EXIT_ERR, "GetDiskFreeSpaceW failed: {}", unsafe {
-            //GetLastError()
-            //});
+            // crash!(
+            //     EXIT_ERR,
+            //     "GetDiskFreeSpaceW failed: {}",
+            //     IOError::last_os_error()
+            // );
         }
 
         let bytes_per_cluster = sectors_per_cluster as u64 * bytes_per_sector as u64;
@@ -575,12 +616,17 @@ impl FsMeta for StatFs {
     fn io_size(&self) -> u64 {
         self.f_frsize as u64
     }
-    #[cfg(any(target_vendor = "apple", target_os = "freebsd"))]
+    #[cfg(any(target_vendor = "apple", target_os = "freebsd", target_os = "netbsd"))]
     fn io_size(&self) -> u64 {
         self.f_iosize as u64
     }
     // XXX: dunno if this is right
-    #[cfg(not(any(target_vendor = "apple", target_os = "freebsd", target_os = "linux")))]
+    #[cfg(not(any(
+        target_vendor = "apple",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "netbsd"
+    )))]
     fn io_size(&self) -> u64 {
         self.f_bsize as u64
     }
@@ -591,13 +637,23 @@ impl FsMeta for StatFs {
     //
     // Solaris, Irix and POSIX have a system call statvfs(2) that returns a
     // struct statvfs, containing an  unsigned  long  f_fsid
-    #[cfg(any(target_vendor = "apple", target_os = "freebsd", target_os = "linux"))]
+    #[cfg(any(
+        target_vendor = "apple",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "openbsd"
+    ))]
     fn fsid(&self) -> u64 {
         let f_fsid: &[u32; 2] =
             unsafe { &*(&self.f_fsid as *const libc::fsid_t as *const [u32; 2]) };
         (u64::from(f_fsid[0])) << 32 | u64::from(f_fsid[1])
     }
-    #[cfg(not(any(target_vendor = "apple", target_os = "freebsd", target_os = "linux")))]
+    #[cfg(not(any(
+        target_vendor = "apple",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "openbsd"
+    )))]
     fn fsid(&self) -> u64 {
         self.f_fsid as u64
     }
@@ -610,12 +666,18 @@ impl FsMeta for StatFs {
     fn namelen(&self) -> u64 {
         1024
     }
-    #[cfg(target_os = "freebsd")]
+    #[cfg(any(target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
     fn namelen(&self) -> u64 {
         self.f_namemax as u64 // spell-checker:disable-line
     }
     // XXX: should everything just use statvfs?
-    #[cfg(not(any(target_vendor = "apple", target_os = "freebsd", target_os = "linux")))]
+    #[cfg(not(any(
+        target_vendor = "apple",
+        target_os = "freebsd",
+        target_os = "linux",
+        target_os = "netbsd",
+        target_os = "openbsd"
+    )))]
     fn namelen(&self) -> u64 {
         self.f_namemax as u64 // spell-checker:disable-line
     }
diff --git a/src/uucore/src/lib/features/mode.rs b/src/uucore/src/lib/features/mode.rs
index fe109d73d..2206177a3 100644
--- a/src/uucore/src/lib/features/mode.rs
+++ b/src/uucore/src/lib/features/mode.rs
@@ -5,67 +5,68 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
+//! Set of functions to parse modes
+
 // spell-checker:ignore (vars) fperm srwx
 
-use libc::{mode_t, S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR};
+use libc::{mode_t, umask, S_IRGRP, S_IROTH, S_IRUSR, S_IWGRP, S_IWOTH, S_IWUSR};
 
-pub fn parse_numeric(fperm: u32, mut mode: &str) -> Result<u32, String> {
-    let (op, pos) = parse_op(mode, Some('='))?;
-    mode = mode[pos..].trim().trim_start_matches('0');
-    if mode.len() > 4 {
-        Err(format!("mode is too large ({} > 7777)", mode))
+pub fn parse_numeric(fperm: u32, mut mode: &str, considering_dir: bool) -> Result<u32, String> {
+    let (op, pos) = parse_op(mode).map_or_else(|_| (None, 0), |(op, pos)| (Some(op), pos));
+    mode = mode[pos..].trim();
+    let change = if mode.is_empty() {
+        0
     } else {
-        match u32::from_str_radix(mode, 8) {
-            Ok(change) => Ok(match op {
-                '+' => fperm | change,
-                '-' => fperm & !change,
-                '=' => change,
-                _ => unreachable!(),
-            }),
-            Err(err) => Err(err.to_string()),
-        }
+        u32::from_str_radix(mode, 8).map_err(|e| e.to_string())?
+    };
+    if change > 0o7777 {
+        Err(format!("mode is too large ({} > 7777", change))
+    } else {
+        Ok(match op {
+            Some('+') => fperm | change,
+            Some('-') => fperm & !change,
+            // If this is a directory, we keep the setgid and setuid bits,
+            // unless the mode contains 5 or more octal digits or the mode is "="
+            None if considering_dir && mode.len() < 5 => change | (fperm & (0o4000 | 0o2000)),
+            None | Some('=') => change,
+            Some(_) => unreachable!(),
+        })
     }
 }
 
 pub fn parse_symbolic(
     mut fperm: u32,
     mut mode: &str,
+    umask: u32,
     considering_dir: bool,
 ) -> Result<u32, String> {
-    #[cfg(unix)]
-    use libc::umask;
-
-    #[cfg(target_os = "redox")]
-    unsafe fn umask(_mask: u32) -> u32 {
-        // XXX Redox does not currently have umask
-        0
-    }
-
     let (mask, pos) = parse_levels(mode);
     if pos == mode.len() {
         return Err(format!("invalid mode ({})", mode));
     }
     let respect_umask = pos == 0;
-    let last_umask = unsafe { umask(0) };
     mode = &mode[pos..];
     while !mode.is_empty() {
-        let (op, pos) = parse_op(mode, None)?;
+        let (op, pos) = parse_op(mode)?;
         mode = &mode[pos..];
         let (mut srwx, pos) = parse_change(mode, fperm, considering_dir);
         if respect_umask {
-            srwx &= !(last_umask as u32);
+            srwx &= !(umask as u32);
         }
         mode = &mode[pos..];
         match op {
             '+' => fperm |= srwx & mask,
             '-' => fperm &= !(srwx & mask),
-            '=' => fperm = (fperm & !mask) | (srwx & mask),
+            '=' => {
+                if considering_dir {
+                    // keep the setgid and setuid bits for directories
+                    srwx |= fperm & (0o4000 | 0o2000);
+                }
+                fperm = (fperm & !mask) | (srwx & mask)
+            }
             _ => unreachable!(),
         }
     }
-    unsafe {
-        umask(last_umask);
-    }
     Ok(fperm)
 }
 
@@ -74,9 +75,9 @@ fn parse_levels(mode: &str) -> (u32, usize) {
     let mut pos = 0;
     for ch in mode.chars() {
         mask |= match ch {
-            'u' => 0o7700,
-            'g' => 0o7070,
-            'o' => 0o7007,
+            'u' => 0o4700,
+            'g' => 0o2070,
+            'o' => 0o1007,
             'a' => 0o7777,
             _ => break,
         };
@@ -88,24 +89,22 @@ fn parse_levels(mode: &str) -> (u32, usize) {
     (mask, pos)
 }
 
-fn parse_op(mode: &str, default: Option<char>) -> Result<(char, usize), String> {
+fn parse_op(mode: &str) -> Result<(char, usize), String> {
     let ch = mode
         .chars()
         .next()
         .ok_or_else(|| "unexpected end of mode".to_owned())?;
-    Ok(match ch {
-        '+' | '-' | '=' => (ch, 1),
-        _ => {
-            let ch = default.ok_or_else(|| {
-                format!("invalid operator (expected +, -, or =, but found {})", ch)
-            })?;
-            (ch, 0)
-        }
-    })
+    match ch {
+        '+' | '-' | '=' => Ok((ch, 1)),
+        _ => Err(format!(
+            "invalid operator (expected +, -, or =, but found {})",
+            ch
+        )),
+    }
 }
 
 fn parse_change(mode: &str, fperm: u32, considering_dir: bool) -> (u32, usize) {
-    let mut srwx = fperm & 0o7000;
+    let mut srwx = 0;
     let mut pos = 0;
     for ch in mode.chars() {
         match ch {
@@ -136,13 +135,49 @@ pub fn parse_mode(mode: &str) -> Result<mode_t, String> {
     let fperm = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
     let arr: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
     let result = if mode.contains(arr) {
-        parse_numeric(fperm as u32, mode)
+        parse_numeric(fperm as u32, mode, true)
     } else {
-        parse_symbolic(fperm as u32, mode, true)
+        parse_symbolic(fperm as u32, mode, get_umask(), true)
     };
     result.map(|mode| mode as mode_t)
 }
 
+pub fn get_umask() -> u32 {
+    // There's no portable way to read the umask without changing it.
+    // We have to replace it and then quickly set it back, hopefully before
+    // some other thread is affected.
+    // On modern Linux kernels the current umask could instead be read
+    // from /proc/self/status. But that's a lot of work.
+    // SAFETY: umask always succeeds and doesn't operate on memory. Races are
+    // possible but it can't violate Rust's guarantees.
+    let mask = unsafe { umask(0) };
+    unsafe { umask(mask) };
+    mask as u32
+}
+
+// Iterate 'args' and delete the first occurrence
+// of a prefix '-' if it's associated with MODE
+// e.g. "chmod -v -xw -R FILE" -> "chmod -v xw -R FILE"
+pub fn strip_minus_from_mode(args: &mut Vec<String>) -> bool {
+    for arg in args {
+        if arg == "--" {
+            break;
+        }
+        if let Some(arg_stripped) = arg.strip_prefix('-') {
+            if let Some(second) = arg.chars().nth(1) {
+                match second {
+                    'r' | 'w' | 'x' | 'X' | 's' | 't' | 'u' | 'g' | 'o' | '0'..='7' => {
+                        *arg = arg_stripped.to_string();
+                        return true;
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+    false
+}
+
 #[cfg(test)]
 mod test {
 
diff --git a/src/uucore/src/lib/features/perms.rs b/src/uucore/src/lib/features/perms.rs
index 89c30b53b..16ee01b88 100644
--- a/src/uucore/src/lib/features/perms.rs
+++ b/src/uucore/src/lib/features/perms.rs
@@ -3,8 +3,20 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
+//! Common functions to manage permissions
+
+use crate::display::Quotable;
+use crate::error::strip_errno;
+use crate::error::UResult;
+use crate::error::USimpleError;
 pub use crate::features::entries;
-use libc::{self, gid_t, lchown, uid_t};
+use crate::fs::resolve_relative_path;
+use crate::show_error;
+use clap::App;
+use clap::Arg;
+use clap::ArgMatches;
+use libc::{self, gid_t, uid_t};
+use walkdir::WalkDir;
 
 use std::io::Error as IOError;
 use std::io::Result as IOResult;
@@ -18,85 +30,16 @@ use std::path::Path;
 
 /// The various level of verbosity
 #[derive(PartialEq, Clone, Debug)]
-pub enum Verbosity {
+pub enum VerbosityLevel {
     Silent,
     Changes,
     Verbose,
     Normal,
 }
-
-/// Actually perform the change of group on a path
-fn chgrp<P: AsRef<Path>>(path: P, gid: gid_t, follow: bool) -> IOResult<()> {
-    let path = path.as_ref();
-    let s = CString::new(path.as_os_str().as_bytes()).unwrap();
-    let ret = unsafe {
-        if follow {
-            libc::chown(s.as_ptr(), 0_u32.wrapping_sub(1), gid)
-        } else {
-            lchown(s.as_ptr(), 0_u32.wrapping_sub(1), gid)
-        }
-    };
-    if ret == 0 {
-        Ok(())
-    } else {
-        Err(IOError::last_os_error())
-    }
-}
-
-/// Perform the change of group on a path
-/// with the various options
-/// and error messages management
-pub fn wrap_chgrp<P: AsRef<Path>>(
-    path: P,
-    meta: &Metadata,
-    dest_gid: gid_t,
-    follow: bool,
-    verbosity: Verbosity,
-) -> Result<String, String> {
-    use self::Verbosity::*;
-    let path = path.as_ref();
-    let mut out: String = String::new();
-
-    if let Err(e) = chgrp(path, dest_gid, follow) {
-        match verbosity {
-            Silent => (),
-            _ => {
-                out = format!("changing group of '{}': {}", path.display(), e);
-                if verbosity == Verbose {
-                    out = format!(
-                        "{}\nfailed to change group of '{}' from {} to {}",
-                        out,
-                        path.display(),
-                        entries::gid2grp(meta.gid()).unwrap(),
-                        entries::gid2grp(dest_gid).unwrap()
-                    );
-                };
-            }
-        }
-        return Err(out);
-    } else {
-        let changed = dest_gid != meta.gid();
-        if changed {
-            match verbosity {
-                Changes | Verbose => {
-                    out = format!(
-                        "changed group of '{}' from {} to {}",
-                        path.display(),
-                        entries::gid2grp(meta.gid()).unwrap(),
-                        entries::gid2grp(dest_gid).unwrap()
-                    );
-                }
-                _ => (),
-            };
-        } else if verbosity == Verbose {
-            out = format!(
-                "group of '{}' retained as {}",
-                path.display(),
-                entries::gid2grp(dest_gid).unwrap_or_default()
-            );
-        }
-    }
-    Ok(out)
+#[derive(PartialEq, Clone, Debug)]
+pub struct Verbosity {
+    pub groups_only: bool,
+    pub level: VerbosityLevel,
 }
 
 /// Actually perform the change of owner on a path
@@ -107,7 +50,7 @@ fn chown<P: AsRef<Path>>(path: P, uid: uid_t, gid: gid_t, follow: bool) -> IORes
         if follow {
             libc::chown(s.as_ptr(), uid, gid)
         } else {
-            lchown(s.as_ptr(), uid, gid)
+            libc::lchown(s.as_ptr(), uid, gid)
         }
     };
     if ret == 0 {
@@ -128,27 +71,45 @@ pub fn wrap_chown<P: AsRef<Path>>(
     follow: bool,
     verbosity: Verbosity,
 ) -> Result<String, String> {
-    use self::Verbosity::*;
     let dest_uid = dest_uid.unwrap_or_else(|| meta.uid());
     let dest_gid = dest_gid.unwrap_or_else(|| meta.gid());
     let path = path.as_ref();
     let mut out: String = String::new();
 
     if let Err(e) = chown(path, dest_uid, dest_gid, follow) {
-        match verbosity {
-            Silent => (),
-            _ => {
-                out = format!("changing ownership of '{}': {}", path.display(), e);
-                if verbosity == Verbose {
-                    out = format!(
-                        "{}\nfailed to change ownership of '{}' from {}:{} to {}:{}",
-                        out,
-                        path.display(),
-                        entries::uid2usr(meta.uid()).unwrap(),
-                        entries::gid2grp(meta.gid()).unwrap(),
-                        entries::uid2usr(dest_uid).unwrap(),
-                        entries::gid2grp(dest_gid).unwrap()
-                    );
+        match verbosity.level {
+            VerbosityLevel::Silent => (),
+            level => {
+                out = format!(
+                    "changing {} of {}: {}",
+                    if verbosity.groups_only {
+                        "group"
+                    } else {
+                        "ownership"
+                    },
+                    path.quote(),
+                    e
+                );
+                if level == VerbosityLevel::Verbose {
+                    out = if verbosity.groups_only {
+                        format!(
+                            "{}\nfailed to change group of {} from {} to {}",
+                            out,
+                            path.quote(),
+                            entries::gid2grp(meta.gid()).unwrap(),
+                            entries::gid2grp(dest_gid).unwrap()
+                        )
+                    } else {
+                        format!(
+                            "{}\nfailed to change ownership of {} from {}:{} to {}:{}",
+                            out,
+                            path.quote(),
+                            entries::uid2usr(meta.uid()).unwrap(),
+                            entries::gid2grp(meta.gid()).unwrap(),
+                            entries::uid2usr(dest_uid).unwrap(),
+                            entries::gid2grp(dest_gid).unwrap()
+                        )
+                    };
                 };
             }
         }
@@ -156,27 +117,412 @@ pub fn wrap_chown<P: AsRef<Path>>(
     } else {
         let changed = dest_uid != meta.uid() || dest_gid != meta.gid();
         if changed {
-            match verbosity {
-                Changes | Verbose => {
-                    out = format!(
-                        "changed ownership of '{}' from {}:{} to {}:{}",
-                        path.display(),
-                        entries::uid2usr(meta.uid()).unwrap(),
-                        entries::gid2grp(meta.gid()).unwrap(),
-                        entries::uid2usr(dest_uid).unwrap(),
-                        entries::gid2grp(dest_gid).unwrap()
-                    );
+            match verbosity.level {
+                VerbosityLevel::Changes | VerbosityLevel::Verbose => {
+                    out = if verbosity.groups_only {
+                        format!(
+                            "changed group of {} from {} to {}",
+                            path.quote(),
+                            entries::gid2grp(meta.gid()).unwrap(),
+                            entries::gid2grp(dest_gid).unwrap()
+                        )
+                    } else {
+                        format!(
+                            "changed ownership of {} from {}:{} to {}:{}",
+                            path.quote(),
+                            entries::uid2usr(meta.uid()).unwrap(),
+                            entries::gid2grp(meta.gid()).unwrap(),
+                            entries::uid2usr(dest_uid).unwrap(),
+                            entries::gid2grp(dest_gid).unwrap()
+                        )
+                    };
                 }
                 _ => (),
             };
-        } else if verbosity == Verbose {
-            out = format!(
-                "ownership of '{}' retained as {}:{}",
-                path.display(),
-                entries::uid2usr(dest_uid).unwrap(),
-                entries::gid2grp(dest_gid).unwrap()
-            );
+        } else if verbosity.level == VerbosityLevel::Verbose {
+            out = if verbosity.groups_only {
+                format!(
+                    "group of {} retained as {}",
+                    path.quote(),
+                    entries::gid2grp(dest_gid).unwrap_or_default()
+                )
+            } else {
+                format!(
+                    "ownership of {} retained as {}:{}",
+                    path.quote(),
+                    entries::uid2usr(dest_uid).unwrap(),
+                    entries::gid2grp(dest_gid).unwrap()
+                )
+            };
         }
     }
     Ok(out)
 }
+
+pub enum IfFrom {
+    All,
+    User(u32),
+    Group(u32),
+    UserGroup(u32, u32),
+}
+
+#[derive(PartialEq, Eq)]
+pub enum TraverseSymlinks {
+    None,
+    First,
+    All,
+}
+
+pub struct ChownExecutor {
+    pub dest_uid: Option<u32>,
+    pub dest_gid: Option<u32>,
+    pub traverse_symlinks: TraverseSymlinks,
+    pub verbosity: Verbosity,
+    pub filter: IfFrom,
+    pub files: Vec<String>,
+    pub recursive: bool,
+    pub preserve_root: bool,
+    pub dereference: bool,
+}
+
+impl ChownExecutor {
+    pub fn exec(&self) -> UResult<()> {
+        let mut ret = 0;
+        for f in &self.files {
+            ret |= self.traverse(f);
+        }
+        if ret != 0 {
+            return Err(ret.into());
+        }
+        Ok(())
+    }
+
+    fn traverse<P: AsRef<Path>>(&self, root: P) -> i32 {
+        let path = root.as_ref();
+        let meta = match self.obtain_meta(path, self.dereference) {
+            Some(m) => m,
+            _ => return 1,
+        };
+
+        // Prohibit only if:
+        // (--preserve-root and -R present) &&
+        // (
+        //     (argument is not symlink && resolved to be '/') ||
+        //     (argument is symlink && should follow argument && resolved to be '/')
+        // )
+        if self.recursive && self.preserve_root {
+            let may_exist = if self.dereference {
+                path.canonicalize().ok()
+            } else {
+                let real = resolve_relative_path(path);
+                if real.is_dir() {
+                    Some(real.canonicalize().expect("failed to get real path"))
+                } else {
+                    Some(real.into_owned())
+                }
+            };
+
+            if let Some(p) = may_exist {
+                if p.parent().is_none() {
+                    show_error!("it is dangerous to operate recursively on '/'");
+                    show_error!("use --no-preserve-root to override this failsafe");
+                    return 1;
+                }
+            }
+        }
+
+        let ret = if self.matched(meta.uid(), meta.gid()) {
+            match wrap_chown(
+                path,
+                &meta,
+                self.dest_uid,
+                self.dest_gid,
+                self.dereference,
+                self.verbosity.clone(),
+            ) {
+                Ok(n) => {
+                    if !n.is_empty() {
+                        show_error!("{}", n);
+                    }
+                    0
+                }
+                Err(e) => {
+                    if self.verbosity.level != VerbosityLevel::Silent {
+                        show_error!("{}", e);
+                    }
+                    1
+                }
+            }
+        } else {
+            0
+        };
+
+        if !self.recursive {
+            ret
+        } else {
+            ret | self.dive_into(&root)
+        }
+    }
+
+    fn dive_into<P: AsRef<Path>>(&self, root: P) -> i32 {
+        let root = root.as_ref();
+
+        // walkdir always dereferences the root directory, so we have to check it ourselves
+        // TODO: replace with `root.is_symlink()` once it is stable
+        if self.traverse_symlinks == TraverseSymlinks::None
+            && std::fs::symlink_metadata(root)
+                .map(|m| m.file_type().is_symlink())
+                .unwrap_or(false)
+        {
+            return 0;
+        }
+
+        let mut ret = 0;
+        let mut iterator = WalkDir::new(root)
+            .follow_links(self.traverse_symlinks == TraverseSymlinks::All)
+            .min_depth(1)
+            .into_iter();
+        // We can't use a for loop because we need to manipulate the iterator inside the loop.
+        while let Some(entry) = iterator.next() {
+            let entry = match entry {
+                Err(e) => {
+                    ret = 1;
+                    if let Some(path) = e.path() {
+                        show_error!(
+                            "cannot access '{}': {}",
+                            path.display(),
+                            if let Some(error) = e.io_error() {
+                                strip_errno(error)
+                            } else {
+                                "Too many levels of symbolic links".into()
+                            }
+                        )
+                    } else {
+                        show_error!("{}", e)
+                    }
+                    continue;
+                }
+                Ok(entry) => entry,
+            };
+            let path = entry.path();
+            let meta = match self.obtain_meta(path, self.dereference) {
+                Some(m) => m,
+                _ => {
+                    ret = 1;
+                    if entry.file_type().is_dir() {
+                        // Instruct walkdir to skip this directory to avoid getting another error
+                        // when walkdir tries to query the children of this directory.
+                        iterator.skip_current_dir();
+                    }
+                    continue;
+                }
+            };
+
+            if !self.matched(meta.uid(), meta.gid()) {
+                continue;
+            }
+
+            ret = match wrap_chown(
+                path,
+                &meta,
+                self.dest_uid,
+                self.dest_gid,
+                self.dereference,
+                self.verbosity.clone(),
+            ) {
+                Ok(n) => {
+                    if !n.is_empty() {
+                        show_error!("{}", n);
+                    }
+                    0
+                }
+                Err(e) => {
+                    if self.verbosity.level != VerbosityLevel::Silent {
+                        show_error!("{}", e);
+                    }
+                    1
+                }
+            }
+        }
+        ret
+    }
+
+    fn obtain_meta<P: AsRef<Path>>(&self, path: P, follow: bool) -> Option<Metadata> {
+        let path = path.as_ref();
+        let meta = if follow {
+            path.metadata()
+        } else {
+            path.symlink_metadata()
+        };
+        match meta {
+            Err(e) => {
+                match self.verbosity.level {
+                    VerbosityLevel::Silent => (),
+                    _ => show_error!(
+                        "cannot {} {}: {}",
+                        if follow { "dereference" } else { "access" },
+                        path.quote(),
+                        strip_errno(&e)
+                    ),
+                }
+                None
+            }
+            Ok(meta) => Some(meta),
+        }
+    }
+
+    #[inline]
+    fn matched(&self, uid: uid_t, gid: gid_t) -> bool {
+        match self.filter {
+            IfFrom::All => true,
+            IfFrom::User(u) => u == uid,
+            IfFrom::Group(g) => g == gid,
+            IfFrom::UserGroup(u, g) => u == uid && g == gid,
+        }
+    }
+}
+
+pub mod options {
+    pub mod verbosity {
+        pub const CHANGES: &str = "changes";
+        pub const QUIET: &str = "quiet";
+        pub const SILENT: &str = "silent";
+        pub const VERBOSE: &str = "verbose";
+    }
+    pub mod preserve_root {
+        pub const PRESERVE: &str = "preserve-root";
+        pub const NO_PRESERVE: &str = "no-preserve-root";
+    }
+    pub mod dereference {
+        pub const DEREFERENCE: &str = "dereference";
+        pub const NO_DEREFERENCE: &str = "no-dereference";
+    }
+    pub const FROM: &str = "from";
+    pub const RECURSIVE: &str = "recursive";
+    pub mod traverse {
+        pub const TRAVERSE: &str = "H";
+        pub const NO_TRAVERSE: &str = "P";
+        pub const EVERY: &str = "L";
+    }
+    pub const REFERENCE: &str = "reference";
+    pub const ARG_OWNER: &str = "OWNER";
+    pub const ARG_GROUP: &str = "GROUP";
+    pub const ARG_FILES: &str = "FILE";
+}
+
+type GidUidFilterParser<'a> = fn(&ArgMatches<'a>) -> UResult<(Option<u32>, Option<u32>, IfFrom)>;
+
+/// Base implementation for `chgrp` and `chown`.
+///
+/// An argument called `add_arg_if_not_reference` will be added to `app` if
+/// `args` does not contain the `--reference` option.
+/// `parse_gid_uid_and_filter` will be called to obtain the target gid and uid, and the filter,
+/// from `ArgMatches`.
+/// `groups_only` determines whether verbose output will only mention the group.
+pub fn chown_base<'a>(
+    mut app: App<'a, 'a>,
+    args: impl crate::Args,
+    add_arg_if_not_reference: &'a str,
+    parse_gid_uid_and_filter: GidUidFilterParser<'a>,
+    groups_only: bool,
+) -> UResult<()> {
+    let args: Vec<_> = args.collect();
+    let mut reference = false;
+    let mut help = false;
+    // stop processing options on --
+    for arg in args.iter().take_while(|s| *s != "--") {
+        if arg.to_string_lossy().starts_with("--reference=") || arg == "--reference" {
+            reference = true;
+        } else if arg == "--help" {
+            // we stop processing once we see --help,
+            // as it doesn't matter if we've seen reference or not
+            help = true;
+            break;
+        }
+    }
+
+    if help || !reference {
+        // add both positional arguments
+        // arg_group is only required if
+        app = app.arg(
+            Arg::with_name(add_arg_if_not_reference)
+                .value_name(add_arg_if_not_reference)
+                .required(true)
+                .takes_value(true)
+                .multiple(false),
+        )
+    }
+    app = app.arg(
+        Arg::with_name(options::ARG_FILES)
+            .value_name(options::ARG_FILES)
+            .multiple(true)
+            .takes_value(true)
+            .required(true)
+            .min_values(1),
+    );
+    let matches = app.get_matches_from(args);
+
+    let files: Vec<String> = matches
+        .values_of(options::ARG_FILES)
+        .map(|v| v.map(ToString::to_string).collect())
+        .unwrap_or_default();
+
+    let preserve_root = matches.is_present(options::preserve_root::PRESERVE);
+
+    let mut dereference = if matches.is_present(options::dereference::DEREFERENCE) {
+        Some(true)
+    } else if matches.is_present(options::dereference::NO_DEREFERENCE) {
+        Some(false)
+    } else {
+        None
+    };
+
+    let mut traverse_symlinks = if matches.is_present(options::traverse::TRAVERSE) {
+        TraverseSymlinks::First
+    } else if matches.is_present(options::traverse::EVERY) {
+        TraverseSymlinks::All
+    } else {
+        TraverseSymlinks::None
+    };
+
+    let recursive = matches.is_present(options::RECURSIVE);
+    if recursive {
+        if traverse_symlinks == TraverseSymlinks::None {
+            if dereference == Some(true) {
+                return Err(USimpleError::new(1, "-R --dereference requires -H or -L"));
+            }
+            dereference = Some(false);
+        }
+    } else {
+        traverse_symlinks = TraverseSymlinks::None;
+    }
+
+    let verbosity_level = if matches.is_present(options::verbosity::CHANGES) {
+        VerbosityLevel::Changes
+    } else if matches.is_present(options::verbosity::SILENT)
+        || matches.is_present(options::verbosity::QUIET)
+    {
+        VerbosityLevel::Silent
+    } else if matches.is_present(options::verbosity::VERBOSE) {
+        VerbosityLevel::Verbose
+    } else {
+        VerbosityLevel::Normal
+    };
+    let (dest_gid, dest_uid, filter) = parse_gid_uid_and_filter(&matches)?;
+
+    let executor = ChownExecutor {
+        traverse_symlinks,
+        dest_gid,
+        dest_uid,
+        verbosity: Verbosity {
+            groups_only,
+            level: verbosity_level,
+        },
+        recursive,
+        dereference: dereference.unwrap_or(true),
+        preserve_root,
+        files,
+        filter,
+    };
+    executor.exec()
+}
diff --git a/src/uucore/src/lib/features/pipes.rs b/src/uucore/src/lib/features/pipes.rs
new file mode 100644
index 000000000..b375982dd
--- /dev/null
+++ b/src/uucore/src/lib/features/pipes.rs
@@ -0,0 +1,69 @@
+/// Thin pipe-related wrappers around functions from the `nix` crate.
+use std::fs::File;
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use std::os::unix::io::AsRawFd;
+use std::os::unix::io::FromRawFd;
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+use nix::{fcntl::SpliceFFlags, sys::uio::IoVec};
+
+pub use nix::{Error, Result};
+
+/// A wrapper around [`nix::unistd::Pipe`] that ensures the pipe is cleaned up.
+///
+/// Returns two `File` objects: everything written to the second can be read
+/// from the first.
+pub fn pipe() -> Result<(File, File)> {
+    let (read, write) = nix::unistd::pipe()?;
+    // SAFETY: The file descriptors do not have other owners.
+    unsafe { Ok((File::from_raw_fd(read), File::from_raw_fd(write))) }
+}
+
+/// Less noisy wrapper around [`nix::fcntl::splice`].
+///
+/// Up to `len` bytes are moved from `source` to `target`. Returns the number
+/// of successfully moved bytes.
+///
+/// At least one of `source` and `target` must be some sort of pipe.
+/// To get around this requirement, consider splicing from your source into
+/// a [`pipe`] and then from the pipe into your target (with `splice_exact`):
+/// this is still very efficient.
+#[cfg(any(target_os = "linux", target_os = "android"))]
+pub fn splice(source: &impl AsRawFd, target: &impl AsRawFd, len: usize) -> Result<usize> {
+    nix::fcntl::splice(
+        source.as_raw_fd(),
+        None,
+        target.as_raw_fd(),
+        None,
+        len,
+        SpliceFFlags::empty(),
+    )
+}
+
+/// Splice wrapper which fully finishes the write.
+///
+/// Exactly `len` bytes are moved from `source` into `target`.
+///
+/// Panics if `source` runs out of data before `len` bytes have been moved.
+#[cfg(any(target_os = "linux", target_os = "android"))]
+pub fn splice_exact(source: &impl AsRawFd, target: &impl AsRawFd, len: usize) -> Result<()> {
+    let mut left = len;
+    while left != 0 {
+        let written = splice(source, target, left)?;
+        assert_ne!(written, 0, "unexpected end of data");
+        left -= written;
+    }
+    Ok(())
+}
+
+/// Copy data from `bytes` into `target`, which must be a pipe.
+///
+/// Returns the number of successfully copied bytes.
+#[cfg(any(target_os = "linux", target_os = "android"))]
+pub fn vmsplice(target: &impl AsRawFd, bytes: &[u8]) -> Result<usize> {
+    nix::fcntl::vmsplice(
+        target.as_raw_fd(),
+        &[IoVec::from_slice(bytes)],
+        SpliceFFlags::empty(),
+    )
+}
diff --git a/src/uucore/src/lib/features/process.rs b/src/uucore/src/lib/features/process.rs
index 21bfa992c..d0f530a5a 100644
--- a/src/uucore/src/lib/features/process.rs
+++ b/src/uucore/src/lib/features/process.rs
@@ -9,6 +9,8 @@
 // spell-checker:ignore (vars) cvar exitstatus
 // spell-checker:ignore (sys/unix) WIFSIGNALED
 
+//! Set of functions to manage IDs
+
 use libc::{gid_t, pid_t, uid_t};
 use std::fmt;
 use std::io;
@@ -17,6 +19,8 @@ use std::process::ExitStatus as StdExitStatus;
 use std::thread;
 use std::time::{Duration, Instant};
 
+// SAFETY: These functions always succeed and return simple integers.
+
 /// `geteuid()` returns the effective user ID of the calling process.
 pub fn geteuid() -> uid_t {
     unsafe { libc::geteuid() }
@@ -94,6 +98,9 @@ impl fmt::Display for ExitStatus {
 /// Missing methods for Child objects
 pub trait ChildExt {
     /// Send a signal to a Child process.
+    ///
+    /// Caller beware: if the process already exited then you may accidentally
+    /// send the signal to an unrelated process that recycled the PID.
     fn send_signal(&mut self, signal: usize) -> io::Result<()>;
 
     /// Wait for a process to finish or return after the specified duration.
diff --git a/src/uucore/src/lib/features/ringbuffer.rs b/src/uucore/src/lib/features/ringbuffer.rs
index 1cb0d2b0d..9a6176f92 100644
--- a/src/uucore/src/lib/features/ringbuffer.rs
+++ b/src/uucore/src/lib/features/ringbuffer.rs
@@ -106,7 +106,6 @@ mod tests {
 
     use crate::ringbuffer::RingBuffer;
     use std::collections::VecDeque;
-    use std::iter::FromIterator;
 
     #[test]
     fn test_size_limit_zero() {
@@ -128,7 +127,7 @@ mod tests {
     fn test_from_iter() {
         let iter = [0, 1, 2].iter();
         let actual = RingBuffer::from_iter(iter, 2).data;
-        let expected = VecDeque::from_iter([1, 2].iter());
+        let expected: VecDeque<&i32> = [1, 2].iter().collect();
         assert_eq!(expected, actual);
     }
 }
diff --git a/src/uucore/src/lib/features/utmpx.rs b/src/uucore/src/lib/features/utmpx.rs
index 5077d9e59..a96c3f48c 100644
--- a/src/uucore/src/lib/features/utmpx.rs
+++ b/src/uucore/src/lib/features/utmpx.rs
@@ -24,7 +24,7 @@
 //!
 //! ```
 //! use uucore::utmpx::Utmpx;
-//! for ut in Utmpx::iter_all_records().read_from("/some/where/else") {
+//! for ut in Utmpx::iter_all_records_from("/some/where/else") {
 //!     if ut.is_user_process() {
 //!         println!("{}: {}", ut.host(), ut.user())
 //!     }
@@ -35,9 +35,12 @@ pub extern crate time;
 use self::time::{Timespec, Tm};
 
 use std::ffi::CString;
-use std::io::Error as IOError;
 use std::io::Result as IOResult;
+use std::marker::PhantomData;
+use std::os::unix::ffi::OsStrExt;
+use std::path::Path;
 use std::ptr;
+use std::sync::{Mutex, MutexGuard};
 
 pub use self::ut::*;
 use libc::utmpx;
@@ -47,14 +50,16 @@ use libc::utmpx;
 pub use libc::endutxent;
 pub use libc::getutxent;
 pub use libc::setutxent;
-#[cfg(any(target_vendor = "apple", target_os = "linux"))]
+#[cfg(any(target_vendor = "apple", target_os = "linux", target_os = "netbsd"))]
 pub use libc::utmpxname;
 #[cfg(target_os = "freebsd")]
 pub unsafe extern "C" fn utmpxname(_file: *const libc::c_char) -> libc::c_int {
     0
 }
 
-pub use crate::*; // import macros from `../../macros.rs`
+use once_cell::sync::Lazy;
+
+use crate::*; // import macros from `../../macros.rs`
 
 // In case the c_char array doesn't end with NULL
 macro_rules! chars2string {
@@ -130,6 +135,30 @@ mod ut {
     pub use libc::USER_PROCESS;
 }
 
+#[cfg(target_os = "netbsd")]
+mod ut {
+    pub static DEFAULT_FILE: &str = "/var/run/utmpx";
+
+    pub const ACCOUNTING: usize = 9;
+    pub const SHUTDOWN_TIME: usize = 11;
+
+    pub use libc::_UTX_HOSTSIZE as UT_HOSTSIZE;
+    pub use libc::_UTX_IDSIZE as UT_IDSIZE;
+    pub use libc::_UTX_LINESIZE as UT_LINESIZE;
+    pub use libc::_UTX_USERSIZE as UT_NAMESIZE;
+
+    pub use libc::ACCOUNTING;
+    pub use libc::DEAD_PROCESS;
+    pub use libc::EMPTY;
+    pub use libc::INIT_PROCESS;
+    pub use libc::LOGIN_PROCESS;
+    pub use libc::NEW_TIME;
+    pub use libc::OLD_TIME;
+    pub use libc::RUN_LVL;
+    pub use libc::SIGNATURE;
+    pub use libc::USER_PROCESS;
+}
+
 pub struct Utmpx {
     inner: utmpx,
 }
@@ -224,30 +253,76 @@ impl Utmpx {
         Ok(host.to_string())
     }
 
+    /// Iterate through all the utmp records.
+    ///
+    /// This will use the default location, or the path [`Utmpx::iter_all_records_from`]
+    /// was most recently called with.
+    ///
+    /// Only one instance of [`UtmpxIter`] may be active at a time. This
+    /// function will block as long as one is still active. Beware!
     pub fn iter_all_records() -> UtmpxIter {
-        UtmpxIter
+        let iter = UtmpxIter::new();
+        unsafe {
+            // This can technically fail, and it would be nice to detect that,
+            // but it doesn't return anything so we'd have to do nasty things
+            // with errno.
+            setutxent();
+        }
+        iter
+    }
+
+    /// Iterate through all the utmp records from a specific file.
+    ///
+    /// No failure is reported or detected.
+    ///
+    /// This function affects subsequent calls to [`Utmpx::iter_all_records`].
+    ///
+    /// The same caveats as for [`Utmpx::iter_all_records`] apply.
+    pub fn iter_all_records_from<P: AsRef<Path>>(path: P) -> UtmpxIter {
+        let iter = UtmpxIter::new();
+        let path = CString::new(path.as_ref().as_os_str().as_bytes()).unwrap();
+        unsafe {
+            // In glibc, utmpxname() only fails if there's not enough memory
+            // to copy the string.
+            // Solaris returns 1 on success instead of 0. Supposedly there also
+            // exist systems where it returns void.
+            // GNU who on Debian seems to output nothing if an invalid filename
+            // is specified, no warning or anything.
+            // So this function is pretty crazy and we don't try to detect errors.
+            // Not much we can do besides pray.
+            utmpxname(path.as_ptr());
+            setutxent();
+        }
+        iter
     }
 }
 
+// On some systems these functions are not thread-safe. On others they're
+// thread-local. Therefore we use a mutex to allow only one guard to exist at
+// a time, and make sure UtmpxIter cannot be sent across threads.
+//
+// I believe the only technical memory unsafety that could happen is a data
+// race while copying the data out of the pointer returned by getutxent(), but
+// ordinary race conditions are also very much possible.
+static LOCK: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
+
 /// Iterator of login records
-pub struct UtmpxIter;
+pub struct UtmpxIter {
+    #[allow(dead_code)]
+    guard: MutexGuard<'static, ()>,
+    /// Ensure UtmpxIter is !Send. Technically redundant because MutexGuard
+    /// is also !Send.
+    phantom: PhantomData<std::rc::Rc<()>>,
+}
 
 impl UtmpxIter {
-    /// Sets the name of the utmpx-format file for the other utmpx functions to access.
-    ///
-    /// If not set, default record file will be used(file path depends on the target OS)
-    pub fn read_from(self, f: &str) -> Self {
-        let res = unsafe {
-            let cstring = CString::new(f).unwrap();
-            utmpxname(cstring.as_ptr())
-        };
-        if res != 0 {
-            show_warning!("utmpxname: {}", IOError::last_os_error());
+    fn new() -> Self {
+        // PoisonErrors can safely be ignored
+        let guard = LOCK.lock().unwrap_or_else(|err| err.into_inner());
+        UtmpxIter {
+            guard,
+            phantom: PhantomData,
         }
-        unsafe {
-            setutxent();
-        }
-        self
     }
 }
 
@@ -257,13 +332,24 @@ impl Iterator for UtmpxIter {
         unsafe {
             let res = getutxent();
             if !res.is_null() {
+                // The data behind this pointer will be replaced by the next
+                // call to getutxent(), so we have to read it now.
+                // All the strings live inline in the struct as arrays, which
+                // makes things easier.
                 Some(Utmpx {
                     inner: ptr::read(res as *const _),
                 })
             } else {
-                endutxent();
                 None
             }
         }
     }
 }
+
+impl Drop for UtmpxIter {
+    fn drop(&mut self) {
+        unsafe {
+            endutxent();
+        }
+    }
+}
diff --git a/src/uucore/src/lib/features/zero_copy.rs b/src/uucore/src/lib/features/zero_copy.rs
deleted file mode 100644
index 1eb2c1547..000000000
--- a/src/uucore/src/lib/features/zero_copy.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use self::platform::*;
-
-use std::io::{self, Write};
-
-mod platform;
-
-pub trait AsRawObject {
-    fn as_raw_object(&self) -> RawObject;
-}
-
-pub trait FromRawObject: Sized {
-    /// # Safety
-    /// ToDO ...
-    unsafe fn from_raw_object(obj: RawObject) -> Option<Self>;
-}
-
-// TODO: also make a SpliceWriter that takes an input fd and and output fd and uses splice() to
-//       transfer data
-// TODO: make a TeeWriter or something that takes an input fd and two output fds and uses tee() to
-//       transfer to both output fds
-
-enum InnerZeroCopyWriter<T: Write + Sized> {
-    Platform(PlatformZeroCopyWriter),
-    Standard(T),
-}
-
-impl<T: Write + Sized> Write for InnerZeroCopyWriter<T> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        match self {
-            InnerZeroCopyWriter::Platform(ref mut writer) => writer.write(buf),
-            InnerZeroCopyWriter::Standard(ref mut writer) => writer.write(buf),
-        }
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        match self {
-            InnerZeroCopyWriter::Platform(ref mut writer) => writer.flush(),
-            InnerZeroCopyWriter::Standard(ref mut writer) => writer.flush(),
-        }
-    }
-}
-
-pub struct ZeroCopyWriter<T: Write + AsRawObject + Sized> {
-    /// This field is never used, but we need it to drop file descriptors
-    #[allow(dead_code)]
-    raw_obj_owner: Option<T>,
-
-    inner: InnerZeroCopyWriter<T>,
-}
-
-struct TransformContainer<'a, A: Write + AsRawObject + Sized, B: Write + Sized> {
-    /// This field is never used and probably could be converted into PhantomData, but might be
-    /// useful for restructuring later (at the moment it's basically left over from an earlier
-    /// design)
-    #[allow(dead_code)]
-    original: Option<&'a mut A>,
-
-    transformed: Option<B>,
-}
-
-impl<'a, A: Write + AsRawObject + Sized, B: Write + Sized> Write for TransformContainer<'a, A, B> {
-    fn write(&mut self, bytes: &[u8]) -> io::Result<usize> {
-        self.transformed.as_mut().unwrap().write(bytes)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.transformed.as_mut().unwrap().flush()
-    }
-}
-
-impl<'a, A: Write + AsRawObject + Sized, B: Write + Sized> AsRawObject
-    for TransformContainer<'a, A, B>
-{
-    fn as_raw_object(&self) -> RawObject {
-        panic!("Test should never be used")
-    }
-}
-
-impl<T: Write + AsRawObject + Sized> ZeroCopyWriter<T> {
-    pub fn new(writer: T) -> Self {
-        let raw_obj = writer.as_raw_object();
-        match unsafe { PlatformZeroCopyWriter::new(raw_obj) } {
-            Ok(inner) => ZeroCopyWriter {
-                raw_obj_owner: Some(writer),
-                inner: InnerZeroCopyWriter::Platform(inner),
-            },
-            _ => {
-                // creating the splice writer failed for whatever reason, so just make a default
-                // writer
-                ZeroCopyWriter {
-                    raw_obj_owner: None,
-                    inner: InnerZeroCopyWriter::Standard(writer),
-                }
-            }
-        }
-    }
-
-    pub fn with_default<'a: 'b, 'b, F, W>(
-        writer: &'a mut T,
-        func: F,
-    ) -> ZeroCopyWriter<impl Write + AsRawObject + Sized + 'b>
-    where
-        F: Fn(&'a mut T) -> W,
-        W: Write + Sized + 'b,
-    {
-        let raw_obj = writer.as_raw_object();
-        match unsafe { PlatformZeroCopyWriter::new(raw_obj) } {
-            Ok(inner) => ZeroCopyWriter {
-                raw_obj_owner: Some(TransformContainer {
-                    original: Some(writer),
-                    transformed: None,
-                }),
-                inner: InnerZeroCopyWriter::Platform(inner),
-            },
-            _ => {
-                // XXX: should func actually consume writer and leave it up to the user to save the value?
-                //      maybe provide a default stdin method then?  in some cases it would make more sense for the
-                //      value to be consumed
-                let real_writer = func(writer);
-                ZeroCopyWriter {
-                    raw_obj_owner: None,
-                    inner: InnerZeroCopyWriter::Standard(TransformContainer {
-                        original: None,
-                        transformed: Some(real_writer),
-                    }),
-                }
-            }
-        }
-    }
-
-    // XXX: unsure how to get something like this working without allocating, so not providing it
-    /*pub fn stdout() -> ZeroCopyWriter<impl Write + AsRawObject + Sized> {
-       let mut stdout = io::stdout();
-       ZeroCopyWriter::with_default(&mut stdout, |stdout| {
-          stdout.lock()
-       })
-    }*/
-}
-
-impl<T: Write + AsRawObject + Sized> Write for ZeroCopyWriter<T> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.inner.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.inner.flush()
-    }
-}
diff --git a/src/uucore/src/lib/features/zero_copy/platform.rs b/src/uucore/src/lib/features/zero_copy/platform.rs
deleted file mode 100644
index 67e4354c5..000000000
--- a/src/uucore/src/lib/features/zero_copy/platform.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#[cfg(any(target_os = "linux", target_os = "android"))]
-pub use self::linux::*;
-#[cfg(unix)]
-pub use self::unix::*;
-#[cfg(windows)]
-pub use self::windows::*;
-
-// Add any operating systems we support here
-#[cfg(not(any(target_os = "linux", target_os = "android")))]
-pub use self::default::*;
-
-#[cfg(any(target_os = "linux", target_os = "android"))]
-mod linux;
-#[cfg(unix)]
-mod unix;
-#[cfg(windows)]
-mod windows;
-
-// Add any operating systems we support here
-#[cfg(not(any(target_os = "linux", target_os = "android")))]
-mod default;
diff --git a/src/uucore/src/lib/features/zero_copy/platform/default.rs b/src/uucore/src/lib/features/zero_copy/platform/default.rs
deleted file mode 100644
index 47239a361..000000000
--- a/src/uucore/src/lib/features/zero_copy/platform/default.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::features::zero_copy::RawObject;
-
-use std::io::{self, Write};
-
-pub struct PlatformZeroCopyWriter;
-
-impl PlatformZeroCopyWriter {
-    pub unsafe fn new(_obj: RawObject) -> Result<Self, ()> {
-        Err(())
-    }
-}
-
-impl Write for PlatformZeroCopyWriter {
-    fn write(&mut self, _bytes: &[u8]) -> io::Result<usize> {
-        panic!("should never occur")
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        panic!("should never occur")
-    }
-}
diff --git a/src/uucore/src/lib/features/zero_copy/platform/linux.rs b/src/uucore/src/lib/features/zero_copy/platform/linux.rs
deleted file mode 100644
index e2bed3061..000000000
--- a/src/uucore/src/lib/features/zero_copy/platform/linux.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::io::{self, Write};
-use std::os::unix::io::RawFd;
-
-use libc::{O_APPEND, S_IFIFO, S_IFREG};
-use nix::errno::Errno;
-use nix::fcntl::{fcntl, splice, vmsplice, FcntlArg, SpliceFFlags};
-use nix::sys::stat::{fstat, FileStat};
-use nix::sys::uio::IoVec;
-use nix::unistd::pipe;
-use platform_info::{PlatformInfo, Uname};
-
-use crate::features::zero_copy::{FromRawObject, RawObject};
-
-lazy_static::lazy_static! {
-    static ref IN_WSL: bool = {
-        let info = PlatformInfo::new().unwrap();
-        info.release().contains("Microsoft")
-    };
-}
-
-pub struct PlatformZeroCopyWriter {
-    raw_obj: RawObject,
-    read_pipe: RawFd,
-    write_pipe: RawFd,
-    #[allow(clippy::type_complexity)]
-    write_fn: fn(&mut PlatformZeroCopyWriter, &[IoVec<&[u8]>], usize) -> io::Result<usize>,
-}
-
-impl PlatformZeroCopyWriter {
-    pub unsafe fn new(raw_obj: RawObject) -> nix::Result<Self> {
-        if *IN_WSL {
-            // apparently WSL hasn't implemented vmsplice(), causing writes to fail
-            // thus, we will just say zero-copy doesn't work there rather than working
-            // around it
-            return Err(nix::Error::from(Errno::EOPNOTSUPP));
-        }
-
-        let stat_info: FileStat = fstat(raw_obj)?;
-        let access_mode: libc::c_int = fcntl(raw_obj, FcntlArg::F_GETFL)?;
-
-        let is_regular = (stat_info.st_mode & S_IFREG) != 0;
-        let is_append = (access_mode & O_APPEND) != 0;
-        let is_fifo = (stat_info.st_mode & S_IFIFO) != 0;
-
-        if is_regular && !is_append {
-            let (read_pipe, write_pipe) = pipe()?;
-
-            Ok(PlatformZeroCopyWriter {
-                raw_obj,
-                read_pipe,
-                write_pipe,
-                write_fn: write_regular,
-            })
-        } else if is_fifo {
-            Ok(PlatformZeroCopyWriter {
-                raw_obj,
-                read_pipe: Default::default(),
-                write_pipe: Default::default(),
-                write_fn: write_fifo,
-            })
-        } else {
-            // FIXME: how to error?
-            Err(nix::Error::from(Errno::UnknownErrno))
-        }
-    }
-}
-
-impl FromRawObject for PlatformZeroCopyWriter {
-    unsafe fn from_raw_object(obj: RawObject) -> Option<Self> {
-        PlatformZeroCopyWriter::new(obj).ok()
-    }
-}
-
-impl Write for PlatformZeroCopyWriter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let iovec = &[IoVec::from_slice(buf)];
-
-        let func = self.write_fn;
-        func(self, iovec, buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        // XXX: not sure if we need anything else
-        Ok(())
-    }
-}
-
-fn write_regular(
-    writer: &mut PlatformZeroCopyWriter,
-    iovec: &[IoVec<&[u8]>],
-    len: usize,
-) -> io::Result<usize> {
-    vmsplice(writer.write_pipe, iovec, SpliceFFlags::empty())
-        .and_then(|_| {
-            splice(
-                writer.read_pipe,
-                None,
-                writer.raw_obj,
-                None,
-                len,
-                SpliceFFlags::empty(),
-            )
-        })
-        .map_err(|_| io::Error::last_os_error())
-}
-
-fn write_fifo(
-    writer: &mut PlatformZeroCopyWriter,
-    iovec: &[IoVec<&[u8]>],
-    _len: usize,
-) -> io::Result<usize> {
-    vmsplice(writer.raw_obj, iovec, SpliceFFlags::empty()).map_err(|_| io::Error::last_os_error())
-}
diff --git a/src/uucore/src/lib/features/zero_copy/platform/unix.rs b/src/uucore/src/lib/features/zero_copy/platform/unix.rs
deleted file mode 100644
index 553549c9b..000000000
--- a/src/uucore/src/lib/features/zero_copy/platform/unix.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
-
-use crate::features::zero_copy::{AsRawObject, FromRawObject};
-
-pub type RawObject = RawFd;
-
-impl<T: AsRawFd> AsRawObject for T {
-    fn as_raw_object(&self) -> RawObject {
-        self.as_raw_fd()
-    }
-}
-
-// FIXME: check if this works right
-impl<T: FromRawFd> FromRawObject for T {
-    unsafe fn from_raw_object(obj: RawObject) -> Option<Self> {
-        Some(T::from_raw_fd(obj))
-    }
-}
diff --git a/src/uucore/src/lib/features/zero_copy/platform/windows.rs b/src/uucore/src/lib/features/zero_copy/platform/windows.rs
deleted file mode 100644
index 8134bfda3..000000000
--- a/src/uucore/src/lib/features/zero_copy/platform/windows.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::os::windows::io::{AsRawHandle, FromRawHandle, RawHandle};
-
-use crate::features::zero_copy::{AsRawObject, FromRawObject};
-
-pub type RawObject = RawHandle;
-
-impl<T: AsRawHandle> AsRawObject for T {
-    fn as_raw_object(&self) -> RawObject {
-        self.as_raw_handle()
-    }
-}
-
-impl<T: FromRawHandle> FromRawObject for T {
-    unsafe fn from_raw_object(obj: RawObject) -> Option<Self> {
-        Some(T::from_raw_handle(obj))
-    }
-}
-
-// TODO: see if there's some zero-copy stuff in Windows
diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs
index 1ac26b04e..3d2d867bd 100644
--- a/src/uucore/src/lib/lib.rs
+++ b/src/uucore/src/lib/lib.rs
@@ -3,14 +3,6 @@
 // Copyright (C) ~ Alex Lyon <arcterus@mail.com>
 // Copyright (C) ~ Roy Ivy III <rivy.dev@gmail.com>; MIT license
 
-// * feature-gated external crates
-#[cfg(all(feature = "lazy_static", target_os = "linux"))]
-extern crate lazy_static;
-#[cfg(feature = "nix")]
-extern crate nix;
-#[cfg(feature = "platform-info")]
-extern crate platform_info;
-
 // * feature-gated external crates (re-shared as public internal modules)
 #[cfg(feature = "libc")]
 pub extern crate libc;
@@ -27,6 +19,7 @@ mod parser; // string parsing modules
 // * cross-platform modules
 pub use crate::mods::backup_control;
 pub use crate::mods::coreopts;
+pub use crate::mods::display;
 pub use crate::mods::error;
 pub use crate::mods::os;
 pub use crate::mods::panic;
@@ -46,11 +39,9 @@ pub use crate::features::fs;
 pub use crate::features::fsext;
 #[cfg(feature = "ringbuffer")]
 pub use crate::features::ringbuffer;
-#[cfg(feature = "zero-copy")]
-pub use crate::features::zero_copy;
 
 // * (platform-specific) feature-gated modules
-// ** non-windows
+// ** non-windows (i.e. Unix + Fuchsia)
 #[cfg(all(not(windows), feature = "mode"))]
 pub use crate::features::mode;
 // ** unix-only
@@ -58,6 +49,8 @@ pub use crate::features::mode;
 pub use crate::features::entries;
 #[cfg(all(unix, feature = "perms"))]
 pub use crate::features::perms;
+#[cfg(all(unix, feature = "pipes"))]
+pub use crate::features::pipes;
 #[cfg(all(unix, feature = "process"))]
 pub use crate::features::process;
 #[cfg(all(unix, not(target_os = "fuchsia"), feature = "signals"))]
@@ -65,6 +58,7 @@ pub use crate::features::signals;
 #[cfg(all(
     unix,
     not(target_os = "fuchsia"),
+    not(target_os = "redox"),
     not(target_env = "musl"),
     feature = "utmpx"
 ))]
@@ -76,6 +70,55 @@ pub use crate::features::wide;
 //## core functions
 
 use std::ffi::OsString;
+use std::sync::atomic::Ordering;
+
+use once_cell::sync::Lazy;
+
+use crate::display::Quotable;
+
+pub fn get_utility_is_second_arg() -> bool {
+    crate::macros::UTILITY_IS_SECOND_ARG.load(Ordering::SeqCst)
+}
+
+pub fn set_utility_is_second_arg() {
+    crate::macros::UTILITY_IS_SECOND_ARG.store(true, Ordering::SeqCst)
+}
+
+// args_os() can be expensive to call, it copies all of argv before iterating.
+// So if we want only the first arg or so it's overkill. We cache it.
+static ARGV: Lazy<Vec<OsString>> = Lazy::new(|| wild::args_os().collect());
+
+static UTIL_NAME: Lazy<String> = Lazy::new(|| {
+    if get_utility_is_second_arg() {
+        &ARGV[1]
+    } else {
+        &ARGV[0]
+    }
+    .to_string_lossy()
+    .into_owned()
+});
+
+/// Derive the utility name.
+pub fn util_name() -> &'static str {
+    &UTIL_NAME
+}
+
+static EXECUTION_PHRASE: Lazy<String> = Lazy::new(|| {
+    if get_utility_is_second_arg() {
+        ARGV.iter()
+            .take(2)
+            .map(|os_str| os_str.to_string_lossy().into_owned())
+            .collect::<Vec<_>>()
+            .join(" ")
+    } else {
+        ARGV[0].to_string_lossy().into_owned()
+    }
+});
+
+/// Derive the complete execution phrase for "usage".
+pub fn execution_phrase() -> &'static str {
+    &EXECUTION_PHRASE
+}
 
 pub enum InvalidEncodingHandling {
     Ignore,
@@ -132,14 +175,15 @@ pub trait Args: Iterator<Item = OsString> + Sized {
                 Ok(string) => Ok(string),
                 Err(s_ret) => {
                     full_conversion = false;
-                    let lossy_conversion = s_ret.to_string_lossy();
                     eprintln!(
-                        "Input with broken encoding occurred! (s = '{}') ",
-                        &lossy_conversion
+                        "Input with broken encoding occurred! (s = {}) ",
+                        s_ret.quote()
                     );
                     match handling {
                         InvalidEncodingHandling::Ignore => Err(String::new()),
-                        InvalidEncodingHandling::ConvertLossy => Err(lossy_conversion.to_string()),
+                        InvalidEncodingHandling::ConvertLossy => {
+                            Err(s_ret.to_string_lossy().into_owned())
+                        }
                         InvalidEncodingHandling::Panic => {
                             panic!("Broken encoding found but caller cannot handle it")
                         }
@@ -171,13 +215,8 @@ pub trait Args: Iterator<Item = OsString> + Sized {
 
 impl<T: Iterator<Item = OsString> + Sized> Args for T {}
 
-// args() ...
-pub fn args() -> impl Iterator<Item = String> {
-    wild::args()
-}
-
 pub fn args_os() -> impl Iterator<Item = OsString> {
-    wild::args_os()
+    ARGV.iter().cloned()
 }
 
 #[cfg(test)]
diff --git a/src/uucore/src/lib/macros.rs b/src/uucore/src/lib/macros.rs
index 6e3a2166f..c7b15dba3 100644
--- a/src/uucore/src/lib/macros.rs
+++ b/src/uucore/src/lib/macros.rs
@@ -1,3 +1,5 @@
+use std::sync::atomic::AtomicBool;
+
 // This file is part of the uutils coreutils package.
 //
 // (c) Alex Lyon <arcterus@mail.com>
@@ -5,31 +7,17 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-/// Deduce the name of the binary from the current source code filename.
-///
-/// e.g.: `src/uu/cp/src/cp.rs` -> `cp`
-#[macro_export]
-macro_rules! executable(
-    () => ({
-        let module = module_path!();
-        let module = module.split("::").next().unwrap_or(module);
-        if &module[0..3] == "uu_" {
-            &module[3..]
-        } else {
-            module
-        }
-    })
-);
+/// Whether we were called as a multicall binary ("coreutils <utility>")
+pub static UTILITY_IS_SECOND_ARG: AtomicBool = AtomicBool::new(false);
+
+//====
 
 #[macro_export]
 macro_rules! show(
     ($err:expr) => ({
         let e = $err;
-        uucore::error::set_exit_code(e.code());
-        eprintln!("{}: {}", executable!(), e);
-        if e.usage() {
-            eprintln!("Try '{} --help' for more information.", executable!());
-        }
+        $crate::error::set_exit_code(e.code());
+        eprintln!("{}: {}", $crate::util_name(), e);
     })
 );
 
@@ -46,7 +34,7 @@ macro_rules! show_if_err(
 #[macro_export]
 macro_rules! show_error(
     ($($args:tt)+) => ({
-        eprint!("{}: ", executable!());
+        eprint!("{}: ", $crate::util_name());
         eprintln!($($args)+);
     })
 );
@@ -55,7 +43,7 @@ macro_rules! show_error(
 #[macro_export]
 macro_rules! show_error_custom_description (
     ($err:expr,$($args:tt)+) => ({
-        eprint!("{}: {}: ", executable!(), $err);
+        eprint!("{}: {}: ", $crate::util_name(), $err);
         eprintln!($($args)+);
     })
 );
@@ -63,7 +51,7 @@ macro_rules! show_error_custom_description (
 #[macro_export]
 macro_rules! show_warning(
     ($($args:tt)+) => ({
-        eprint!("{}: warning: ", executable!());
+        eprint!("{}: warning: ", $crate::util_name());
         eprintln!($($args)+);
     })
 );
@@ -72,9 +60,19 @@ macro_rules! show_warning(
 #[macro_export]
 macro_rules! show_usage_error(
     ($($args:tt)+) => ({
-        eprint!("{}: ", executable!());
+        eprint!("{}: ", $crate::util_name());
         eprintln!($($args)+);
-        eprintln!("Try '{} --help' for more information.", executable!());
+        eprintln!("Try '{} --help' for more information.", $crate::execution_phrase());
+    })
+);
+
+//====
+
+/// Calls `exit()` with the provided exit code.
+#[macro_export]
+macro_rules! exit(
+    ($exit_code:expr) => ({
+        ::std::process::exit($exit_code)
     })
 );
 
@@ -82,16 +80,8 @@ macro_rules! show_usage_error(
 #[macro_export]
 macro_rules! crash(
     ($exit_code:expr, $($args:tt)+) => ({
-        show_error!($($args)+);
-        ::std::process::exit($exit_code)
-    })
-);
-
-/// Calls `exit()` with the provided exit code.
-#[macro_export]
-macro_rules! exit(
-    ($exit_code:expr) => ({
-        ::std::process::exit($exit_code)
+        $crate::show_error!($($args)+);
+        $crate::exit!($exit_code)
     })
 );
 
@@ -102,26 +92,12 @@ macro_rules! crash_if_err(
     ($exit_code:expr, $exp:expr) => (
         match $exp {
             Ok(m) => m,
-            Err(f) => crash!($exit_code, "{}", f),
+            Err(f) => $crate::crash!($exit_code, "{}", f),
         }
     )
 );
 
-/// Unwraps the Result. Instead of panicking, it shows the error and then
-/// returns from the function with the provided exit code.
-/// Assumes the current function returns an i32 value.
-#[macro_export]
-macro_rules! return_if_err(
-    ($exit_code:expr, $exp:expr) => (
-        match $exp {
-            Ok(m) => m,
-            Err(f) => {
-                show_error!("{}", f);
-                return $exit_code;
-            }
-        }
-    )
-);
+//====
 
 #[macro_export]
 macro_rules! safe_write(
@@ -143,39 +119,27 @@ macro_rules! safe_writeln(
     )
 );
 
-/// Unwraps the Result. Instead of panicking, it exists the program with exit
-/// code 1.
-#[macro_export]
-macro_rules! safe_unwrap(
-    ($exp:expr) => (
-        match $exp {
-            Ok(m) => m,
-            Err(f) => crash!(1, "{}", f.to_string())
-        }
-    )
-);
-
 //-- message templates
 
-//-- message templates : general
+//-- message templates : (join utility sub-macros)
 
 #[macro_export]
-macro_rules! snippet_list_join_oxford {
+macro_rules! snippet_list_join_oxford_comma {
     ($conjunction:expr, $valOne:expr, $valTwo:expr) => (
         format!("{}, {} {}", $valOne, $conjunction, $valTwo)
     );
     ($conjunction:expr, $valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => (
-        format!("{}, {}", $valOne, snippet_list_join_inner!($conjunction, $valTwo $(, $remaining_values)*))
+        format!("{}, {}", $valOne, $crate::snippet_list_join_oxford_comma!($conjunction, $valTwo $(, $remaining_values)*))
     );
 }
 
 #[macro_export]
-macro_rules! snippet_list_join_or {
-    ($valOne:expr, $valTwo:expr) => (
-        format!("{} or {}", $valOne, $valTwo)
+macro_rules! snippet_list_join {
+    ($conjunction:expr, $valOne:expr, $valTwo:expr) => (
+        format!("{} {} {}", $valOne, $conjunction, $valTwo)
     );
-    ($valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => (
-        format!("{}, {}", $valOne, snippet_list_join_oxford!("or", $valTwo $(, $remaining_values)*))
+    ($conjunction:expr, $valOne:expr, $valTwo:expr $(, $remaining_values:expr)*) => (
+        format!("{}, {}", $valOne, $crate::snippet_list_join_oxford_comma!($conjunction, $valTwo $(, $remaining_values)*))
     );
 }
 
@@ -193,10 +157,10 @@ macro_rules! msg_invalid_input {
 #[macro_export]
 macro_rules! msg_invalid_opt_use {
     ($about:expr, $flag:expr) => {
-        msg_invalid_input!(format!("The '{}' option {}", $flag, $about))
+        $crate::msg_invalid_input!(format!("The '{}' option {}", $flag, $about))
     };
     ($about:expr, $long_flag:expr, $short_flag:expr) => {
-        msg_invalid_input!(format!(
+        $crate::msg_invalid_input!(format!(
             "The '{}' ('{}') option {}",
             $long_flag, $short_flag, $about
         ))
@@ -206,10 +170,10 @@ macro_rules! msg_invalid_opt_use {
 #[macro_export]
 macro_rules! msg_opt_only_usable_if {
     ($clause:expr, $flag:expr) => {
-        msg_invalid_opt_use!(format!("only usable if {}", $clause), $flag)
+        $crate::msg_invalid_opt_use!(format!("only usable if {}", $clause), $flag)
     };
     ($clause:expr, $long_flag:expr, $short_flag:expr) => {
-        msg_invalid_opt_use!(
+        $crate::msg_invalid_opt_use!(
             format!("only usable if {}", $clause),
             $long_flag,
             $short_flag
@@ -220,13 +184,13 @@ macro_rules! msg_opt_only_usable_if {
 #[macro_export]
 macro_rules! msg_opt_invalid_should_be {
     ($expects:expr, $received:expr, $flag:expr) => {
-        msg_invalid_opt_use!(
+        $crate::msg_invalid_opt_use!(
             format!("expects {}, but was provided {}", $expects, $received),
             $flag
         )
     };
     ($expects:expr, $received:expr, $long_flag:expr, $short_flag:expr) => {
-        msg_invalid_opt_use!(
+        $crate::msg_invalid_opt_use!(
             format!("expects {}, but was provided {}", $expects, $received),
             $long_flag,
             $short_flag
@@ -239,13 +203,13 @@ macro_rules! msg_opt_invalid_should_be {
 #[macro_export]
 macro_rules! msg_expects_one_of {
     ($valOne:expr $(, $remaining_values:expr)*) => (
-        msg_invalid_input!(format!("expects one of {}", snippet_list_join_or!($valOne $(, $remaining_values)*)))
+        $crate::msg_invalid_input!(format!("expects one of {}", $crate::snippet_list_join!("or", $valOne $(, $remaining_values)*)))
     );
 }
 
 #[macro_export]
 macro_rules! msg_expects_no_more_than_one_of {
     ($valOne:expr $(, $remaining_values:expr)*) => (
-        msg_invalid_input!(format!("expects no more than one of {}", snippet_list_join_or!($valOne $(, $remaining_values)*))) ;
+        $crate::msg_invalid_input!(format!("expects no more than one of {}", $crate::snippet_list_join!("or", $valOne $(, $remaining_values)*))) ;
     );
 }
diff --git a/src/uucore/src/lib/mods.rs b/src/uucore/src/lib/mods.rs
index b0235832b..8f6d14976 100644
--- a/src/uucore/src/lib/mods.rs
+++ b/src/uucore/src/lib/mods.rs
@@ -2,6 +2,7 @@
 
 pub mod backup_control;
 pub mod coreopts;
+pub mod display;
 pub mod error;
 pub mod os;
 pub mod panic;
diff --git a/src/uucore/src/lib/mods/backup_control.rs b/src/uucore/src/lib/mods/backup_control.rs
index 6fa48d308..acb7342b7 100644
--- a/src/uucore/src/lib/mods/backup_control.rs
+++ b/src/uucore/src/lib/mods/backup_control.rs
@@ -1,5 +1,92 @@
+//! Implement GNU-style backup functionality.
+//!
+//! This module implements the backup functionality as described in the [GNU
+//! manual][1]. It provides
+//!
+//! - pre-defined [`clap`-Arguments][2] for inclusion in utilities that
+//!   implement backups
+//! - determination of the [backup mode][3]
+//! - determination of the [backup suffix][4]
+//! - [backup target path construction][5]
+//! - [Error types][6] for backup-related errors
+//! - GNU-compliant [help texts][7] for backup-related errors
+//!
+//! Backup-functionality is implemented by the following utilities:
+//!
+//! - `cp`
+//! - `install`
+//! - `ln`
+//! - `mv`
+//!
+//!
+//! [1]: https://www.gnu.org/software/coreutils/manual/html_node/Backup-options.html
+//! [2]: arguments
+//! [3]: `determine_backup_mode()`
+//! [4]: `determine_backup_suffix()`
+//! [5]: `get_backup_path()`
+//! [6]: `BackupError`
+//! [7]: `BACKUP_CONTROL_LONG_HELP`
+//!
+//!
+//! # Usage example
+//!
+//! ```
+//! #[macro_use]
+//! extern crate uucore;
+//!
+//! use clap::{App, Arg, ArgMatches};
+//! use std::path::{Path, PathBuf};
+//! use uucore::backup_control::{self, BackupMode};
+//! use uucore::error::{UError, UResult};
+//!
+//! fn main() {
+//!     let usage = String::from("app [OPTION]... ARG");
+//!     let long_usage = String::from("And here's a detailed explanation");
+//!
+//!     let matches = App::new("app")
+//!         .arg(backup_control::arguments::backup())
+//!         .arg(backup_control::arguments::backup_no_args())
+//!         .arg(backup_control::arguments::suffix())
+//!         .usage(&usage[..])
+//!         .after_help(&*format!(
+//!             "{}\n{}",
+//!             long_usage,
+//!             backup_control::BACKUP_CONTROL_LONG_HELP
+//!         ))
+//!         .get_matches_from(vec![
+//!             "app", "--backup=t", "--suffix=bak~"
+//!         ]);
+//!    
+//!     let backup_mode = match backup_control::determine_backup_mode(&matches) {
+//!         Err(e) => {
+//!             show!(e);
+//!             return;
+//!         },
+//!         Ok(mode) => mode,
+//!     };
+//!     let backup_suffix = backup_control::determine_backup_suffix(&matches);
+//!     let target_path = Path::new("/tmp/example");
+//!
+//!     let backup_path = backup_control::get_backup_path(
+//!         backup_mode, target_path, &backup_suffix
+//!     );
+//!
+//!     // Perform your backups here.
+//!
+//! }
+//! ```
+
+// spell-checker:ignore backupopt
+
+use crate::{
+    display::Quotable,
+    error::{UError, UResult},
+};
+use clap::ArgMatches;
 use std::{
     env,
+    error::Error,
+    fmt::{Debug, Display},
     path::{Path, PathBuf},
 };
 
@@ -17,15 +104,148 @@ the VERSION_CONTROL environment variable.  Here are the values:
   existing, nil   numbered if numbered backups exist, simple otherwise
   simple, never   always make simple backups";
 
+static VALID_ARGS_HELP: &str = "Valid arguments are:
+  - 'none', 'off'
+  - 'simple', 'never'
+  - 'existing', 'nil'
+  - 'numbered', 't'";
+
+/// Available backup modes.
+///
+/// The mapping of the backup modes to the CLI arguments is annotated on the
+/// enum variants.
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum BackupMode {
+    /// Argument 'none', 'off'
     NoBackup,
+    /// Argument 'simple', 'never'
     SimpleBackup,
+    /// Argument 'numbered', 't'
     NumberedBackup,
+    /// Argument 'existing', 'nil'
     ExistingBackup,
 }
 
-pub fn determine_backup_suffix(supplied_suffix: Option<&str>) -> String {
+/// Backup error types.
+///
+/// Errors are currently raised by [`determine_backup_mode`] only. All errors
+/// are implemented as [`UCustomError`] for uniform handling across utilities.
+#[derive(Debug, Eq, PartialEq)]
+pub enum BackupError {
+    /// An invalid argument (e.g. 'foo') was given as backup type. First
+    /// parameter is the argument, second is the arguments origin (CLI or
+    /// ENV-var)
+    InvalidArgument(String, String),
+    /// An ambiguous argument (e.g. 'n') was given as backup type. First
+    /// parameter is the argument, second is the arguments origin (CLI or
+    /// ENV-var)
+    AmbiguousArgument(String, String),
+    /// Currently unused
+    BackupImpossible(),
+    // BackupFailed(PathBuf, PathBuf, std::io::Error),
+}
+
+impl UError for BackupError {
+    fn code(&self) -> i32 {
+        match self {
+            BackupError::BackupImpossible() => 2,
+            _ => 1,
+        }
+    }
+
+    fn usage(&self) -> bool {
+        // Suggested by clippy.
+        matches!(
+            self,
+            BackupError::InvalidArgument(_, _) | BackupError::AmbiguousArgument(_, _)
+        )
+    }
+}
+
+impl Error for BackupError {}
+
+impl Display for BackupError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        use BackupError as BE;
+        match self {
+            BE::InvalidArgument(arg, origin) => write!(
+                f,
+                "invalid argument {} for '{}'\n{}",
+                arg.quote(),
+                origin,
+                VALID_ARGS_HELP
+            ),
+            BE::AmbiguousArgument(arg, origin) => write!(
+                f,
+                "ambiguous argument {} for '{}'\n{}",
+                arg.quote(),
+                origin,
+                VALID_ARGS_HELP
+            ),
+            BE::BackupImpossible() => write!(f, "cannot create backup"),
+            // Placeholder for later
+            // BE::BackupFailed(from, to, e) => Display::fmt(
+            //     &uio_error!(e, "failed to backup {} to {}", from.quote(), to.quote()),
+            //     f
+            // ),
+        }
+    }
+}
+
+/// Arguments for backup-related functionality.
+///
+/// Rather than implementing the `clap`-Arguments for every utility, it is
+/// recommended to include the `clap` arguments via the functions provided here.
+/// This way the backup-specific arguments are handled uniformly across
+/// utilities and can be maintained in one central place.
+pub mod arguments {
+    extern crate clap;
+
+    pub static OPT_BACKUP: &str = "backupopt_backup";
+    pub static OPT_BACKUP_NO_ARG: &str = "backupopt_b";
+    pub static OPT_SUFFIX: &str = "backupopt_suffix";
+
+    /// '--backup' argument
+    pub fn backup() -> clap::Arg<'static, 'static> {
+        clap::Arg::with_name(OPT_BACKUP)
+            .long("backup")
+            .help("make a backup of each existing destination file")
+            .takes_value(true)
+            .require_equals(true)
+            .min_values(0)
+            .value_name("CONTROL")
+    }
+
+    /// '-b' argument
+    pub fn backup_no_args() -> clap::Arg<'static, 'static> {
+        clap::Arg::with_name(OPT_BACKUP_NO_ARG)
+            .short("b")
+            .help("like --backup but does not accept an argument")
+    }
+
+    /// '-S, --suffix' argument
+    pub fn suffix() -> clap::Arg<'static, 'static> {
+        clap::Arg::with_name(OPT_SUFFIX)
+            .short("S")
+            .long("suffix")
+            .help("override the usual backup suffix")
+            .takes_value(true)
+            .value_name("SUFFIX")
+    }
+}
+
+/// Obtain the suffix to use for a backup.
+///
+/// In order of precedence, this function obtains the backup suffix
+///
+/// 1. From the '-S' or '--suffix' CLI argument, if present
+/// 2. From the "SIMPLE_BACKUP_SUFFIX" environment variable, if present
+/// 3. By using the default '~' if none of the others apply
+///
+/// This function directly takes [`clap::ArgMatches`] as argument and looks for
+/// the '-S' and '--suffix' arguments itself.
+pub fn determine_backup_suffix(matches: &ArgMatches) -> String {
+    let supplied_suffix = matches.value_of(arguments::OPT_SUFFIX);
     if let Some(suffix) = supplied_suffix {
         String::from(suffix)
     } else {
@@ -38,7 +258,13 @@ pub fn determine_backup_suffix(supplied_suffix: Option<&str>) -> String {
 /// Parses the backup options according to the [GNU manual][1], and converts
 /// them to an instance of `BackupMode` for further processing.
 ///
-/// For an explanation of what the arguments mean, refer to the examples below.
+/// Takes [`clap::ArgMatches`] as argument which **must** contain the options
+/// from [`arguments::backup()`] and [`arguments::backup_no_args()`]. Otherwise
+/// the `NoBackup` mode is returned unconditionally.
+///
+/// It is recommended for anyone who would like to implement the
+/// backup-functionality to use the arguments prepared in the `arguments`
+/// submodule (see examples)
 ///
 /// [1]: https://www.gnu.org/software/coreutils/manual/html_node/Backup-options.html
 ///
@@ -47,9 +273,11 @@ pub fn determine_backup_suffix(supplied_suffix: Option<&str>) -> String {
 ///
 /// If an argument supplied directly to the long `backup` option, or read in
 /// through the `VERSION CONTROL` env var is ambiguous (i.e. may resolve to
-/// multiple backup modes) or invalid, an error is returned. The error contains
-/// the formatted error string which may then be passed to the
-/// [`show_usage_error`] macro.
+/// multiple backup modes) or invalid, an [`InvalidArgument`][10] or
+/// [`AmbiguousArgument`][11] error is returned, respectively.
+///
+/// [10]: BackupError::InvalidArgument
+/// [11]: BackupError::AmbiguousArgument
 ///
 ///
 /// # Examples
@@ -61,34 +289,18 @@ pub fn determine_backup_suffix(supplied_suffix: Option<&str>) -> String {
 /// #[macro_use]
 /// extern crate uucore;
 /// use uucore::backup_control::{self, BackupMode};
-/// use clap::{App, Arg};
+/// use clap::{App, Arg, ArgMatches};
 ///
 /// fn main() {
-///     let OPT_BACKUP: &str = "backup";
-///     let OPT_BACKUP_NO_ARG: &str = "b";
 ///     let matches = App::new("app")
-///         .arg(Arg::with_name(OPT_BACKUP_NO_ARG)
-///             .short(OPT_BACKUP_NO_ARG))
-///         .arg(Arg::with_name(OPT_BACKUP)
-///             .long(OPT_BACKUP)
-///             .takes_value(true)
-///             .require_equals(true)
-///             .min_values(0))
+///         .arg(backup_control::arguments::backup())
+///         .arg(backup_control::arguments::backup_no_args())
 ///         .get_matches_from(vec![
 ///             "app", "-b", "--backup=t"
 ///         ]);
-///    
-///     let backup_mode = backup_control::determine_backup_mode(
-///         matches.is_present(OPT_BACKUP_NO_ARG), matches.is_present(OPT_BACKUP),
-///         matches.value_of(OPT_BACKUP)
-///     );
-///     let backup_mode = match backup_mode {
-///         Err(err) => {
-///             show_usage_error!("{}", err);
-///             return;
-///         },
-///         Ok(mode) => mode,
-///     };
+///
+///     let backup_mode = backup_control::determine_backup_mode(&matches).unwrap();
+///     assert_eq!(backup_mode, BackupMode::NumberedBackup)
 /// }
 /// ```
 ///
@@ -99,57 +311,43 @@ pub fn determine_backup_suffix(supplied_suffix: Option<&str>) -> String {
 /// ```
 /// #[macro_use]
 /// extern crate uucore;
-/// use uucore::backup_control::{self, BackupMode};
-/// use clap::{crate_version, App, Arg, ArgMatches};
+/// use uucore::backup_control::{self, BackupMode, BackupError};
+/// use clap::{App, Arg, ArgMatches};
 ///
 /// fn main() {
-///     let OPT_BACKUP: &str = "backup";
-///     let OPT_BACKUP_NO_ARG: &str = "b";
 ///     let matches = App::new("app")
-///         .arg(Arg::with_name(OPT_BACKUP_NO_ARG)
-///             .short(OPT_BACKUP_NO_ARG))
-///         .arg(Arg::with_name(OPT_BACKUP)
-///             .long(OPT_BACKUP)
-///             .takes_value(true)
-///             .require_equals(true)
-///             .min_values(0))
+///         .arg(backup_control::arguments::backup())
+///         .arg(backup_control::arguments::backup_no_args())
 ///         .get_matches_from(vec![
 ///             "app", "-b", "--backup=n"
 ///         ]);
 ///    
-///     let backup_mode = backup_control::determine_backup_mode(
-///         matches.is_present(OPT_BACKUP_NO_ARG), matches.is_present(OPT_BACKUP),
-///         matches.value_of(OPT_BACKUP)
-///     );
-///     let backup_mode = match backup_mode {
-///         Err(err) => {
-///             show_usage_error!("{}", err);
-///             return;
-///         },
-///         Ok(mode) => mode,
-///     };
+///     let backup_mode = backup_control::determine_backup_mode(&matches);
+///
+///     assert!(backup_mode.is_err());
+///     let err = backup_mode.unwrap_err();
+///     // assert_eq!(err, BackupError::AmbiguousArgument);
+///     // Use uucore functionality to show the error to the user
+///     show!(err);
 /// }
 /// ```
-pub fn determine_backup_mode(
-    short_opt_present: bool,
-    long_opt_present: bool,
-    long_opt_value: Option<&str>,
-) -> Result<BackupMode, String> {
-    if long_opt_present {
+pub fn determine_backup_mode(matches: &ArgMatches) -> UResult<BackupMode> {
+    if matches.is_present(arguments::OPT_BACKUP) {
         // Use method to determine the type of backups to make. When this option
         // is used but method is not specified, then the value of the
         // VERSION_CONTROL environment variable is used. And if VERSION_CONTROL
-        // is not set, the default backup type is ‘existing’.
-        if let Some(method) = long_opt_value {
+        // is not set, the default backup type is 'existing'.
+        if let Some(method) = matches.value_of(arguments::OPT_BACKUP) {
             // Second argument is for the error string that is returned.
             match_method(method, "backup type")
         } else if let Ok(method) = env::var("VERSION_CONTROL") {
             // Second argument is for the error string that is returned.
             match_method(&method, "$VERSION_CONTROL")
         } else {
+            // Default if no argument is provided to '--backup'
             Ok(BackupMode::ExistingBackup)
         }
-    } else if short_opt_present {
+    } else if matches.is_present(arguments::OPT_BACKUP_NO_ARG) {
         // the short form of this option, -b does not accept any argument.
         // Using -b is equivalent to using --backup=existing.
         Ok(BackupMode::ExistingBackup)
@@ -172,10 +370,13 @@ pub fn determine_backup_mode(
 ///
 /// # Errors
 ///
-/// If `method` is ambiguous (i.e. may resolve to multiple backup modes) or
-/// invalid, an error is returned. The error contains the formatted error string
-/// which may then be passed to the [`show_usage_error`] macro.
-fn match_method(method: &str, origin: &str) -> Result<BackupMode, String> {
+/// If `method` is invalid or ambiguous (i.e. may resolve to multiple backup
+/// modes), an [`InvalidArgument`][10] or [`AmbiguousArgument`][11] error is
+/// returned, respectively.
+///
+/// [10]: BackupError::InvalidArgument
+/// [11]: BackupError::AmbiguousArgument
+fn match_method(method: &str, origin: &str) -> UResult<BackupMode> {
     let matches: Vec<&&str> = BACKUP_CONTROL_VALUES
         .iter()
         .filter(|val| val.starts_with(method))
@@ -189,21 +390,10 @@ fn match_method(method: &str, origin: &str) -> Result<BackupMode, String> {
             _ => unreachable!(), // cannot happen as we must have exactly one match
                                  // from the list above.
         }
+    } else if matches.is_empty() {
+        Err(BackupError::InvalidArgument(method.to_string(), origin.to_string()).into())
     } else {
-        let error_type = if matches.is_empty() {
-            "invalid"
-        } else {
-            "ambiguous"
-        };
-        Err(format!(
-            "{0} argument ‘{1}’ for ‘{2}’
-Valid arguments are:
-  - ‘none’, ‘off’
-  - ‘simple’, ‘never’
-  - ‘existing’, ‘nil’
-  - ‘numbered’, ‘t’",
-            error_type, method, origin
-        ))
+        Err(BackupError::AmbiguousArgument(method.to_string(), origin.to_string()).into())
     }
 }
 
@@ -255,6 +445,7 @@ mod tests {
     use super::*;
     use std::env;
     // Required to instantiate mutex in shared context
+    use clap::App;
     use lazy_static::lazy_static;
     use std::sync::Mutex;
 
@@ -271,16 +462,20 @@ mod tests {
     // Environment variable for "VERSION_CONTROL"
     static ENV_VERSION_CONTROL: &str = "VERSION_CONTROL";
 
+    fn make_app() -> clap::App<'static, 'static> {
+        App::new("app")
+            .arg(arguments::backup())
+            .arg(arguments::backup_no_args())
+            .arg(arguments::suffix())
+    }
+
     // Defaults to --backup=existing
     #[test]
     fn test_backup_mode_short_only() {
-        let short_opt_present = true;
-        let long_opt_present = false;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "-b"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::ExistingBackup);
     }
@@ -288,13 +483,10 @@ mod tests {
     // --backup takes precedence over -b
     #[test]
     fn test_backup_mode_long_preferred_over_short() {
-        let short_opt_present = true;
-        let long_opt_present = true;
-        let long_opt_value = Some("none");
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "-b", "--backup=none"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::NoBackup);
     }
@@ -302,13 +494,10 @@ mod tests {
     // --backup can be passed without an argument
     #[test]
     fn test_backup_mode_long_without_args_no_env() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "--backup"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::ExistingBackup);
     }
@@ -316,13 +505,10 @@ mod tests {
     // --backup can be passed with an argument only
     #[test]
     fn test_backup_mode_long_with_args() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = Some("simple");
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "--backup=simple"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::SimpleBackup);
     }
@@ -330,43 +516,36 @@ mod tests {
     // --backup errors on invalid argument
     #[test]
     fn test_backup_mode_long_with_args_invalid() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = Some("foobar");
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "--backup=foobar"]);
 
-        let result = determine_backup_mode(short_opt_present, long_opt_present, long_opt_value);
+        let result = determine_backup_mode(&matches);
 
         assert!(result.is_err());
-        let text = result.unwrap_err();
-        assert!(text.contains("invalid argument ‘foobar’ for ‘backup type’"));
+        let text = format!("{}", result.unwrap_err());
+        assert!(text.contains("invalid argument 'foobar' for 'backup type'"));
     }
 
     // --backup errors on ambiguous argument
     #[test]
     fn test_backup_mode_long_with_args_ambiguous() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = Some("n");
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "--backup=n"]);
 
-        let result = determine_backup_mode(short_opt_present, long_opt_present, long_opt_value);
+        let result = determine_backup_mode(&matches);
 
         assert!(result.is_err());
-        let text = result.unwrap_err();
-        assert!(text.contains("ambiguous argument ‘n’ for ‘backup type’"));
+        let text = format!("{}", result.unwrap_err());
+        assert!(text.contains("ambiguous argument 'n' for 'backup type'"));
     }
 
     // --backup accepts shortened arguments (si for simple)
     #[test]
     fn test_backup_mode_long_with_arg_shortened() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = Some("si");
         let _dummy = TEST_MUTEX.lock().unwrap();
+        let matches = make_app().get_matches_from(vec!["app", "--backup=si"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::SimpleBackup);
     }
@@ -374,14 +553,11 @@ mod tests {
     // -b ignores the "VERSION_CONTROL" environment variable
     #[test]
     fn test_backup_mode_short_only_ignore_env() {
-        let short_opt_present = true;
-        let long_opt_present = false;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
         env::set_var(ENV_VERSION_CONTROL, "none");
+        let matches = make_app().get_matches_from(vec!["app", "-b"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::ExistingBackup);
         env::remove_var(ENV_VERSION_CONTROL);
@@ -390,14 +566,11 @@ mod tests {
     // --backup can be passed without an argument, but reads env var if existent
     #[test]
     fn test_backup_mode_long_without_args_with_env() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
         env::set_var(ENV_VERSION_CONTROL, "none");
+        let matches = make_app().get_matches_from(vec!["app", "--backup"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::NoBackup);
         env::remove_var(ENV_VERSION_CONTROL);
@@ -406,48 +579,41 @@ mod tests {
     // --backup errors on invalid VERSION_CONTROL env var
     #[test]
     fn test_backup_mode_long_with_env_var_invalid() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
         env::set_var(ENV_VERSION_CONTROL, "foobar");
+        let matches = make_app().get_matches_from(vec!["app", "--backup"]);
 
-        let result = determine_backup_mode(short_opt_present, long_opt_present, long_opt_value);
+        let result = determine_backup_mode(&matches);
 
         assert!(result.is_err());
-        let text = result.unwrap_err();
-        assert!(text.contains("invalid argument ‘foobar’ for ‘$VERSION_CONTROL’"));
+        let text = format!("{}", result.unwrap_err());
+        assert!(text.contains("invalid argument 'foobar' for '$VERSION_CONTROL'"));
         env::remove_var(ENV_VERSION_CONTROL);
     }
 
     // --backup errors on ambiguous VERSION_CONTROL env var
     #[test]
     fn test_backup_mode_long_with_env_var_ambiguous() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
         env::set_var(ENV_VERSION_CONTROL, "n");
+        let matches = make_app().get_matches_from(vec!["app", "--backup"]);
 
-        let result = determine_backup_mode(short_opt_present, long_opt_present, long_opt_value);
+        let result = determine_backup_mode(&matches);
 
         assert!(result.is_err());
-        let text = result.unwrap_err();
-        assert!(text.contains("ambiguous argument ‘n’ for ‘$VERSION_CONTROL’"));
+        let text = format!("{}", result.unwrap_err());
+        assert!(text.contains("ambiguous argument 'n' for '$VERSION_CONTROL'"));
         env::remove_var(ENV_VERSION_CONTROL);
     }
 
     // --backup accepts shortened env vars (si for simple)
     #[test]
     fn test_backup_mode_long_with_env_var_shortened() {
-        let short_opt_present = false;
-        let long_opt_present = true;
-        let long_opt_value = None;
         let _dummy = TEST_MUTEX.lock().unwrap();
         env::set_var(ENV_VERSION_CONTROL, "si");
+        let matches = make_app().get_matches_from(vec!["app", "--backup"]);
 
-        let result =
-            determine_backup_mode(short_opt_present, long_opt_present, long_opt_value).unwrap();
+        let result = determine_backup_mode(&matches).unwrap();
 
         assert_eq!(result, BackupMode::SimpleBackup);
         env::remove_var(ENV_VERSION_CONTROL);
diff --git a/src/uucore/src/lib/mods/coreopts.rs b/src/uucore/src/lib/mods/coreopts.rs
index f3fb77335..b534ff902 100644
--- a/src/uucore/src/lib/mods/coreopts.rs
+++ b/src/uucore/src/lib/mods/coreopts.rs
@@ -120,7 +120,7 @@ impl<'a> CoreOptions<'a> {
 macro_rules! app {
     ($syntax: expr, $summary: expr, $long_help: expr) => {
         uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText {
-            name: executable!(),
+            name: uucore::util_name(),
             version: env!("CARGO_PKG_VERSION"),
             syntax: $syntax,
             summary: $summary,
@@ -130,7 +130,7 @@ macro_rules! app {
     };
     ($syntax: expr, $summary: expr, $long_help: expr, $display_usage: expr) => {
         uucore::coreopts::CoreOptions::new(uucore::coreopts::HelpText {
-            name: executable!(),
+            name: uucore::util_name(),
             version: env!("CARGO_PKG_VERSION"),
             syntax: $syntax,
             summary: $summary,
diff --git a/src/uucore/src/lib/mods/display.rs b/src/uucore/src/lib/mods/display.rs
new file mode 100644
index 000000000..dfe64184f
--- /dev/null
+++ b/src/uucore/src/lib/mods/display.rs
@@ -0,0 +1,557 @@
+/// Utilities for printing paths, with special attention paid to special
+/// characters and invalid unicode.
+///
+/// For displaying paths in informational messages use `Quotable::quote`. This
+/// will wrap quotes around the filename and add the necessary escapes to make
+/// it copy/paste-able into a shell.
+///
+/// For writing raw paths to stdout when the output should not be quoted or escaped,
+/// use `println_verbatim`. This will preserve invalid unicode.
+///
+/// # Examples
+/// ```
+/// use std::path::Path;
+/// use uucore::display::{Quotable, println_verbatim};
+///
+/// let path = Path::new("foo/bar.baz");
+///
+/// println!("Found file {}", path.quote()); // Prints "Found file 'foo/bar.baz'"
+/// println_verbatim(path)?; // Prints "foo/bar.baz"
+/// # Ok::<(), std::io::Error>(())
+/// ```
+// spell-checker:ignore Fbar
+use std::borrow::Cow;
+use std::ffi::OsStr;
+#[cfg(any(unix, target_os = "wasi", windows))]
+use std::fmt::Write as FmtWrite;
+use std::fmt::{self, Display, Formatter};
+use std::io::{self, Write as IoWrite};
+
+#[cfg(unix)]
+use std::os::unix::ffi::OsStrExt;
+#[cfg(target_os = "wasi")]
+use std::os::wasi::ffi::OsStrExt;
+#[cfg(any(unix, target_os = "wasi"))]
+use std::str::from_utf8;
+
+/// An extension trait for displaying filenames to users.
+pub trait Quotable {
+    /// Returns an object that implements [`Display`] for printing filenames with
+    /// proper quoting and escaping for the platform.
+    ///
+    /// On Unix this corresponds to sh/bash syntax, on Windows Powershell syntax
+    /// is used.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::path::Path;
+    /// use uucore::display::Quotable;
+    ///
+    /// let path = Path::new("foo/bar.baz");
+    ///
+    /// println!("Found file {}", path.quote()); // Prints "Found file 'foo/bar.baz'"
+    /// ```
+    fn quote(&self) -> Quoted<'_>;
+
+    /// Like `quote()`, but don't actually add quotes unless necessary because of
+    /// whitespace or special characters.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::path::Path;
+    /// use uucore::display::Quotable;
+    /// use uucore::show_error;
+    ///
+    /// let foo = Path::new("foo/bar.baz");
+    /// let bar = Path::new("foo bar");
+    ///
+    /// show_error!("{}: Not found", foo.maybe_quote()); // Prints "util: foo/bar.baz: Not found"
+    /// show_error!("{}: Not found", bar.maybe_quote()); // Prints "util: 'foo bar': Not found"
+    /// ```
+    fn maybe_quote(&self) -> Quoted<'_> {
+        let mut quoted = self.quote();
+        quoted.force_quote = false;
+        quoted
+    }
+}
+
+macro_rules! impl_as_ref {
+    ($type: ty) => {
+        impl Quotable for $type {
+            fn quote(&self) -> Quoted<'_> {
+                Quoted::new(self.as_ref())
+            }
+        }
+    };
+}
+
+impl_as_ref!(str);
+impl_as_ref!(&'_ str);
+impl_as_ref!(String);
+impl_as_ref!(std::path::Path);
+impl_as_ref!(&'_ std::path::Path);
+impl_as_ref!(std::path::PathBuf);
+impl_as_ref!(std::path::Component<'_>);
+impl_as_ref!(std::path::Components<'_>);
+impl_as_ref!(std::path::Iter<'_>);
+impl_as_ref!(std::ffi::OsStr);
+impl_as_ref!(&'_ std::ffi::OsStr);
+impl_as_ref!(std::ffi::OsString);
+
+// Cow<'_, str> does not implement AsRef<OsStr> and this is unlikely to be fixed
+// for backward compatibility reasons. Otherwise we'd use a blanket impl.
+impl Quotable for Cow<'_, str> {
+    fn quote(&self) -> Quoted<'_> {
+        let text: &str = self.as_ref();
+        Quoted::new(text.as_ref())
+    }
+}
+
+impl Quotable for Cow<'_, std::path::Path> {
+    fn quote(&self) -> Quoted<'_> {
+        let text: &std::path::Path = self.as_ref();
+        Quoted::new(text.as_ref())
+    }
+}
+
+/// A wrapper around [`OsStr`] for printing paths with quoting and escaping applied.
+#[derive(Debug, Copy, Clone)]
+pub struct Quoted<'a> {
+    text: &'a OsStr,
+    force_quote: bool,
+}
+
+impl<'a> Quoted<'a> {
+    fn new(text: &'a OsStr) -> Self {
+        Quoted {
+            text,
+            force_quote: true,
+        }
+    }
+}
+
+impl Display for Quoted<'_> {
+    #[cfg(any(windows, unix, target_os = "wasi"))]
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        // On Unix we emulate sh syntax. On Windows Powershell.
+        // They're just similar enough to share some code.
+
+        /// Characters with special meaning outside quotes.
+        // https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_02
+        // I don't know why % is in there, and GNU doesn't quote it either.
+        // {} were used in a version elsewhere but seem unnecessary, GNU doesn't
+        // quote them. They're used in function definitions but not in a way we
+        // have to worry about.
+        #[cfg(any(unix, target_os = "wasi"))]
+        const SPECIAL_SHELL_CHARS: &[u8] = b"|&;<>()$`\\\"'*?[]=";
+        // FIXME: I'm not a PowerShell wizard and don't know if this is correct.
+        // I just copied the Unix version, removed \, and added ,{} based on
+        // experimentation.
+        // I have noticed that ~?*[] only get expanded in some contexts, so watch
+        // out for that if doing your own tests.
+        // Get-ChildItem seems unwilling to quote anything so it doesn't help.
+        // There's the additional wrinkle that Windows has stricter requirements
+        // for filenames: I've been testing using a Linux build of PowerShell, but
+        // this code doesn't even compile on Linux.
+        #[cfg(windows)]
+        const SPECIAL_SHELL_CHARS: &[u8] = b"|&;<>()$`\"'*?[]=,{}";
+
+        /// Characters with a special meaning at the beginning of a name.
+        // ~ expands a home directory.
+        // # starts a comment.
+        // ! is a common extension for expanding the shell history.
+        #[cfg(any(unix, target_os = "wasi"))]
+        const SPECIAL_SHELL_CHARS_START: &[char] = &['~', '#', '!'];
+        // Same deal as before, this is possibly incomplete.
+        // A single stand-alone exclamation mark seems to have some special meaning.
+        #[cfg(windows)]
+        const SPECIAL_SHELL_CHARS_START: &[char] = &['~', '#', '@', '!'];
+
+        /// Characters that are interpreted specially in a double-quoted string.
+        #[cfg(any(unix, target_os = "wasi"))]
+        const DOUBLE_UNSAFE: &[u8] = &[b'"', b'`', b'$', b'\\'];
+        #[cfg(windows)]
+        const DOUBLE_UNSAFE: &[u8] = &[b'"', b'`', b'$'];
+
+        let text = match self.text.to_str() {
+            None => return write_escaped(f, self.text),
+            Some(text) => text,
+        };
+
+        let mut is_single_safe = true;
+        let mut is_double_safe = true;
+        let mut requires_quote = self.force_quote;
+
+        if let Some(first) = text.chars().next() {
+            if SPECIAL_SHELL_CHARS_START.contains(&first) {
+                requires_quote = true;
+            }
+            // Unlike in Unix, quoting an argument may stop it
+            // from being recognized as an option. I like that very much.
+            // But we don't want to quote "-" because that's a common
+            // special argument and PowerShell doesn't mind it.
+            #[cfg(windows)]
+            if first == '-' && text.len() > 1 {
+                requires_quote = true;
+            }
+        } else {
+            // Empty string
+            requires_quote = true;
+        }
+
+        for ch in text.chars() {
+            if ch.is_ascii() {
+                let ch = ch as u8;
+                if ch == b'\'' {
+                    is_single_safe = false;
+                }
+                if DOUBLE_UNSAFE.contains(&ch) {
+                    is_double_safe = false;
+                }
+                if !requires_quote && SPECIAL_SHELL_CHARS.contains(&ch) {
+                    requires_quote = true;
+                }
+                if ch.is_ascii_control() {
+                    return write_escaped(f, self.text);
+                }
+            }
+            if !requires_quote && ch.is_whitespace() {
+                // This includes unicode whitespace.
+                // We maybe don't have to escape it, we don't escape other lookalike
+                // characters either, but it's confusing if it goes unquoted.
+                requires_quote = true;
+            }
+        }
+
+        if !requires_quote {
+            return f.write_str(text);
+        } else if is_single_safe {
+            return write_simple(f, text, '\'');
+        } else if is_double_safe {
+            return write_simple(f, text, '\"');
+        } else {
+            return write_single_escaped(f, text);
+        }
+
+        fn write_simple(f: &mut Formatter<'_>, text: &str, quote: char) -> fmt::Result {
+            f.write_char(quote)?;
+            f.write_str(text)?;
+            f.write_char(quote)?;
+            Ok(())
+        }
+
+        #[cfg(any(unix, target_os = "wasi"))]
+        fn write_single_escaped(f: &mut Formatter<'_>, text: &str) -> fmt::Result {
+            let mut iter = text.split('\'');
+            if let Some(chunk) = iter.next() {
+                if !chunk.is_empty() {
+                    write_simple(f, chunk, '\'')?;
+                }
+            }
+            for chunk in iter {
+                f.write_str("\\'")?;
+                if !chunk.is_empty() {
+                    write_simple(f, chunk, '\'')?;
+                }
+            }
+            Ok(())
+        }
+
+        /// Write using the syntax described here:
+        /// https://www.gnu.org/software/bash/manual/html_node/ANSI_002dC-Quoting.html
+        ///
+        /// Supported by these shells:
+        /// - bash
+        /// - zsh
+        /// - busybox sh
+        /// - mksh
+        ///
+        /// Not supported by these:
+        /// - fish
+        /// - dash
+        /// - tcsh
+        #[cfg(any(unix, target_os = "wasi"))]
+        fn write_escaped(f: &mut Formatter<'_>, text: &OsStr) -> fmt::Result {
+            f.write_str("$'")?;
+            for chunk in from_utf8_iter(text.as_bytes()) {
+                match chunk {
+                    Ok(chunk) => {
+                        for ch in chunk.chars() {
+                            match ch {
+                                '\n' => f.write_str("\\n")?,
+                                '\t' => f.write_str("\\t")?,
+                                '\r' => f.write_str("\\r")?,
+                                // We could do \b, \f, \v, etc., but those are
+                                // rare enough to be confusing.
+                                // \0 doesn't work consistently because of the
+                                // octal \nnn syntax, and null bytes can't appear
+                                // in filenames anyway.
+                                ch if ch.is_ascii_control() => write!(f, "\\x{:02X}", ch as u8)?,
+                                '\\' | '\'' => {
+                                    // '?' and '"' can also be escaped this way
+                                    // but AFAICT there's no reason to do so
+                                    f.write_char('\\')?;
+                                    f.write_char(ch)?;
+                                }
+                                ch => {
+                                    f.write_char(ch)?;
+                                }
+                            }
+                        }
+                    }
+                    Err(unit) => write!(f, "\\x{:02X}", unit)?,
+                }
+            }
+            f.write_char('\'')?;
+            Ok(())
+        }
+
+        #[cfg(windows)]
+        fn write_single_escaped(f: &mut Formatter<'_>, text: &str) -> fmt::Result {
+            // Quotes in Powershell can be escaped by doubling them
+            f.write_char('\'')?;
+            let mut iter = text.split('\'');
+            if let Some(chunk) = iter.next() {
+                f.write_str(chunk)?;
+            }
+            for chunk in iter {
+                f.write_str("''")?;
+                f.write_str(chunk)?;
+            }
+            f.write_char('\'')?;
+            Ok(())
+        }
+
+        #[cfg(windows)]
+        fn write_escaped(f: &mut Formatter<'_>, text: &OsStr) -> fmt::Result {
+            // ` takes the role of \ since \ is already used as the path separator.
+            // Things are UTF-16-oriented, so we escape code units as "`u{1234}".
+            use std::char::decode_utf16;
+            use std::os::windows::ffi::OsStrExt;
+
+            f.write_char('"')?;
+            for ch in decode_utf16(text.encode_wide()) {
+                match ch {
+                    Ok(ch) => match ch {
+                        '\0' => f.write_str("`0")?,
+                        '\r' => f.write_str("`r")?,
+                        '\n' => f.write_str("`n")?,
+                        '\t' => f.write_str("`t")?,
+                        ch if ch.is_ascii_control() => write!(f, "`u{{{:04X}}}", ch as u8)?,
+                        '`' => f.write_str("``")?,
+                        '$' => f.write_str("`$")?,
+                        '"' => f.write_str("\"\"")?,
+                        ch => f.write_char(ch)?,
+                    },
+                    Err(err) => write!(f, "`u{{{:04X}}}", err.unpaired_surrogate())?,
+                }
+            }
+            f.write_char('"')?;
+            Ok(())
+        }
+    }
+
+    #[cfg(not(any(unix, target_os = "wasi", windows)))]
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        // As a fallback, we use Rust's own escaping rules.
+        // This is reasonably sane and very easy to implement.
+        // We use single quotes because that's hardcoded in a lot of tests.
+        let text = self.text.to_string_lossy();
+        if self.force_quote || !text.chars().all(|ch| ch.is_alphanumeric() || ch == '.') {
+            write!(f, "'{}'", text.escape_debug())
+        } else {
+            f.write_str(&text)
+        }
+    }
+}
+
+#[cfg(any(unix, target_os = "wasi"))]
+fn from_utf8_iter(mut bytes: &[u8]) -> impl Iterator<Item = Result<&str, u8>> {
+    std::iter::from_fn(move || {
+        if bytes.is_empty() {
+            return None;
+        }
+        match from_utf8(bytes) {
+            Ok(text) => {
+                bytes = &[];
+                Some(Ok(text))
+            }
+            Err(err) if err.valid_up_to() == 0 => {
+                let res = bytes[0];
+                bytes = &bytes[1..];
+                Some(Err(res))
+            }
+            Err(err) => {
+                let (valid, rest) = bytes.split_at(err.valid_up_to());
+                bytes = rest;
+                Some(Ok(from_utf8(valid).unwrap()))
+            }
+        }
+    })
+}
+
+/// Print a path (or `OsStr`-like object) directly to stdout, with a trailing newline,
+/// without losing any information if its encoding is invalid.
+///
+/// This function is appropriate for commands where printing paths is the point and the
+/// output is likely to be captured, like `pwd` and `basename`. For informational output
+/// use `Quotable::quote`.
+///
+/// FIXME: This is lossy on Windows. It could probably be implemented using some low-level
+/// API that takes UTF-16, without going through io::Write. This is not a big priority
+/// because broken filenames are much rarer on Windows than on Unix.
+pub fn println_verbatim<S: AsRef<OsStr>>(text: S) -> io::Result<()> {
+    let stdout = io::stdout();
+    let mut stdout = stdout.lock();
+    #[cfg(any(unix, target_os = "wasi"))]
+    {
+        stdout.write_all(text.as_ref().as_bytes())?;
+        stdout.write_all(b"\n")?;
+    }
+    #[cfg(not(any(unix, target_os = "wasi")))]
+    {
+        writeln!(stdout, "{}", std::path::Path::new(text.as_ref()).display())?;
+    }
+    Ok(())
+}
+
+/// Like `println_verbatim`, without the trailing newline.
+pub fn print_verbatim<S: AsRef<OsStr>>(text: S) -> io::Result<()> {
+    let mut stdout = io::stdout();
+    #[cfg(any(unix, target_os = "wasi"))]
+    {
+        stdout.write_all(text.as_ref().as_bytes())
+    }
+    #[cfg(not(any(unix, target_os = "wasi")))]
+    {
+        write!(stdout, "{}", std::path::Path::new(text.as_ref()).display())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn verify_quote(cases: &[(impl Quotable, &str)]) {
+        for (case, expected) in cases {
+            assert_eq!(case.quote().to_string(), *expected);
+        }
+    }
+
+    fn verify_maybe(cases: &[(impl Quotable, &str)]) {
+        for (case, expected) in cases {
+            assert_eq!(case.maybe_quote().to_string(), *expected);
+        }
+    }
+
+    /// This should hold on any platform, or else other tests fail.
+    #[test]
+    fn test_basic() {
+        verify_quote(&[
+            ("foo", "'foo'"),
+            ("", "''"),
+            ("foo/bar.baz", "'foo/bar.baz'"),
+        ]);
+        verify_maybe(&[
+            ("foo", "foo"),
+            ("", "''"),
+            ("foo bar", "'foo bar'"),
+            ("$foo", "'$foo'"),
+            ("-", "-"),
+        ]);
+    }
+
+    #[cfg(any(unix, target_os = "wasi", windows))]
+    #[test]
+    fn test_common() {
+        verify_maybe(&[
+            ("a#b", "a#b"),
+            ("#ab", "'#ab'"),
+            ("a~b", "a~b"),
+            ("!", "'!'"),
+        ]);
+    }
+
+    #[cfg(any(unix, target_os = "wasi"))]
+    #[test]
+    fn test_unix() {
+        verify_quote(&[
+            ("can't", r#""can't""#),
+            (r#"can'"t"#, r#"'can'\''"t'"#),
+            (r#"can'$t"#, r#"'can'\''$t'"#),
+            ("foo\nb\ta\r\\\0`r", r#"$'foo\nb\ta\r\\\x00`r'"#),
+            ("foo\x02", r#"$'foo\x02'"#),
+            (r#"'$''"#, r#"\''$'\'\'"#),
+        ]);
+        verify_quote(&[(OsStr::from_bytes(b"foo\xFF"), r#"$'foo\xFF'"#)]);
+        verify_maybe(&[
+            ("-x", "-x"),
+            ("a,b", "a,b"),
+            ("a\\b", "'a\\b'"),
+            ("}", ("}")),
+        ]);
+    }
+
+    #[cfg(windows)]
+    #[test]
+    fn test_windows() {
+        use std::ffi::OsString;
+        use std::os::windows::ffi::OsStringExt;
+        verify_quote(&[
+            (r#"foo\bar"#, r#"'foo\bar'"#),
+            ("can't", r#""can't""#),
+            (r#"can'"t"#, r#"'can''"t'"#),
+            (r#"can'$t"#, r#"'can''$t'"#),
+            ("foo\nb\ta\r\\\0`r", r#""foo`nb`ta`r\`0``r""#),
+            ("foo\x02", r#""foo`u{0002}""#),
+            (r#"'$''"#, r#"'''$'''''"#),
+        ]);
+        verify_quote(&[(
+            OsString::from_wide(&[b'x' as u16, 0xD800]),
+            r#""x`u{D800}""#,
+        )]);
+        verify_maybe(&[
+            ("-x", "'-x'"),
+            ("a,b", "'a,b'"),
+            ("a\\b", "a\\b"),
+            ("}", "'}'"),
+        ]);
+    }
+
+    #[cfg(any(unix, target_os = "wasi"))]
+    #[test]
+    fn test_utf8_iter() {
+        type ByteStr = &'static [u8];
+        type Chunk = Result<&'static str, u8>;
+        const CASES: &[(ByteStr, &[Chunk])] = &[
+            (b"", &[]),
+            (b"hello", &[Ok("hello")]),
+            // Immediately invalid
+            (b"\xFF", &[Err(b'\xFF')]),
+            // Incomplete UTF-8
+            (b"\xC2", &[Err(b'\xC2')]),
+            (b"\xF4\x8F", &[Err(b'\xF4'), Err(b'\x8F')]),
+            (b"\xFF\xFF", &[Err(b'\xFF'), Err(b'\xFF')]),
+            (b"hello\xC2", &[Ok("hello"), Err(b'\xC2')]),
+            (b"\xFFhello", &[Err(b'\xFF'), Ok("hello")]),
+            (b"\xFF\xC2hello", &[Err(b'\xFF'), Err(b'\xC2'), Ok("hello")]),
+            (b"foo\xFFbar", &[Ok("foo"), Err(b'\xFF'), Ok("bar")]),
+            (
+                b"foo\xF4\x8Fbar",
+                &[Ok("foo"), Err(b'\xF4'), Err(b'\x8F'), Ok("bar")],
+            ),
+            (
+                b"foo\xFF\xC2bar",
+                &[Ok("foo"), Err(b'\xFF'), Err(b'\xC2'), Ok("bar")],
+            ),
+        ];
+        for &(case, expected) in CASES {
+            assert_eq!(
+                from_utf8_iter(case).collect::<Vec<_>>().as_slice(),
+                expected
+            );
+        }
+    }
+}
diff --git a/src/uucore/src/lib/mods/error.rs b/src/uucore/src/lib/mods/error.rs
index c64e7df66..c04a0f2f1 100644
--- a/src/uucore/src/lib/mods/error.rs
+++ b/src/uucore/src/lib/mods/error.rs
@@ -6,11 +6,11 @@
 //! This module provides types to reconcile these exit codes with idiomatic Rust error
 //! handling. This has a couple advantages over manually using [`std::process::exit`]:
 //! 1. It enables the use of `?`, `map_err`, `unwrap_or`, etc. in `uumain`.
-//! 1. It encourages the use of `UResult`/`Result` in functions in the utils.
+//! 1. It encourages the use of [`UResult`]/[`Result`] in functions in the utils.
 //! 1. The error messages are largely standardized across utils.
 //! 1. Standardized error messages can be created from external result types
 //!    (i.e. [`std::io::Result`] & `clap::ClapResult`).
-//! 1. `set_exit_code` takes away the burden of manually tracking exit codes for non-fatal errors.
+//! 1. [`set_exit_code`] takes away the burden of manually tracking exit codes for non-fatal errors.
 //!
 //! # Usage
 //! The signature of a typical util should be:
@@ -19,7 +19,7 @@
 //!     ...
 //! }
 //! ```
-//! [`UResult`] is a simple wrapper around [`Result`] with a custom error type: [`UError`]. The
+//! [`UResult`] is a simple wrapper around [`Result`] with a custom error trait: [`UError`]. The
 //! most important difference with types implementing [`std::error::Error`] is that [`UError`]s
 //! can specify the exit code of the program when they are returned from `uumain`:
 //! * When `Ok` is returned, the code set with [`set_exit_code`] is used as exit code. If
@@ -41,13 +41,15 @@
 //! [`set_exit_code`]. See the documentation on that function for more information.
 //!
 //! # Guidelines
-//! * Use common errors where possible.
-//! * Add variants to [`UCommonError`] if an error appears in multiple utils.
+//! * Use error types from `uucore` where possible.
+//! * Add error types to `uucore` if an error appears in multiple utils.
 //! * Prefer proper custom error types over [`ExitCode`] and [`USimpleError`].
 //! * [`USimpleError`] may be used in small utils with simple error handling.
 //! * Using [`ExitCode`] is not recommended but can be useful for converting utils to use
 //!   [`UResult`].
 
+// spell-checker:ignore uioerror
+
 use std::{
     error::Error,
     fmt::{Display, Formatter},
@@ -85,115 +87,10 @@ pub fn set_exit_code(code: i32) {
     EXIT_CODE.store(code, Ordering::SeqCst);
 }
 
-/// Should be returned by all utils.
-///
-/// Two additional methods are implemented on [`UResult`] on top of the normal [`Result`] methods:
-/// `map_err_code` & `map_err_code_message`.
-///
-/// These methods are used to convert [`UCommonError`]s into errors with a custom error code and
-/// message.
-pub type UResult<T> = Result<T, UError>;
+/// Result type that should be returned by all utils.
+pub type UResult<T> = Result<T, Box<dyn UError>>;
 
-trait UResultTrait<T> {
-    fn map_err_code(self, mapper: fn(&UCommonError) -> Option<i32>) -> Self;
-    fn map_err_code_and_message(self, mapper: fn(&UCommonError) -> Option<(i32, String)>) -> Self;
-}
-
-impl<T> UResultTrait<T> for UResult<T> {
-    fn map_err_code(self, mapper: fn(&UCommonError) -> Option<i32>) -> Self {
-        if let Err(UError::Common(error)) = self {
-            if let Some(code) = mapper(&error) {
-                Err(UCommonErrorWithCode { code, error }.into())
-            } else {
-                Err(error.into())
-            }
-        } else {
-            self
-        }
-    }
-
-    fn map_err_code_and_message(self, mapper: fn(&UCommonError) -> Option<(i32, String)>) -> Self {
-        if let Err(UError::Common(ref error)) = self {
-            if let Some((code, message)) = mapper(error) {
-                return Err(USimpleError { code, message }.into());
-            }
-        }
-        self
-    }
-}
-
-/// The error type of [`UResult`].
-///
-/// `UError::Common` errors are defined in [`uucore`](crate) while `UError::Custom` errors are
-/// defined by the utils.
-/// ```
-/// use uucore::error::USimpleError;
-/// let err = USimpleError::new(1, "Error!!".into());
-/// assert_eq!(1, err.code());
-/// assert_eq!(String::from("Error!!"), format!("{}", err));
-/// ```
-pub enum UError {
-    Common(UCommonError),
-    Custom(Box<dyn UCustomError>),
-}
-
-impl UError {
-    /// The error code of [`UResult`]
-    ///
-    /// This function defines the error code associated with an instance of
-    /// [`UResult`]. To associate error codes for self-defined instances of
-    /// `UResult::Custom` (i.e. [`UCustomError`]), implement the
-    /// [`code`-function there](UCustomError::code).
-    pub fn code(&self) -> i32 {
-        match self {
-            UError::Common(e) => e.code(),
-            UError::Custom(e) => e.code(),
-        }
-    }
-
-    /// Whether to print usage help for a [`UResult`]
-    ///
-    /// Defines if a variant of [`UResult`] should print a short usage message
-    /// below the error. The usage message is printed when this function returns
-    /// `true`. To do this for self-defined instances of `UResult::Custom` (i.e.
-    /// [`UCustomError`]), implement the [`usage`-function
-    /// there](UCustomError::usage).
-    pub fn usage(&self) -> bool {
-        match self {
-            UError::Common(e) => e.usage(),
-            UError::Custom(e) => e.usage(),
-        }
-    }
-}
-
-impl From<UCommonError> for UError {
-    fn from(v: UCommonError) -> Self {
-        UError::Common(v)
-    }
-}
-
-impl From<i32> for UError {
-    fn from(v: i32) -> Self {
-        UError::Custom(Box::new(ExitCode(v)))
-    }
-}
-
-impl<E: UCustomError + 'static> From<E> for UError {
-    fn from(v: E) -> Self {
-        UError::Custom(Box::new(v) as Box<dyn UCustomError>)
-    }
-}
-
-impl Display for UError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            UError::Common(e) => e.fmt(f),
-            UError::Custom(e) => e.fmt(f),
-        }
-    }
-}
-
-/// Custom errors defined by the utils.
+/// Custom errors defined by the utils and `uucore`.
 ///
 /// All errors should implement [`std::error::Error`], [`std::fmt::Display`] and
 /// [`std::fmt::Debug`] and have an additional `code` method that specifies the
@@ -202,7 +99,10 @@ impl Display for UError {
 /// An example of a custom error from `ls`:
 ///
 /// ```
-/// use uucore::error::{UCustomError, UResult};
+/// use uucore::{
+///     display::Quotable,
+///     error::{UError, UResult}
+/// };
 /// use std::{
 ///     error::Error,
 ///     fmt::{Display, Debug},
@@ -215,7 +115,7 @@ impl Display for UError {
 ///     NoMetadata(PathBuf),
 /// }
 ///
-/// impl UCustomError for LsError {
+/// impl UError for LsError {
 ///     fn code(&self) -> i32 {
 ///         match self {
 ///             LsError::InvalidLineWidth(_) => 2,
@@ -229,8 +129,8 @@ impl Display for UError {
 /// impl Display for LsError {
 ///     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 ///         match self {
-///             LsError::InvalidLineWidth(s) => write!(f, "invalid line width: '{}'", s),
-///             LsError::NoMetadata(p) => write!(f, "could not open file: '{}'", p.display()),
+///             LsError::InvalidLineWidth(s) => write!(f, "invalid line width: {}", s.quote()),
+///             LsError::NoMetadata(p) => write!(f, "could not open file: {}", p.quote()),
 ///         }
 ///     }
 /// }
@@ -246,12 +146,12 @@ impl Display for UError {
 /// }
 /// ```
 ///
-/// The call to `into()` is required to convert the [`UCustomError`] to an
-/// instance of [`UError`].
+/// The call to `into()` is required to convert the `LsError` to
+/// [`Box<dyn UError>`]. The implementation for `From` is provided automatically.
 ///
 /// A crate like [`quick_error`](https://crates.io/crates/quick-error) might
 /// also be used, but will still require an `impl` for the `code` method.
-pub trait UCustomError: Error {
+pub trait UError: Error + Send {
     /// Error code of a custom error.
     ///
     /// Set a return value for each variant of an enum-type to associate an
@@ -261,7 +161,10 @@ pub trait UCustomError: Error {
     /// # Example
     ///
     /// ```
-    /// use uucore::error::{UCustomError};
+    /// use uucore::{
+    ///     display::Quotable,
+    ///     error::UError
+    /// };
     /// use std::{
     ///     error::Error,
     ///     fmt::{Display, Debug},
@@ -275,7 +178,7 @@ pub trait UCustomError: Error {
     ///     Bing(),
     /// }
     ///
-    /// impl UCustomError for MyError {
+    /// impl UError for MyError {
     ///     fn code(&self) -> i32 {
     ///         match self {
     ///             MyError::Foo(_) => 2,
@@ -292,8 +195,8 @@ pub trait UCustomError: Error {
     ///     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     ///         use MyError as ME;
     ///         match self {
-    ///             ME::Foo(s) => write!(f, "Unknown Foo: '{}'", s),
-    ///             ME::Bar(p) => write!(f, "Couldn't find Bar: '{}'", p.display()),
+    ///             ME::Foo(s) => write!(f, "Unknown Foo: {}", s.quote()),
+    ///             ME::Bar(p) => write!(f, "Couldn't find Bar: {}", p.quote()),
     ///             ME::Bing() => write!(f, "Exterminate!"),
     ///         }
     ///     }
@@ -306,13 +209,16 @@ pub trait UCustomError: Error {
     /// Print usage help to a custom error.
     ///
     /// Return true or false to control whether a short usage help is printed
-    /// below the error message. The usage help is in the format: "Try '{name}
-    /// --help' for more information." and printed only if `true` is returned.
+    /// below the error message. The usage help is in the format: "Try `{name}
+    /// --help` for more information." and printed only if `true` is returned.
     ///
     /// # Example
     ///
     /// ```
-    /// use uucore::error::{UCustomError};
+    /// use uucore::{
+    ///     display::Quotable,
+    ///     error::UError
+    /// };
     /// use std::{
     ///     error::Error,
     ///     fmt::{Display, Debug},
@@ -326,7 +232,7 @@ pub trait UCustomError: Error {
     ///     Bing(),
     /// }
     ///
-    /// impl UCustomError for MyError {
+    /// impl UError for MyError {
     ///     fn usage(&self) -> bool {
     ///         match self {
     ///             // This will have a short usage help appended
@@ -343,8 +249,8 @@ pub trait UCustomError: Error {
     ///     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     ///         use MyError as ME;
     ///         match self {
-    ///             ME::Foo(s) => write!(f, "Unknown Foo: '{}'", s),
-    ///             ME::Bar(p) => write!(f, "Couldn't find Bar: '{}'", p.display()),
+    ///             ME::Foo(s) => write!(f, "Unknown Foo: {}", s.quote()),
+    ///             ME::Bar(p) => write!(f, "Couldn't find Bar: {}", p.quote()),
     ///             ME::Bing() => write!(f, "Exterminate!"),
     ///         }
     ///     }
@@ -355,47 +261,23 @@ pub trait UCustomError: Error {
     }
 }
 
-impl From<Box<dyn UCustomError>> for i32 {
-    fn from(e: Box<dyn UCustomError>) -> i32 {
-        e.code()
+impl<T> From<T> for Box<dyn UError>
+where
+    T: UError + 'static,
+{
+    fn from(t: T) -> Box<dyn UError> {
+        Box::new(t)
     }
 }
 
-/// A [`UCommonError`] with an overridden exit code.
+/// A simple error type with an exit code and a message that implements [`UError`].
 ///
-/// This exit code is returned instead of the default exit code for the [`UCommonError`]. This is
-/// typically created with the either the `UResult::map_err_code` or `UCommonError::with_code`
-/// method.
-#[derive(Debug)]
-pub struct UCommonErrorWithCode {
-    code: i32,
-    error: UCommonError,
-}
-
-impl Error for UCommonErrorWithCode {}
-
-impl Display for UCommonErrorWithCode {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
-        self.error.fmt(f)
-    }
-}
-
-impl UCustomError for UCommonErrorWithCode {
-    fn code(&self) -> i32 {
-        self.code
-    }
-}
-
-/// A simple error type with an exit code and a message that implements [`UCustomError`].
-///
-/// It is typically created with the `UResult::map_err_code_and_message` method. Alternatively, it
-/// can be constructed by manually:
 /// ```
 /// use uucore::error::{UResult, USimpleError};
 /// let err = USimpleError { code: 1, message: "error!".into()};
 /// let res: UResult<()> = Err(err.into());
 /// // or using the `new` method:
-/// let res: UResult<()> = Err(USimpleError::new(1, "error!".into()));
+/// let res: UResult<()> = Err(USimpleError::new(1, "error!"));
 /// ```
 #[derive(Debug)]
 pub struct USimpleError {
@@ -405,8 +287,11 @@ pub struct USimpleError {
 
 impl USimpleError {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(code: i32, message: String) -> UError {
-        UError::Custom(Box::new(Self { code, message }))
+    pub fn new<S: Into<String>>(code: i32, message: S) -> Box<dyn UError> {
+        Box::new(Self {
+            code,
+            message: message.into(),
+        })
     }
 }
 
@@ -418,7 +303,7 @@ impl Display for USimpleError {
     }
 }
 
-impl UCustomError for USimpleError {
+impl UError for USimpleError {
     fn code(&self) -> i32 {
         self.code
     }
@@ -432,8 +317,11 @@ pub struct UUsageError {
 
 impl UUsageError {
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(code: i32, message: String) -> UError {
-        UError::Custom(Box::new(Self { code, message }))
+    pub fn new<S: Into<String>>(code: i32, message: S) -> Box<dyn UError> {
+        Box::new(Self {
+            code,
+            message: message.into(),
+        })
     }
 }
 
@@ -445,7 +333,7 @@ impl Display for UUsageError {
     }
 }
 
-impl UCustomError for UUsageError {
+impl UError for UUsageError {
     fn code(&self) -> i32 {
         self.code
     }
@@ -463,20 +351,23 @@ impl UCustomError for UUsageError {
 /// There are two ways to construct this type: with [`UIoError::new`] or by calling the
 /// [`FromIo::map_err_context`] method on a [`std::io::Result`] or [`std::io::Error`].
 /// ```
-/// use uucore::error::{FromIo, UResult, UIoError, UCommonError};
+/// use uucore::{
+///     display::Quotable,
+///     error::{FromIo, UResult, UIoError, UError}
+/// };
 /// use std::fs::File;
 /// use std::path::Path;
 /// let path = Path::new("test.txt");
 ///
 /// // Manual construction
-/// let e: UIoError = UIoError::new(
+/// let e: Box<dyn UError> = UIoError::new(
 ///     std::io::ErrorKind::NotFound,
-///     format!("cannot access '{}'", path.display())
+///     format!("cannot access {}", path.quote())
 /// );
 /// let res: UResult<()> = Err(e.into());
 ///
 /// // Converting from an `std::io::Error`.
-/// let res: UResult<File> = File::open(path).map_err_context(|| format!("cannot access '{}'", path.display()));
+/// let res: UResult<File> = File::open(path).map_err_context(|| format!("cannot access {}", path.quote()));
 /// ```
 #[derive(Debug)]
 pub struct UIoError {
@@ -485,31 +376,28 @@ pub struct UIoError {
 }
 
 impl UIoError {
-    pub fn new(kind: std::io::ErrorKind, context: String) -> Self {
-        Self {
-            context,
-            inner: std::io::Error::new(kind, ""),
-        }
-    }
-
-    pub fn code(&self) -> i32 {
-        1
-    }
-
-    pub fn usage(&self) -> bool {
-        false
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new<S: Into<String>>(kind: std::io::ErrorKind, context: S) -> Box<dyn UError> {
+        Box::new(Self {
+            context: context.into(),
+            inner: kind.into(),
+        })
     }
 }
 
+impl UError for UIoError {}
+
 impl Error for UIoError {}
 
 impl Display for UIoError {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         use std::io::ErrorKind::*;
-        write!(
-            f,
-            "{}: {}",
-            self.context,
+
+        let mut message;
+        let message = if self.inner.raw_os_error().is_some() {
+            // These are errors that come directly from the OS.
+            // We want to normalize their messages across systems,
+            // and we want to strip the "(os error X)" suffix.
             match self.inner.kind() {
                 NotFound => "No such file or directory",
                 PermissionDenied => "Permission denied",
@@ -527,97 +415,142 @@ impl Display for UIoError {
                 TimedOut => "Timed out",
                 WriteZero => "Write zero",
                 Interrupted => "Interrupted",
-                Other => "Other",
                 UnexpectedEof => "Unexpected end of file",
-                _ => panic!("Unexpected io error: {}", self.inner),
-            },
-        )
+                _ => {
+                    // TODO: When the new error variants
+                    // (https://github.com/rust-lang/rust/issues/86442)
+                    // are stabilized, we should add them to the match statement.
+                    message = strip_errno(&self.inner);
+                    capitalize(&mut message);
+                    &message
+                }
+            }
+        } else {
+            // These messages don't need as much normalization, and the above
+            // messages wouldn't always be a good substitute.
+            // For example, ErrorKind::NotFound doesn't necessarily mean it was
+            // a file that was not found.
+            // There are also errors with entirely custom messages.
+            message = self.inner.to_string();
+            capitalize(&mut message);
+            &message
+        };
+        write!(f, "{}: {}", self.context, message)
     }
 }
 
-/// Enables the conversion from `std::io::Error` to `UError` and from `std::io::Result` to
-/// `UResult`.
+/// Capitalize the first character of an ASCII string.
+fn capitalize(text: &mut str) {
+    if let Some(first) = text.get_mut(..1) {
+        first.make_ascii_uppercase();
+    }
+}
+
+/// Strip the trailing " (os error XX)" from io error strings.
+pub fn strip_errno(err: &std::io::Error) -> String {
+    let mut msg = err.to_string();
+    if let Some(pos) = msg.find(" (os error ") {
+        msg.truncate(pos);
+    }
+    msg
+}
+
+/// Enables the conversion from [`std::io::Error`] to [`UError`] and from [`std::io::Result`] to
+/// [`UResult`].
 pub trait FromIo<T> {
     fn map_err_context(self, context: impl FnOnce() -> String) -> T;
 }
 
-impl FromIo<UIoError> for std::io::Error {
-    fn map_err_context(self, context: impl FnOnce() -> String) -> UIoError {
-        UIoError {
+impl FromIo<Box<UIoError>> for std::io::Error {
+    fn map_err_context(self, context: impl FnOnce() -> String) -> Box<UIoError> {
+        Box::new(UIoError {
             context: (context)(),
             inner: self,
-        }
+        })
     }
 }
 
 impl<T> FromIo<UResult<T>> for std::io::Result<T> {
     fn map_err_context(self, context: impl FnOnce() -> String) -> UResult<T> {
-        self.map_err(|e| UError::Common(UCommonError::Io(e.map_err_context(context))))
+        self.map_err(|e| e.map_err_context(context) as Box<dyn UError>)
     }
 }
 
-impl FromIo<UIoError> for std::io::ErrorKind {
-    fn map_err_context(self, context: impl FnOnce() -> String) -> UIoError {
-        UIoError {
+impl FromIo<Box<UIoError>> for std::io::ErrorKind {
+    fn map_err_context(self, context: impl FnOnce() -> String) -> Box<UIoError> {
+        Box::new(UIoError {
             context: (context)(),
             inner: std::io::Error::new(self, ""),
-        }
+        })
     }
 }
 
-impl From<UIoError> for UCommonError {
-    fn from(e: UIoError) -> UCommonError {
-        UCommonError::Io(e)
-    }
-}
-
-impl From<UIoError> for UError {
-    fn from(e: UIoError) -> UError {
-        let common: UCommonError = e.into();
-        common.into()
-    }
-}
-
-/// Common errors for utilities.
+/// Shorthand to construct [`UIoError`]-instances.
 ///
-/// If identical errors appear across multiple utilities, they should be added here.
-#[derive(Debug)]
-pub enum UCommonError {
-    Io(UIoError),
-    // Clap(UClapError),
-}
-
-impl UCommonError {
-    pub fn with_code(self, code: i32) -> UCommonErrorWithCode {
-        UCommonErrorWithCode { code, error: self }
-    }
-
-    pub fn code(&self) -> i32 {
-        1
-    }
-
-    pub fn usage(&self) -> bool {
-        false
-    }
-}
-
-impl From<UCommonError> for i32 {
-    fn from(common: UCommonError) -> i32 {
-        match common {
-            UCommonError::Io(e) => e.code(),
-        }
-    }
-}
-
-impl Error for UCommonError {}
-
-impl Display for UCommonError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
-        match self {
-            UCommonError::Io(e) => e.fmt(f),
-        }
-    }
-}
+/// This macro serves as a convenience call to quickly construct instances of
+/// [`UIoError`]. It takes:
+///
+/// - An instance of [`std::io::Error`]
+/// - A `format!`-compatible string and
+/// - An arbitrary number of arguments to the format string
+///
+/// In exactly this order. It is equivalent to the more verbose code seen in the
+/// example.
+///
+/// # Examples
+///
+/// ```
+/// use uucore::error::UIoError;
+/// use uucore::uio_error;
+///
+/// let io_err = std::io::Error::new(
+///     std::io::ErrorKind::PermissionDenied, "fix me please!"
+/// );
+///
+/// let uio_err = UIoError::new(
+///     io_err.kind(),
+///     format!("Error code: {}", 2)
+/// );
+///
+/// let other_uio_err = uio_error!(io_err, "Error code: {}", 2);
+///
+/// // prints "fix me please!: Permission denied"
+/// println!("{}", uio_err);
+/// // prints "Error code: 2: Permission denied"
+/// println!("{}", other_uio_err);
+/// ```
+///
+/// The [`std::fmt::Display`] impl of [`UIoError`] will then ensure that an
+/// appropriate error message relating to the actual error kind of the
+/// [`std::io::Error`] is appended to whatever error message is defined in
+/// addition (as secondary argument).
+///
+/// If you want to show only the error message for the [`std::io::ErrorKind`]
+/// that's contained in [`UIoError`], pass the second argument as empty string:
+///
+/// ```
+/// use uucore::error::UIoError;
+/// use uucore::uio_error;
+///
+/// let io_err = std::io::Error::new(
+///     std::io::ErrorKind::PermissionDenied, "fix me please!"
+/// );
+///
+/// let other_uio_err = uio_error!(io_err, "");
+///
+/// // prints: ": Permission denied"
+/// println!("{}", other_uio_err);
+/// ```
+//#[macro_use]
+#[macro_export]
+macro_rules! uio_error(
+    ($err:expr, $($args:tt)+) => ({
+        UIoError::new(
+            $err.kind(),
+            format!($($args)+)
+        )
+    })
+);
 
 /// A special error type that does not print any message when returned from
 /// `uumain`. Especially useful for porting utilities to using [`UResult`].
@@ -632,10 +565,17 @@ impl Display for UCommonError {
 /// let res: UResult<()> = Err(1.into());
 /// ```
 /// This type is especially useful for a trivial conversion from utils returning [`i32`] to
-/// returning [`UResult`].  
+/// returning [`UResult`].
 #[derive(Debug)]
 pub struct ExitCode(pub i32);
 
+impl ExitCode {
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(code: i32) -> Box<dyn UError> {
+        Box::new(Self(code))
+    }
+}
+
 impl Error for ExitCode {}
 
 impl Display for ExitCode {
@@ -644,8 +584,14 @@ impl Display for ExitCode {
     }
 }
 
-impl UCustomError for ExitCode {
+impl UError for ExitCode {
     fn code(&self) -> i32 {
         self.0
     }
 }
+
+impl From<i32> for Box<dyn UError> {
+    fn from(i: i32) -> Self {
+        ExitCode::new(i)
+    }
+}
diff --git a/src/uucore/src/lib/mods/panic.rs b/src/uucore/src/lib/mods/panic.rs
index ba0ecdf12..ebba10429 100644
--- a/src/uucore/src/lib/mods/panic.rs
+++ b/src/uucore/src/lib/mods/panic.rs
@@ -1,17 +1,42 @@
+//! Custom panic hooks that allow silencing certain types of errors.
+//!
+//! Use the [`mute_sigpipe_panic`] function to silence panics caused by
+//! broken pipe errors. This can happen when a process is still
+//! producing data when the consuming process terminates and closes the
+//! pipe. For example,
+//!
+//! ```sh
+//! $ seq inf | head -n 1
+//! ```
+//!
 use std::panic;
+use std::panic::PanicInfo;
 
-//## SIGPIPE handling background/discussions ...
-//* `uutils` ~ <https://github.com/uutils/coreutils/issues/374> , <https://github.com/uutils/coreutils/pull/1106>
-//* rust and `rg` ~ <https://github.com/rust-lang/rust/issues/62569> , <https://github.com/BurntSushi/ripgrep/issues/200> , <https://github.com/crev-dev/cargo-crev/issues/287>
+/// Decide whether a panic was caused by a broken pipe (SIGPIPE) error.
+fn is_broken_pipe(info: &PanicInfo) -> bool {
+    if let Some(res) = info.payload().downcast_ref::<String>() {
+        if res.contains("BrokenPipe") || res.contains("Broken pipe") {
+            return true;
+        }
+    }
+    false
+}
 
+/// Terminate without error on panics that occur due to broken pipe errors.
+///
+/// For background discussions on `SIGPIPE` handling, see
+///
+/// * https://github.com/uutils/coreutils/issues/374
+/// * https://github.com/uutils/coreutils/pull/1106
+/// * https://github.com/rust-lang/rust/issues/62569
+/// * https://github.com/BurntSushi/ripgrep/issues/200
+/// * https://github.com/crev-dev/cargo-crev/issues/287
+///
 pub fn mute_sigpipe_panic() {
     let hook = panic::take_hook();
     panic::set_hook(Box::new(move |info| {
-        if let Some(res) = info.payload().downcast_ref::<String>() {
-            if res.contains("BrokenPipe") {
-                return;
-            }
+        if !is_broken_pipe(info) {
+            hook(info)
         }
-        hook(info)
     }));
 }
diff --git a/src/uucore/src/lib/mods/ranges.rs b/src/uucore/src/lib/mods/ranges.rs
index 9e1e67d5a..f142e14fb 100644
--- a/src/uucore/src/lib/mods/ranges.rs
+++ b/src/uucore/src/lib/mods/ranges.rs
@@ -9,6 +9,8 @@
 
 use std::str::FromStr;
 
+use crate::display::Quotable;
+
 #[derive(PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub struct Range {
     pub low: usize,
@@ -86,7 +88,7 @@ impl Range {
 
         for item in list.split(',') {
             let range_item = FromStr::from_str(item)
-                .map_err(|e| format!("range '{}' was invalid: {}", item, e))?;
+                .map_err(|e| format!("range {} was invalid: {}", item.quote(), e))?;
             ranges.push(range_item);
         }
 
diff --git a/src/uucore/src/lib/parser/parse_size.rs b/src/uucore/src/lib/parser/parse_size.rs
index ec0b08c9e..c05c0d3f1 100644
--- a/src/uucore/src/lib/parser/parse_size.rs
+++ b/src/uucore/src/lib/parser/parse_size.rs
@@ -9,6 +9,8 @@ use std::convert::TryFrom;
 use std::error::Error;
 use std::fmt;
 
+use crate::display::Quotable;
+
 /// Parse a size string into a number of bytes.
 ///
 /// A size string comprises an integer and an optional unit. The unit
@@ -107,6 +109,9 @@ impl fmt::Display for ParseSizeError {
     }
 }
 
+// FIXME: It's more idiomatic to move the formatting into the Display impl,
+// but there's a lot of downstream code that constructs these errors manually
+// that would be affected
 impl ParseSizeError {
     fn parse_failure(s: &str) -> ParseSizeError {
         // stderr on linux (GNU coreutils 8.32) (LC_ALL=C)
@@ -140,7 +145,7 @@ impl ParseSizeError {
         //                   --width
         //                   --strings
         // etc.
-        ParseSizeError::ParseFailure(format!("'{}'", s))
+        ParseSizeError::ParseFailure(format!("{}", s.quote()))
     }
 
     fn size_too_big(s: &str) -> ParseSizeError {
@@ -160,7 +165,10 @@ impl ParseSizeError {
         // stderr on macos (brew - GNU coreutils 8.32) also differs for the same version, e.g.:
         // ghead:   invalid number of bytes: '1Y': Value too large to be stored in data type
         // gtail:   invalid number of bytes: '1Y': Value too large to be stored in data type
-        ParseSizeError::SizeTooBig(format!("'{}': Value too large for defined data type", s))
+        ParseSizeError::SizeTooBig(format!(
+            "{}: Value too large for defined data type",
+            s.quote()
+        ))
     }
 }
 
@@ -262,7 +270,7 @@ mod tests {
         for &test_string in &test_strings {
             assert_eq!(
                 parse_size(test_string).unwrap_err(),
-                ParseSizeError::ParseFailure(format!("'{}'", test_string))
+                ParseSizeError::ParseFailure(format!("{}", test_string.quote()))
             );
         }
     }
diff --git a/src/uucore/src/lib/parser/parse_time.rs b/src/uucore/src/lib/parser/parse_time.rs
index fdf43b727..68f0ca8d0 100644
--- a/src/uucore/src/lib/parser/parse_time.rs
+++ b/src/uucore/src/lib/parser/parse_time.rs
@@ -9,6 +9,8 @@
 
 use std::time::Duration;
 
+use crate::display::Quotable;
+
 pub fn from_str(string: &str) -> Result<Duration, String> {
     let len = string.len();
     if len == 0 {
@@ -25,13 +27,13 @@ pub fn from_str(string: &str) -> Result<Duration, String> {
             if string == "inf" || string == "infinity" {
                 ("inf", 1)
             } else {
-                return Err(format!("invalid time interval '{}'", string));
+                return Err(format!("invalid time interval {}", string.quote()));
             }
         }
     };
     let num = numstr
         .parse::<f64>()
-        .map_err(|e| format!("invalid time interval '{}': {}", string, e))?;
+        .map_err(|e| format!("invalid time interval {}: {}", string.quote(), e))?;
 
     const NANOS_PER_SEC: u32 = 1_000_000_000;
     let whole_secs = num.trunc();
diff --git a/src/uucore_procs/Cargo.toml b/src/uucore_procs/Cargo.toml
index 809bbc867..3efe80e00 100644
--- a/src/uucore_procs/Cargo.toml
+++ b/src/uucore_procs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uucore_procs"
-version = "0.0.6"
+version = "0.0.7"
 authors = ["Roy Ivy III <rivy.dev@gmail.com>"]
 license = "MIT"
 description = "uutils ~ 'uucore' proc-macros"
diff --git a/src/uucore_procs/src/lib.rs b/src/uucore_procs/src/lib.rs
index f62e4178e..13b1dae3b 100644
--- a/src/uucore_procs/src/lib.rs
+++ b/src/uucore_procs/src/lib.rs
@@ -101,10 +101,10 @@ pub fn gen_uumain(_args: TokenStream, stream: TokenStream) -> TokenStream {
                 Err(e) => {
                     let s = format!("{}", e);
                     if s != "" {
-                        show_error!("{}", s);
+                        uucore::show_error!("{}", s);
                     }
                     if e.usage() {
-                        eprintln!("Try '{} --help' for more information.", executable!());
+                        eprintln!("Try '{} --help' for more information.", uucore::execution_phrase());
                     }
                     e.code()
                 }
diff --git a/tests/by-util/test_base32.rs b/tests/by-util/test_base32.rs
index 38ead28f1..ffe2cf74c 100644
--- a/tests/by-util/test_base32.rs
+++ b/tests/by-util/test_base32.rs
@@ -85,11 +85,15 @@ fn test_wrap() {
 #[test]
 fn test_wrap_no_arg() {
     for wrap_param in &["-w", "--wrap"] {
-        let expected_stderr = "error: The argument '--wrap <wrap>\' requires a value but none was \
-                               supplied\n\nUSAGE:\n    base32 [OPTION]... [FILE]\n\nFor more \
-                               information try --help"
-            .to_string();
-        new_ucmd!()
+        let ts = TestScenario::new(util_name!());
+        let expected_stderr = &format!(
+            "error: The argument '--wrap <wrap>\' requires a value but none was \
+                               supplied\n\nUSAGE:\n    {1} {0} [OPTION]... [FILE]\n\nFor more \
+                               information try --help",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        );
+        ts.ucmd()
             .arg(wrap_param)
             .fails()
             .stderr_only(expected_stderr);
@@ -103,18 +107,24 @@ fn test_wrap_bad_arg() {
             .arg(wrap_param)
             .arg("b")
             .fails()
-            .stderr_only("base32: Invalid wrap size: 'b': invalid digit found in string\n");
+            .stderr_only("base32: invalid wrap size: 'b'\n");
     }
 }
 
 #[test]
 fn test_base32_extra_operand() {
+    let ts = TestScenario::new(util_name!());
+
     // Expect a failure when multiple files are specified.
-    new_ucmd!()
-        .arg("a.txt")
+    ts.ucmd()
         .arg("a.txt")
+        .arg("b.txt")
         .fails()
-        .stderr_only("base32: extra operand 'a.txt'");
+        .stderr_only(format!(
+            "{0}: extra operand 'b.txt'\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        ));
 }
 
 #[test]
diff --git a/tests/by-util/test_base64.rs b/tests/by-util/test_base64.rs
index 7c7f19205..87aa0db44 100644
--- a/tests/by-util/test_base64.rs
+++ b/tests/by-util/test_base64.rs
@@ -89,18 +89,24 @@ fn test_wrap_bad_arg() {
             .arg(wrap_param)
             .arg("b")
             .fails()
-            .stderr_only("base64: Invalid wrap size: 'b': invalid digit found in string\n");
+            .stderr_only("base64: invalid wrap size: 'b'\n");
     }
 }
 
 #[test]
 fn test_base64_extra_operand() {
+    let ts = TestScenario::new(util_name!());
+
     // Expect a failure when multiple files are specified.
-    new_ucmd!()
-        .arg("a.txt")
+    ts.ucmd()
         .arg("a.txt")
+        .arg("b.txt")
         .fails()
-        .stderr_only("base64: extra operand 'a.txt'");
+        .stderr_only(format!(
+            "{0}: extra operand 'b.txt'\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        ));
 }
 
 #[test]
diff --git a/tests/by-util/test_basename.rs b/tests/by-util/test_basename.rs
index d9632106e..141745ac3 100644
--- a/tests/by-util/test_basename.rs
+++ b/tests/by-util/test_basename.rs
@@ -114,9 +114,12 @@ fn test_no_args() {
 
 #[test]
 fn test_no_args_output() {
-    new_ucmd!()
-        .fails()
-        .stderr_is("basename: missing operand\nTry 'basename --help' for more information.");
+    let ts = TestScenario::new(util_name!());
+    ts.ucmd().fails().stderr_is(&format!(
+        "{0}: missing operand\nTry '{1} {0} --help' for more information.",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[test]
@@ -126,10 +129,12 @@ fn test_too_many_args() {
 
 #[test]
 fn test_too_many_args_output() {
-    new_ucmd!()
-        .args(&["a", "b", "c"])
-        .fails()
-        .stderr_is("basename: extra operand 'c'\nTry 'basename --help' for more information.");
+    let ts = TestScenario::new(util_name!());
+    ts.ucmd().args(&["a", "b", "c"]).fails().stderr_is(format!(
+        "{0}: extra operand 'c'\nTry '{1} {0} --help' for more information.",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[cfg(any(unix, target_os = "redox"))]
@@ -147,3 +152,32 @@ fn invalid_utf8_args_unix() {
     let os_str = OsStr::from_bytes(&source[..]);
     test_invalid_utf8_args(os_str);
 }
+
+#[test]
+fn test_root() {
+    let expected = if cfg!(windows) { "\\\n" } else { "/\n" };
+    new_ucmd!().arg("/").succeeds().stdout_is(expected);
+}
+
+#[test]
+fn test_double_slash() {
+    // TODO The GNU tests seem to suggest that some systems treat "//"
+    // as the same directory as "/" directory but not all systems. We
+    // should extend this test to account for that possibility.
+    let expected = if cfg!(windows) { "\\\n" } else { "/\n" };
+    new_ucmd!().arg("//").succeeds().stdout_is(expected);
+    new_ucmd!()
+        .args(&["//", "/"])
+        .succeeds()
+        .stdout_is(expected);
+    new_ucmd!()
+        .args(&["//", "//"])
+        .succeeds()
+        .stdout_is(expected);
+}
+
+#[test]
+fn test_triple_slash() {
+    let expected = if cfg!(windows) { "\\\n" } else { "/\n" };
+    new_ucmd!().arg("///").succeeds().stdout_is(expected);
+}
diff --git a/tests/by-util/test_basenc.rs b/tests/by-util/test_basenc.rs
new file mode 100644
index 000000000..ba9eed1cd
--- /dev/null
+++ b/tests/by-util/test_basenc.rs
@@ -0,0 +1,16 @@
+use crate::common::util::*;
+
+#[test]
+fn test_z85_not_padded() {
+    // The z85 crate deviates from the standard in some cases; we have to catch those
+    new_ucmd!()
+        .args(&["--z85", "-d"])
+        .pipe_in("##########")
+        .fails()
+        .stderr_only("basenc: error: invalid input");
+    new_ucmd!()
+        .args(&["--z85"])
+        .pipe_in("123")
+        .fails()
+        .stderr_only("basenc: error: invalid input (length must be multiple of 4 characters)");
+}
diff --git a/tests/by-util/test_cat.rs b/tests/by-util/test_cat.rs
index d83b5515b..b629a06e6 100644
--- a/tests/by-util/test_cat.rs
+++ b/tests/by-util/test_cat.rs
@@ -1,9 +1,13 @@
+// spell-checker:ignore NOFILE
+
 use crate::common::util::*;
-#[cfg(unix)]
 use std::fs::OpenOptions;
 #[cfg(unix)]
 use std::io::Read;
 
+#[cfg(target_os = "linux")]
+use rlimit::Resource;
+
 #[test]
 fn test_output_simple() {
     new_ucmd!()
@@ -88,6 +92,23 @@ fn test_fifo_symlink() {
     thread.join().unwrap();
 }
 
+#[test]
+#[cfg(target_os = "linux")]
+fn test_closes_file_descriptors() {
+    // Each file creates a pipe, which has two file descriptors.
+    // If they are not closed then five is certainly too many.
+    new_ucmd!()
+        .args(&[
+            "alpha.txt",
+            "alpha.txt",
+            "alpha.txt",
+            "alpha.txt",
+            "alpha.txt",
+        ])
+        .with_limit(Resource::NOFILE, 9, 9)
+        .succeeds();
+}
+
 #[test]
 #[cfg(unix)]
 fn test_piped_to_regular_file() {
@@ -274,6 +295,26 @@ fn test_stdin_show_ends() {
     }
 }
 
+#[test]
+fn squeeze_all_files() {
+    // empty lines at the end of a file are "squeezed" together with empty lines at the beginning
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.write("input1", "a\n\n");
+    at.write("input2", "\n\nb");
+    ucmd.args(&["input1", "input2", "-s"])
+        .succeeds()
+        .stdout_only("a\n\nb");
+}
+
+#[test]
+fn test_show_ends_crlf() {
+    new_ucmd!()
+        .arg("-E")
+        .pipe_in("a\nb\r\n\rc\n\r\n\r")
+        .succeeds()
+        .stdout_only("a$\nb^M$\n\rc$\n^M$\n\r");
+}
+
 #[test]
 fn test_stdin_show_all() {
     for same_param in &["-A", "--show-all"] {
@@ -443,3 +484,49 @@ fn test_domain_socket() {
 
     thread.join().unwrap();
 }
+
+#[test]
+fn test_write_to_self_empty() {
+    // it's ok if the input file is also the output file if it's empty
+    let s = TestScenario::new(util_name!());
+    let file_path = s.fixtures.plus("file.txt");
+
+    let file = OpenOptions::new()
+        .create_new(true)
+        .write(true)
+        .append(true)
+        .open(&file_path)
+        .unwrap();
+
+    s.ucmd().set_stdout(file).arg(&file_path).succeeds();
+}
+
+#[test]
+fn test_write_to_self() {
+    let s = TestScenario::new(util_name!());
+    let file_path = s.fixtures.plus("first_file");
+    s.fixtures.write("second_file", "second_file_content.");
+
+    let file = OpenOptions::new()
+        .create_new(true)
+        .write(true)
+        .append(true)
+        .open(&file_path)
+        .unwrap();
+
+    s.fixtures.append("first_file", "first_file_content.");
+
+    s.ucmd()
+        .set_stdout(file)
+        .arg("first_file")
+        .arg("first_file")
+        .arg("second_file")
+        .fails()
+        .code_is(2)
+        .stderr_only("cat: first_file: input file is output file\ncat: first_file: input file is output file");
+
+    assert_eq!(
+        s.fixtures.read("first_file"),
+        "first_file_content.second_file_content."
+    );
+}
diff --git a/tests/by-util/test_chcon.rs b/tests/by-util/test_chcon.rs
new file mode 100644
index 000000000..2bdc512d5
--- /dev/null
+++ b/tests/by-util/test_chcon.rs
@@ -0,0 +1,469 @@
+// spell-checker:ignore (jargon) xattributes
+
+#![cfg(feature = "feat_selinux")]
+
+use std::ffi::CString;
+use std::path::Path;
+use std::{io, iter, str};
+
+use crate::common::util::*;
+
+#[test]
+fn version() {
+    new_ucmd!().arg("--version").succeeds();
+    new_ucmd!().arg("-V").succeeds();
+}
+
+#[test]
+fn help() {
+    new_ucmd!().fails();
+    new_ucmd!().arg("--help").succeeds();
+    new_ucmd!().arg("-h").fails(); // -h is NOT --help, it is actually --no-dereference.
+}
+
+#[test]
+fn reference_errors() {
+    for args in &[
+        &["--verbose", "--reference"] as &[&str],
+        &["--verbose", "--reference=/dev/null"],
+        &["--verbose", "--reference=/inexistent", "/dev/null"],
+    ] {
+        new_ucmd!().args(args).fails();
+    }
+}
+
+#[test]
+fn recursive_errors() {
+    for args in &[
+        &["--verbose", "-P"] as &[&str],
+        &["--verbose", "-H"],
+        &["--verbose", "-L"],
+        &["--verbose", "--recursive", "-P", "--dereference"],
+        &["--verbose", "--recursive", "-H", "--no-dereference"],
+        &["--verbose", "--recursive", "-L", "--no-dereference"],
+    ] {
+        new_ucmd!().args(args).fails();
+    }
+}
+
+#[test]
+fn valid_context() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.touch("a.tmp");
+    dir.symlink_file("a.tmp", "la.tmp");
+
+    let la_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    cmd.args(&["--verbose", new_la_context])
+        .arg(dir.plus("la.tmp"))
+        .succeeds();
+    assert_eq!(get_file_context(dir.plus("la.tmp")).unwrap(), la_context);
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+}
+
+#[test]
+fn valid_context_on_valid_symlink() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.touch("a.tmp");
+    dir.symlink_file("a.tmp", "la.tmp");
+
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    cmd.args(&["--verbose", "--no-dereference", new_la_context])
+        .arg(dir.plus("la.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("la.tmp")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(get_file_context(dir.plus("a.tmp")).unwrap(), a_context);
+}
+
+#[test]
+fn valid_context_on_broken_symlink() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.symlink_file("a.tmp", "la.tmp");
+
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    cmd.args(&["--verbose", "--no-dereference", new_la_context])
+        .arg(dir.plus("la.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("la.tmp")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+}
+
+#[test]
+fn valid_context_with_prior_xattributes() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.touch("a.tmp");
+
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    if a_context.is_none() {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+    }
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    cmd.args(&["--verbose", new_la_context])
+        .arg(dir.plus("a.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+}
+
+#[test]
+fn valid_context_directory() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.mkdir("a");
+    dir.symlink_dir("a", "la");
+
+    let b_path = Path::new("a").join("b.txt");
+    dir.touch(b_path.to_str().unwrap());
+
+    let la_context = get_file_context(dir.plus("la")).unwrap();
+    let b_context = get_file_context(dir.plus(b_path.to_str().unwrap())).unwrap();
+
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    cmd.args(&["--verbose", new_la_context])
+        .arg(dir.plus("la"))
+        .succeeds();
+    assert_eq!(get_file_context(dir.plus("la")).unwrap(), la_context);
+    assert_eq!(
+        get_file_context(dir.plus("a")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(
+        get_file_context(dir.plus(b_path.to_str().unwrap())).unwrap(),
+        b_context
+    );
+}
+
+#[test]
+fn valid_context_directory_recursive() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.mkdir("a");
+    dir.symlink_dir("a", "la");
+
+    let b_path = Path::new("a").join("b.txt");
+    dir.touch(b_path.to_str().unwrap());
+
+    let a_context = get_file_context(dir.plus("a")).unwrap();
+    let b_context = get_file_context(dir.plus(b_path.to_str().unwrap())).unwrap();
+
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    // -P (default): do not traverse any symbolic links.
+    cmd.args(&["--verbose", "--recursive", new_la_context])
+        .arg(dir.plus("la"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("la")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(get_file_context(dir.plus("a")).unwrap(), a_context);
+    assert_eq!(
+        get_file_context(dir.plus(b_path.to_str().unwrap())).unwrap(),
+        b_context
+    );
+}
+
+#[test]
+fn valid_context_directory_recursive_follow_args_dir_symlinks() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.mkdir("a");
+    dir.symlink_dir("a", "la");
+
+    let b_path = Path::new("a").join("b.txt");
+    dir.touch(b_path.to_str().unwrap());
+
+    let la_context = get_file_context(dir.plus("la")).unwrap();
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    /*
+    let lc_path = Path::new("a").join("lc");
+    dir.symlink_dir("c", lc_path.to_str().unwrap());
+    assert_eq!(
+        get_file_context(dir.plus(lc_path.to_str().unwrap())).unwrap(),
+        None
+    );
+    */
+
+    // -H: if a command line argument is a symbolic link to a directory, traverse it.
+    cmd.args(&["--verbose", "--recursive", "-H", new_la_context])
+        .arg(dir.plus("la"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(
+        get_file_context(dir.plus(b_path.to_str().unwrap()))
+            .unwrap()
+            .as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(get_file_context(dir.plus("la")).unwrap(), la_context);
+    /*
+    assert_eq!(
+        get_file_context(dir.plus(lc_path.to_str().unwrap()))
+            .unwrap()
+            .as_deref(),
+        Some(new_la_context)
+    );
+    */
+}
+
+#[test]
+fn valid_context_directory_recursive_follow_all_symlinks() {
+    let (dir, mut cmd) = at_and_ucmd!();
+    dir.mkdir("a");
+    dir.symlink_dir("a", "la");
+
+    let b_path = Path::new("a").join("b.txt");
+    dir.touch(b_path.to_str().unwrap());
+
+    let c_path = Path::new("a").join("c");
+    dir.touch(c_path.to_str().unwrap());
+
+    let lc_path = Path::new("a").join("lc");
+    dir.symlink_dir(c_path.to_str().unwrap(), lc_path.to_str().unwrap());
+
+    let la_context = get_file_context(dir.plus("la")).unwrap();
+    let lc_context = get_file_context(dir.plus(lc_path.to_str().unwrap())).unwrap();
+
+    let new_la_context = "guest_u:object_r:etc_t:s0:c42";
+
+    // -L: traverse every symbolic link to a directory encountered.
+    cmd.args(&["--verbose", "--recursive", "-L", new_la_context])
+        .arg(dir.plus("la"))
+        .succeeds();
+    assert_eq!(get_file_context(dir.plus("la")).unwrap(), la_context);
+    assert_eq!(
+        get_file_context(dir.plus("a")).unwrap().as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(
+        get_file_context(dir.plus(b_path.to_str().unwrap()))
+            .unwrap()
+            .as_deref(),
+        Some(new_la_context)
+    );
+    assert_eq!(
+        get_file_context(dir.plus(lc_path.to_str().unwrap())).unwrap(),
+        lc_context
+    );
+    assert_eq!(
+        get_file_context(dir.plus(c_path.to_str().unwrap()))
+            .unwrap()
+            .as_deref(),
+        Some(new_la_context)
+    );
+}
+
+#[test]
+fn user_role_range_type() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    if a_context.is_none() {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+    }
+
+    cmd.args(&[
+        "--verbose",
+        "--user=guest_u",
+        "--role=object_r",
+        "--type=etc_t",
+        "--range=s0:c42",
+    ])
+    .arg(dir.plus("a.tmp"))
+    .succeeds();
+
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap().as_deref(),
+        Some("guest_u:object_r:etc_t:s0:c42")
+    );
+}
+
+#[test]
+fn user_change() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_a_context = if let Some(a_context) = a_context {
+        let mut components: Vec<_> = a_context.split(':').collect();
+        components[0] = "guest_u";
+        components.join(":")
+    } else {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+        String::from("guest_u:object_r:user_tmp_t:s0")
+    };
+
+    cmd.args(&["--verbose", "--user=guest_u"])
+        .arg(dir.plus("a.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap(),
+        Some(new_a_context)
+    );
+}
+
+#[test]
+fn role_change() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_a_context = if let Some(a_context) = a_context {
+        let mut components: Vec<_> = a_context.split(':').collect();
+        components[1] = "system_r";
+        components.join(":")
+    } else {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+        String::from("unconfined_u:system_r:user_tmp_t:s0")
+    };
+
+    cmd.args(&["--verbose", "--role=system_r"])
+        .arg(dir.plus("a.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap(),
+        Some(new_a_context)
+    );
+}
+
+#[test]
+fn type_change() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_a_context = if let Some(a_context) = a_context {
+        let mut components: Vec<_> = a_context.split(':').collect();
+        components[2] = "etc_t";
+        components.join(":")
+    } else {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+        String::from("unconfined_u:object_r:etc_t:s0")
+    };
+
+    cmd.args(&["--verbose", "--type=etc_t"])
+        .arg(dir.plus("a.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap(),
+        Some(new_a_context)
+    );
+}
+
+#[test]
+fn range_change() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let a_context = get_file_context(dir.plus("a.tmp")).unwrap();
+    let new_a_context = if let Some(a_context) = a_context {
+        a_context
+            .split(':')
+            .take(3)
+            .chain(iter::once("s0:c42"))
+            .collect::<Vec<_>>()
+            .join(":")
+    } else {
+        set_file_context(dir.plus("a.tmp"), "unconfined_u:object_r:user_tmp_t:s0").unwrap();
+        String::from("unconfined_u:object_r:user_tmp_t:s0:c42")
+    };
+
+    cmd.args(&["--verbose", "--range=s0:c42"])
+        .arg(dir.plus("a.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("a.tmp")).unwrap(),
+        Some(new_a_context)
+    );
+}
+
+#[test]
+fn valid_reference() {
+    let (dir, mut cmd) = at_and_ucmd!();
+
+    dir.touch("a.tmp");
+    let new_a_context = "guest_u:object_r:etc_t:s0:c42";
+    set_file_context(dir.plus("a.tmp"), new_a_context).unwrap();
+
+    dir.touch("b.tmp");
+    let b_context = get_file_context(dir.plus("b.tmp")).unwrap();
+    assert_ne!(b_context.as_deref(), Some(new_a_context));
+
+    cmd.arg("--verbose")
+        .arg(format!("--reference={}", dir.plus_as_string("a.tmp")))
+        .arg(dir.plus("b.tmp"))
+        .succeeds();
+    assert_eq!(
+        get_file_context(dir.plus("b.tmp")).unwrap().as_deref(),
+        Some(new_a_context)
+    );
+}
+
+fn get_file_context(path: impl AsRef<Path>) -> Result<Option<String>, selinux::errors::Error> {
+    let path = path.as_ref();
+    match selinux::SecurityContext::of_path(path, false, false) {
+        Err(r) => {
+            println!("get_file_context failed: '{}': {}.", path.display(), &r);
+            Err(r)
+        }
+
+        Ok(None) => {
+            println!(
+                "get_file_context: '{}': No SELinux context defined.",
+                path.display()
+            );
+            Ok(None)
+        }
+
+        Ok(Some(context)) => {
+            let bytes = context
+                .as_bytes()
+                .splitn(2, |&b| b == 0_u8)
+                .next()
+                .unwrap_or_default();
+            let context = String::from_utf8(bytes.into()).unwrap_or_default();
+            println!("get_file_context: '{}' => '{}'.", context, path.display());
+            Ok(Some(context))
+        }
+    }
+}
+
+fn set_file_context(path: impl AsRef<Path>, context: &str) -> Result<(), selinux::errors::Error> {
+    let c_context = CString::new(context.as_bytes()).map_err(|_r| selinux::errors::Error::IO {
+        source: io::Error::from(io::ErrorKind::InvalidInput),
+        operation: "CString::new",
+    })?;
+
+    let path = path.as_ref();
+    let r =
+        selinux::SecurityContext::from_c_str(&c_context, false).set_for_path(path, false, false);
+    if let Err(r) = &r {
+        println!(
+            "set_file_context failed: '{}' => '{}': {}.",
+            context,
+            path.display(),
+            r
+        )
+    } else {
+        println!("set_file_context: '{}' => '{}'.", context, path.display())
+    }
+    r
+}
diff --git a/tests/by-util/test_chgrp.rs b/tests/by-util/test_chgrp.rs
index 762e922c4..1d047cfe2 100644
--- a/tests/by-util/test_chgrp.rs
+++ b/tests/by-util/test_chgrp.rs
@@ -43,7 +43,7 @@ fn test_invalid_group() {
         .arg("__nosuchgroup__")
         .arg("/")
         .fails()
-        .stderr_is("chgrp: invalid group: __nosuchgroup__");
+        .stderr_is("chgrp: invalid group: '__nosuchgroup__'");
 }
 
 #[test]
@@ -228,3 +228,128 @@ fn test_big_h() {
         );
     }
 }
+
+#[test]
+#[cfg(not(target_vendor = "apple"))]
+fn basic_succeeds() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let one_group = nix::unistd::getgroups().unwrap();
+    // if there are no groups we can't run this test.
+    if let Some(group) = one_group.first() {
+        at.touch("f1");
+        ucmd.arg(group.as_raw().to_string())
+            .arg("f1")
+            .succeeds()
+            .no_stdout()
+            .no_stderr();
+    }
+}
+
+#[test]
+fn test_no_change() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.touch("file");
+    ucmd.arg("").arg(at.plus("file")).succeeds();
+}
+
+#[test]
+#[cfg(not(target_vendor = "apple"))]
+fn test_permission_denied() {
+    use std::os::unix::prelude::PermissionsExt;
+
+    if let Some(group) = nix::unistd::getgroups().unwrap().first() {
+        let (at, mut ucmd) = at_and_ucmd!();
+        at.mkdir("dir");
+        at.touch("dir/file");
+        std::fs::set_permissions(at.plus("dir"), PermissionsExt::from_mode(0o0000)).unwrap();
+        ucmd.arg("-R")
+            .arg(group.as_raw().to_string())
+            .arg("dir")
+            .fails()
+            .stderr_only("chgrp: cannot access 'dir': Permission denied");
+    }
+}
+
+#[test]
+#[cfg(not(target_vendor = "apple"))]
+fn test_subdir_permission_denied() {
+    use std::os::unix::prelude::PermissionsExt;
+
+    if let Some(group) = nix::unistd::getgroups().unwrap().first() {
+        let (at, mut ucmd) = at_and_ucmd!();
+        at.mkdir("dir");
+        at.mkdir("dir/subdir");
+        at.touch("dir/subdir/file");
+        std::fs::set_permissions(at.plus("dir/subdir"), PermissionsExt::from_mode(0o0000)).unwrap();
+        ucmd.arg("-R")
+            .arg(group.as_raw().to_string())
+            .arg("dir")
+            .fails()
+            .stderr_only("chgrp: cannot access 'dir/subdir': Permission denied");
+    }
+}
+
+#[test]
+#[cfg(not(target_vendor = "apple"))]
+fn test_traverse_symlinks() {
+    use std::os::unix::prelude::MetadataExt;
+    let groups = nix::unistd::getgroups().unwrap();
+    if groups.len() < 2 {
+        return;
+    }
+    let (first_group, second_group) = (groups[0], groups[1]);
+
+    for &(args, traverse_first, traverse_second) in &[
+        (&[][..] as &[&str], false, false),
+        (&["-H"][..], true, false),
+        (&["-P"][..], false, false),
+        (&["-L"][..], true, true),
+    ] {
+        let scenario = TestScenario::new("chgrp");
+
+        let (at, mut ucmd) = (scenario.fixtures.clone(), scenario.ucmd());
+
+        at.mkdir("dir");
+        at.mkdir("dir2");
+        at.touch("dir2/file");
+        at.mkdir("dir3");
+        at.touch("dir3/file");
+        at.symlink_dir("dir2", "dir/dir2_ln");
+        at.symlink_dir("dir3", "dir3_ln");
+
+        scenario
+            .ccmd("chgrp")
+            .arg(first_group.to_string())
+            .arg("dir2/file")
+            .arg("dir3/file")
+            .succeeds();
+
+        assert!(at.plus("dir2/file").metadata().unwrap().gid() == first_group.as_raw());
+        assert!(at.plus("dir3/file").metadata().unwrap().gid() == first_group.as_raw());
+
+        ucmd.arg("-R")
+            .args(args)
+            .arg(second_group.to_string())
+            .arg("dir")
+            .arg("dir3_ln")
+            .succeeds()
+            .no_stderr();
+
+        assert_eq!(
+            at.plus("dir2/file").metadata().unwrap().gid(),
+            if traverse_second {
+                second_group.as_raw()
+            } else {
+                first_group.as_raw()
+            }
+        );
+        assert_eq!(
+            at.plus("dir3/file").metadata().unwrap().gid(),
+            if traverse_first {
+                second_group.as_raw()
+            } else {
+                first_group.as_raw()
+            }
+        );
+    }
+}
diff --git a/tests/by-util/test_chmod.rs b/tests/by-util/test_chmod.rs
index 186c645e5..c8348d491 100644
--- a/tests/by-util/test_chmod.rs
+++ b/tests/by-util/test_chmod.rs
@@ -1,10 +1,10 @@
 use crate::common::util::*;
-use std::fs::{metadata, set_permissions, OpenOptions};
+use std::fs::{metadata, set_permissions, OpenOptions, Permissions};
 use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
 use std::sync::Mutex;
 
 extern crate libc;
-use self::chmod::strip_minus_from_mode;
+use uucore::mode::strip_minus_from_mode;
 extern crate chmod;
 use self::libc::umask;
 
@@ -201,11 +201,6 @@ fn test_chmod_ugoa() {
             before: 0o100000,
             after: 0o100755,
         },
-        TestCase {
-            args: vec!["-w", TEST_FILE],
-            before: 0o100777,
-            after: 0o100577,
-        },
         TestCase {
             args: vec!["-x", TEST_FILE],
             before: 0o100777,
@@ -213,6 +208,21 @@ fn test_chmod_ugoa() {
         },
     ];
     run_tests(tests);
+
+    // check that we print an error if umask prevents us from removing a permission
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.touch("file");
+    set_permissions(at.plus("file"), Permissions::from_mode(0o777)).unwrap();
+    ucmd.args(&["-w", "file"])
+        .fails()
+        .code_is(1)
+        // spell-checker:disable-next-line
+        .stderr_is("chmod: file: new permissions are r-xrwxrwx, not r-xr-xr-x");
+    assert_eq!(
+        metadata(at.plus("file")).unwrap().permissions().mode(),
+        0o100577
+    );
+
     unsafe {
         umask(last);
     }
@@ -330,8 +340,8 @@ fn test_chmod_recursive() {
         .arg("a")
         .arg("z")
         .succeeds()
-        .stderr_contains(&"to 333 (-wx-wx-wx)")
-        .stderr_contains(&"to 222 (-w--w--w-)");
+        .stdout_contains(&"to 0333 (-wx-wx-wx)")
+        .stdout_contains(&"to 0222 (-w--w--w-)");
 
     assert_eq!(at.metadata("z/y").permissions().mode(), 0o100222);
     assert_eq!(at.metadata("a/a").permissions().mode(), 0o100222);
@@ -350,13 +360,24 @@ fn test_chmod_recursive() {
 fn test_chmod_non_existing_file() {
     new_ucmd!()
         .arg("-R")
-        .arg("--verbose")
         .arg("-r,a+w")
         .arg("does-not-exist")
         .fails()
         .stderr_contains(&"cannot access 'does-not-exist': No such file or directory");
 }
 
+#[test]
+fn test_chmod_non_existing_file_silent() {
+    new_ucmd!()
+        .arg("-R")
+        .arg("--quiet")
+        .arg("-r,a+w")
+        .arg("does-not-exist")
+        .fails()
+        .no_stderr()
+        .code_is(1);
+}
+
 #[test]
 fn test_chmod_preserve_root() {
     new_ucmd!()
@@ -490,3 +511,49 @@ fn test_chmod_strip_minus_from_mode() {
         assert_eq!(test.1, args.join(" "));
     }
 }
+
+#[test]
+fn test_chmod_keep_setgid() {
+    for &(from, arg, to) in &[
+        (0o7777, "777", 0o46777),
+        (0o7777, "=777", 0o40777),
+        (0o7777, "0777", 0o46777),
+        (0o7777, "=0777", 0o40777),
+        (0o7777, "00777", 0o40777),
+        (0o2444, "a+wx", 0o42777),
+        (0o2444, "a=wx", 0o42333),
+        (0o1444, "g+s", 0o43444),
+        (0o4444, "u-s", 0o40444),
+        (0o7444, "a-s", 0o41444),
+    ] {
+        let (at, mut ucmd) = at_and_ucmd!();
+        at.mkdir("dir");
+        set_permissions(at.plus("dir"), Permissions::from_mode(from)).unwrap();
+        let r = ucmd.arg(arg).arg("dir").succeeds();
+        println!("{}", r.stderr_str());
+        assert_eq!(at.metadata("dir").permissions().mode(), to);
+    }
+}
+
+#[test]
+fn test_no_operands() {
+    new_ucmd!()
+        .arg("777")
+        .fails()
+        .code_is(1)
+        .stderr_is("chmod: missing operand");
+}
+
+#[test]
+fn test_mode_after_dash_dash() {
+    let (at, ucmd) = at_and_ucmd!();
+    run_single_test(
+        &TestCase {
+            args: vec!["--", "-r", TEST_FILE],
+            before: 0o100777,
+            after: 0o100333,
+        },
+        at,
+        ucmd,
+    );
+}
diff --git a/tests/by-util/test_chown.rs b/tests/by-util/test_chown.rs
index 86365f51b..d5ebb4600 100644
--- a/tests/by-util/test_chown.rs
+++ b/tests/by-util/test_chown.rs
@@ -1,4 +1,4 @@
-// spell-checker:ignore (words) agroupthatdoesntexist auserthatdoesntexist groupname notexisting passgrp
+// spell-checker:ignore (words) agroupthatdoesntexist auserthatdoesntexist cuuser groupname notexisting passgrp
 
 use crate::common::util::*;
 #[cfg(target_os = "linux")]
@@ -139,6 +139,14 @@ fn test_chown_only_owner_colon() {
         .succeeds()
         .stderr_contains(&"retained as");
 
+    scene
+        .ucmd()
+        .arg(format!("{}.", user_name))
+        .arg("--verbose")
+        .arg(file1)
+        .succeeds()
+        .stderr_contains(&"retained as");
+
     scene
         .ucmd()
         .arg("root:")
@@ -180,6 +188,14 @@ fn test_chown_only_colon() {
         .arg(file1)
         .fails()
         .stderr_contains(&"invalid group: '::'");
+
+    scene
+        .ucmd()
+        .arg("..")
+        .arg("--verbose")
+        .arg(file1)
+        .fails()
+        .stderr_contains(&"invalid group: '..'");
 }
 
 #[test]
@@ -195,6 +211,8 @@ fn test_chown_failed_stdout() {
 }
 
 #[test]
+// FixME: Fails on freebsd because of chown: invalid group: 'root:root'
+#[cfg(not(target_os = "freebsd"))]
 fn test_chown_owner_group() {
     // test chown username:group file.txt
 
@@ -230,6 +248,22 @@ fn test_chown_owner_group() {
     }
     result.stderr_contains(&"retained as");
 
+    scene
+        .ucmd()
+        .arg("root:root:root")
+        .arg("--verbose")
+        .arg(file1)
+        .fails()
+        .stderr_contains(&"invalid group");
+
+    scene
+        .ucmd()
+        .arg("root.root.root")
+        .arg("--verbose")
+        .arg(file1)
+        .fails()
+        .stderr_contains(&"invalid group");
+
     // TODO: on macos group name is not recognized correctly: "chown: invalid group: 'root:root'
     #[cfg(any(windows, all(unix, not(target_os = "macos"))))]
     scene
@@ -242,8 +276,72 @@ fn test_chown_owner_group() {
 }
 
 #[test]
-// TODO: on macos group name is not recognized correctly: "chown: invalid group: ':groupname'
-#[cfg(any(windows, all(unix, not(target_os = "macos"))))]
+// FixME: Fails on freebsd because of chown: invalid group: 'root:root'
+#[cfg(not(target_os = "freebsd"))]
+fn test_chown_various_input() {
+    // test chown username:group file.txt
+
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    let result = scene.cmd("whoami").run();
+    if skipping_test_is_okay(&result, "whoami: cannot find name for user ID") {
+        return;
+    }
+
+    let user_name = String::from(result.stdout_str().trim());
+    assert!(!user_name.is_empty());
+
+    let file1 = "test_chown_file1";
+    at.touch(file1);
+
+    let result = scene.cmd("id").arg("-gn").run();
+    if skipping_test_is_okay(&result, "id: cannot find name for group ID") {
+        return;
+    }
+    let group_name = String::from(result.stdout_str().trim());
+    assert!(!group_name.is_empty());
+
+    let result = scene
+        .ucmd()
+        .arg(format!("{}:{}", user_name, group_name))
+        .arg("--verbose")
+        .arg(file1)
+        .run();
+    if skipping_test_is_okay(&result, "chown: invalid group:") {
+        return;
+    }
+    result.stderr_contains(&"retained as");
+
+    // check that username.groupname is understood
+    let result = scene
+        .ucmd()
+        .arg(format!("{}.{}", user_name, group_name))
+        .arg("--verbose")
+        .arg(file1)
+        .run();
+    if skipping_test_is_okay(&result, "chown: invalid group:") {
+        return;
+    }
+    result.stderr_contains(&"retained as");
+
+    // Fails as user.name doesn't exist in the CI
+    // but it is valid
+    scene
+        .ucmd()
+        .arg(format!("{}:{}", "user.name", "groupname"))
+        .arg("--verbose")
+        .arg(file1)
+        .fails()
+        .stderr_contains(&"chown: invalid user: 'user.name:groupname'");
+}
+
+#[test]
+// FixME: on macos & freebsd group name is not recognized correctly: "chown: invalid group: ':groupname'
+#[cfg(any(
+    windows,
+    all(unix, not(any(target_os = "macos", target_os = "freebsd")))
+))]
 fn test_chown_only_group() {
     // test chown :group file.txt
 
@@ -321,6 +419,8 @@ fn test_chown_only_user_id() {
 }
 
 #[test]
+// FixME: stderr = chown: ownership of 'test_chown_file1' retained as cuuser:wheel
+#[cfg(not(target_os = "freebsd"))]
 fn test_chown_only_group_id() {
     // test chown :1111 file.txt
 
@@ -398,6 +498,19 @@ fn test_chown_owner_group_id() {
     }
     result.stderr_contains(&"retained as");
 
+    let result = scene
+        .ucmd()
+        .arg(format!("{}.{}", user_id, group_id))
+        .arg("--verbose")
+        .arg(file1)
+        .run();
+    if skipping_test_is_okay(&result, "invalid user") {
+        // From the Logs: "Build (ubuntu-18.04, x86_64-unknown-linux-gnu, feat_os_unix, use-cross)"
+        // stderr: "chown: invalid user: '1001.116'
+        return;
+    }
+    result.stderr_contains(&"retained as");
+
     scene
         .ucmd()
         .arg("0:0")
@@ -408,6 +521,8 @@ fn test_chown_owner_group_id() {
 }
 
 #[test]
+// FixME: Fails on freebsd because of chown: invalid group: '0:root'
+#[cfg(not(target_os = "freebsd"))]
 fn test_chown_owner_group_mix() {
     // test chown 1111:group file.txt
 
diff --git a/tests/by-util/test_chroot.rs b/tests/by-util/test_chroot.rs
index 3bac07d44..3e5c22679 100644
--- a/tests/by-util/test_chroot.rs
+++ b/tests/by-util/test_chroot.rs
@@ -15,6 +15,7 @@ fn test_missing_operand() {
 
 #[test]
 fn test_enter_chroot_fails() {
+    // NOTE: since #2689 this test also ensures that we don't regress #2687
     let (at, mut ucmd) = at_and_ucmd!();
 
     at.mkdir("jail");
@@ -23,7 +24,7 @@ fn test_enter_chroot_fails() {
 
     assert!(result
         .stderr_str()
-        .starts_with("chroot: cannot chroot to jail: Operation not permitted (os error 1)"));
+        .starts_with("chroot: cannot chroot to 'jail': Operation not permitted (os error 1)"));
 }
 
 #[test]
@@ -34,7 +35,7 @@ fn test_no_such_directory() {
 
     ucmd.arg("a")
         .fails()
-        .stderr_is("chroot: cannot change root directory to `a`: no such directory");
+        .stderr_is("chroot: cannot change root directory to 'a': no such directory");
 }
 
 #[test]
@@ -89,3 +90,26 @@ fn test_preference_of_userspec() {
     println!("result.stdout = {}", result.stdout_str());
     println!("result.stderr = {}", result.stderr_str());
 }
+
+#[test]
+fn test_default_shell() {
+    // NOTE: This test intends to trigger code which can only be reached with root permissions.
+    let ts = TestScenario::new(util_name!());
+    let at = &ts.fixtures;
+
+    let dir = "CHROOT_DIR";
+    at.mkdir(dir);
+
+    let shell = std::env::var("SHELL").unwrap_or_else(|_| "/bin/sh".to_string());
+    let _expected = format!(
+        "chroot: failed to run command '{}': No such file or directory",
+        shell
+    );
+
+    // TODO: [2021-09; jhscheer] uncomment if/when #2692 gets merged
+    // if let Ok(result) = run_ucmd_as_root(&ts, &[dir]) {
+    //     result.stderr_contains(expected);
+    // } else {
+    //     print!("TEST SKIPPED");
+    // }
+}
diff --git a/tests/by-util/test_cksum.rs b/tests/by-util/test_cksum.rs
index 9590c1ac5..bf31ceb18 100644
--- a/tests/by-util/test_cksum.rs
+++ b/tests/by-util/test_cksum.rs
@@ -68,7 +68,7 @@ fn test_invalid_file() {
         .arg(folder_name)
         .fails()
         .no_stdout()
-        .stderr_contains("cksum: 'asdf' No such file or directory");
+        .stderr_contains("cksum: asdf: No such file or directory");
 
     // Then check when the file is of an invalid type
     at.mkdir(folder_name);
@@ -76,7 +76,7 @@ fn test_invalid_file() {
         .arg(folder_name)
         .fails()
         .no_stdout()
-        .stderr_contains("cksum: 'asdf' Is a directory");
+        .stderr_contains("cksum: asdf: Is a directory");
 }
 
 // Make sure crc is correct for files larger than 32 bytes
diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs
index 19f93e499..e86f35833 100644
--- a/tests/by-util/test_cp.rs
+++ b/tests/by-util/test_cp.rs
@@ -7,7 +7,9 @@ use std::fs::set_permissions;
 #[cfg(not(windows))]
 use std::os::unix::fs;
 
-#[cfg(target_os = "linux")]
+#[cfg(unix)]
+use std::os::unix::fs::symlink as symlink_file;
+#[cfg(all(unix, not(target_os = "freebsd")))]
 use std::os::unix::fs::PermissionsExt;
 #[cfg(windows)]
 use std::os::windows::fs::symlink_file;
@@ -16,8 +18,6 @@ use std::os::windows::fs::symlink_file;
 use filetime::FileTime;
 #[cfg(target_os = "linux")]
 use rlimit::Resource;
-#[cfg(not(windows))]
-use std::env;
 #[cfg(target_os = "linux")]
 use std::fs as std_fs;
 #[cfg(target_os = "linux")]
@@ -563,14 +563,17 @@ fn test_cp_backup_off() {
 
 #[test]
 fn test_cp_backup_no_clobber_conflicting_options() {
-    let (_, mut ucmd) = at_and_ucmd!();
-
-    ucmd.arg("--backup")
+    let ts = TestScenario::new(util_name!());
+    ts.ucmd()
+        .arg("--backup")
         .arg("--no-clobber")
         .arg(TEST_HELLO_WORLD_SOURCE)
         .arg(TEST_HOW_ARE_YOU_SOURCE)
-        .fails()
-        .stderr_is("cp: options --backup and --no-clobber are mutually exclusive\nTry 'cp --help' for more information.");
+        .fails().stderr_is(&format!(
+            "{0}: options --backup and --no-clobber are mutually exclusive\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        ));
 }
 
 #[test]
@@ -743,20 +746,16 @@ fn test_cp_deref_folder_to_folder() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;
 
-    let cwd = env::current_dir().unwrap();
+    let path_to_new_symlink = at.plus(TEST_COPY_FROM_FOLDER);
 
-    let path_to_new_symlink = at.subdir.join(TEST_COPY_FROM_FOLDER);
-
-    // Change the cwd to have a correct symlink
-    assert!(env::set_current_dir(&path_to_new_symlink).is_ok());
-
-    #[cfg(not(windows))]
-    let _r = fs::symlink(TEST_HELLO_WORLD_SOURCE, TEST_HELLO_WORLD_SOURCE_SYMLINK);
-    #[cfg(windows)]
-    let _r = symlink_file(TEST_HELLO_WORLD_SOURCE, TEST_HELLO_WORLD_SOURCE_SYMLINK);
-
-    // Back to the initial cwd (breaks the other tests)
-    assert!(env::set_current_dir(&cwd).is_ok());
+    at.symlink_file(
+        &path_to_new_symlink
+            .join(TEST_HELLO_WORLD_SOURCE)
+            .to_string_lossy(),
+        &path_to_new_symlink
+            .join(TEST_HELLO_WORLD_SOURCE_SYMLINK)
+            .to_string_lossy(),
+    );
 
     //using -P -R option
     scene
@@ -843,20 +842,16 @@ fn test_cp_no_deref_folder_to_folder() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;
 
-    let cwd = env::current_dir().unwrap();
+    let path_to_new_symlink = at.plus(TEST_COPY_FROM_FOLDER);
 
-    let path_to_new_symlink = at.subdir.join(TEST_COPY_FROM_FOLDER);
-
-    // Change the cwd to have a correct symlink
-    assert!(env::set_current_dir(&path_to_new_symlink).is_ok());
-
-    #[cfg(not(windows))]
-    let _r = fs::symlink(TEST_HELLO_WORLD_SOURCE, TEST_HELLO_WORLD_SOURCE_SYMLINK);
-    #[cfg(windows)]
-    let _r = symlink_file(TEST_HELLO_WORLD_SOURCE, TEST_HELLO_WORLD_SOURCE_SYMLINK);
-
-    // Back to the initial cwd (breaks the other tests)
-    assert!(env::set_current_dir(&cwd).is_ok());
+    at.symlink_file(
+        &path_to_new_symlink
+            .join(TEST_HELLO_WORLD_SOURCE)
+            .to_string_lossy(),
+        &path_to_new_symlink
+            .join(TEST_HELLO_WORLD_SOURCE_SYMLINK)
+            .to_string_lossy(),
+    );
 
     //using -P -R option
     scene
@@ -969,10 +964,9 @@ fn test_cp_archive() {
 }
 
 #[test]
-#[cfg(target_os = "unix")]
+#[cfg(unix)]
 fn test_cp_archive_recursive() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let cwd = env::current_dir().unwrap();
 
     // creates
     // dir/1
@@ -988,26 +982,13 @@ fn test_cp_archive_recursive() {
     at.touch(&file_1.to_string_lossy());
     at.touch(&file_2.to_string_lossy());
 
-    // Change the cwd to have a correct symlink
-    assert!(env::set_current_dir(&at.subdir.join(TEST_COPY_TO_FOLDER)).is_ok());
-
-    #[cfg(not(windows))]
-    {
-        let _r = fs::symlink("1", &file_1_link);
-        let _r = fs::symlink("2", &file_2_link);
-    }
-    #[cfg(windows)]
-    {
-        let _r = symlink_file("1", &file_1_link);
-        let _r = symlink_file("2", &file_2_link);
-    }
-    // Back to the initial cwd (breaks the other tests)
-    assert!(env::set_current_dir(&cwd).is_ok());
+    at.symlink_file("1", &file_1_link.to_string_lossy());
+    at.symlink_file("2", &file_2_link.to_string_lossy());
 
     ucmd.arg("--archive")
         .arg(TEST_COPY_TO_FOLDER)
         .arg(TEST_COPY_TO_FOLDER_NEW)
-        .fails(); // fails for now
+        .succeeds();
 
     let scene2 = TestScenario::new("ls");
     let result = scene2
@@ -1025,18 +1006,6 @@ fn test_cp_archive_recursive() {
         .run();
 
     println!("ls dest {}", result.stdout_str());
-    assert!(at.file_exists(
-        &at.subdir
-            .join(TEST_COPY_TO_FOLDER_NEW)
-            .join("1.link")
-            .to_string_lossy()
-    ));
-    assert!(at.file_exists(
-        &at.subdir
-            .join(TEST_COPY_TO_FOLDER_NEW)
-            .join("2.link")
-            .to_string_lossy()
-    ));
     assert!(at.file_exists(
         &at.subdir
             .join(TEST_COPY_TO_FOLDER_NEW)
@@ -1338,3 +1307,64 @@ fn test_copy_symlink_force() {
         .succeeds();
     assert_eq!(at.resolve_link("copy"), "file");
 }
+
+#[test]
+#[cfg(all(unix, not(target_os = "freebsd")))]
+fn test_no_preserve_mode() {
+    use std::os::unix::prelude::MetadataExt;
+
+    use uucore::mode::get_umask;
+
+    const PERMS_ALL: u32 = 0o7777;
+
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.touch("file");
+    set_permissions(at.plus("file"), PermissionsExt::from_mode(PERMS_ALL)).unwrap();
+    ucmd.arg("file")
+        .arg("dest")
+        .succeeds()
+        .no_stderr()
+        .no_stdout();
+    let umask = get_umask();
+    // remove sticky bit, setuid and setgid bit; apply umask
+    let expected_perms = PERMS_ALL & !0o7000 & !umask;
+    assert_eq!(
+        at.plus("dest").metadata().unwrap().mode() & 0o7777,
+        expected_perms
+    );
+}
+
+#[test]
+#[cfg(all(unix, not(target_os = "freebsd")))]
+fn test_preserve_mode() {
+    use std::os::unix::prelude::MetadataExt;
+
+    const PERMS_ALL: u32 = 0o7777;
+
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.touch("file");
+    set_permissions(at.plus("file"), PermissionsExt::from_mode(PERMS_ALL)).unwrap();
+    ucmd.arg("file")
+        .arg("dest")
+        .arg("-p")
+        .succeeds()
+        .no_stderr()
+        .no_stdout();
+    assert_eq!(
+        at.plus("dest").metadata().unwrap().mode() & 0o7777,
+        PERMS_ALL
+    );
+}
+
+#[test]
+fn test_canonicalize_symlink() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.mkdir("dir");
+    at.touch("dir/file");
+    symlink_file("../dir/file", at.plus("dir/file-ln")).unwrap();
+    ucmd.arg("dir/file-ln")
+        .arg(".")
+        .succeeds()
+        .no_stderr()
+        .no_stdout();
+}
diff --git a/tests/by-util/test_dd.rs b/tests/by-util/test_dd.rs
new file mode 100644
index 000000000..8340c7059
--- /dev/null
+++ b/tests/by-util/test_dd.rs
@@ -0,0 +1,561 @@
+// spell-checker:ignore fname, tname, fpath, specfile, testfile, unspec, ifile, ofile, outfile, fullblock, urand, fileio, atoe, atoibm, availible, behaviour, bmax, bremain, btotal, cflags, creat, ctable, ctty, datastructures, doesnt, etoa, fileout, fname, gnudd, iconvflags, nocache, noctty, noerror, nofollow, nolinks, nonblock, oconvflags, outfile, parseargs, rlen, rmax, rposition, rremain, rsofar, rstat, sigusr, sigval, wlen, wstat
+
+use crate::common::util::*;
+
+use std::fs::{File, OpenOptions};
+use std::io::{BufReader, Read, Write};
+use std::path::PathBuf;
+use tempfile::tempfile;
+
+macro_rules! inf {
+    ($fname:expr) => {{
+        &format!("if={}", $fname)
+    }};
+}
+
+macro_rules! of {
+    ($fname:expr) => {{
+        &format!("of={}", $fname)
+    }};
+}
+
+macro_rules! fixture_path {
+    ($fname:expr) => {{
+        PathBuf::from(format!("./tests/fixtures/dd/{}", $fname))
+    }};
+}
+
+macro_rules! assert_fixture_exists {
+    ($fname:expr) => {{
+        let fpath = fixture_path!($fname);
+        assert!(fpath.exists(), "Fixture missing: {:?}", fpath);
+    }};
+}
+
+#[cfg(target_os = "linux")]
+macro_rules! assert_fixture_not_exists {
+    ($fname:expr) => {{
+        let fpath = PathBuf::from(format!("./fixtures/dd/{}", $fname));
+        assert!(!fpath.exists(), "Fixture present: {:?}", fpath);
+    }};
+}
+
+macro_rules! build_test_file {
+    ($fp:expr, $data:expr) => {{
+        OpenOptions::new()
+            .write(true)
+            .create(true)
+            .truncate(true)
+            .open($fp)
+            .unwrap()
+            .write_all($data)
+            .unwrap()
+    }};
+}
+
+macro_rules! cmp_file (
+    ($spec:expr, $test:expr) =>
+    {
+        let specfile_len = $spec.metadata().unwrap().len();
+        let testfile_len = $test.metadata().unwrap().len();
+        assert_eq!(testfile_len, specfile_len);
+
+        let spec = BufReader::new($spec);
+        let test = BufReader::new($test);
+
+        for (b_spec, b_test) in spec.bytes().zip(test.bytes())
+        {
+            assert_eq!(b_spec.unwrap(),
+                       b_test.unwrap());
+        }
+    };
+);
+
+fn build_ascii_block(n: usize) -> Vec<u8> {
+    (0..=127).cycle().take(n).collect()
+}
+
+// Sanity Tests
+#[test]
+fn version() {
+    new_ucmd!().args(&["--version"]).succeeds();
+}
+
+#[test]
+fn help() {
+    new_ucmd!().args(&["--help"]).succeeds();
+}
+
+#[test]
+fn test_stdin_stdout() {
+    let input = build_ascii_block(521);
+    let output = String::from_utf8(input.clone()).unwrap();
+    new_ucmd!()
+        .args(&["status=none"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_only(output);
+}
+
+// Top-Level Items
+// count=N, skip=N, status=LEVEL, conv=FLAG, *flag=FLAG
+#[test]
+fn test_stdin_stdout_count() {
+    let input = build_ascii_block(521);
+    let mut output = String::from_utf8(input.clone()).unwrap();
+    output.truncate(256);
+    new_ucmd!()
+        .args(&["status=none", "count=2", "ibs=128"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_only(output);
+}
+
+#[test]
+fn test_stdin_stdout_count_bytes() {
+    let input = build_ascii_block(521);
+    let mut output = String::from_utf8(input.clone()).unwrap();
+    output.truncate(256);
+    new_ucmd!()
+        .args(&["status=none", "count=256", "iflag=count_bytes"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_only(output);
+}
+
+#[test]
+fn test_stdin_stdout_skip() {
+    let input = build_ascii_block(521);
+    let mut output = String::from_utf8(input.clone()).unwrap();
+    let _ = output.drain(..256);
+    new_ucmd!()
+        .args(&["status=none", "skip=2", "ibs=128"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_only(output);
+}
+
+#[test]
+fn test_stdin_stdout_skip_bytes() {
+    let input = build_ascii_block(521);
+    let mut output = String::from_utf8(input.clone()).unwrap();
+    let _ = output.drain(..256);
+    new_ucmd!()
+        .args(&["status=none", "skip=256", "ibs=128", "iflag=skip_bytes"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_only(output);
+}
+
+#[test]
+fn test_stdin_stdout_skip_w_multiplier() {
+    let input = build_ascii_block(10 * 1024);
+    let output = String::from_utf8(input[5 * 1024..].to_vec()).unwrap();
+    new_ucmd!()
+        .args(&["status=none", "skip=5K", "iflag=skip_bytes"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_stdin_stdout_count_w_multiplier() {
+    let input = build_ascii_block(5 * 1024);
+    let output = String::from_utf8(input[..2 * 1024].to_vec()).unwrap();
+    new_ucmd!()
+        .args(&["status=none", "count=2KiB", "iflag=count_bytes"])
+        .pipe_in(input)
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_final_stats_noxfer() {
+    new_ucmd!()
+        .args(&["status=noxfer"])
+        .succeeds()
+        .stderr_only("");
+}
+
+#[test]
+fn test_final_stats_unspec() {
+    let output = vec![
+        "0+0 records in",
+        "0+0 records out",
+        "0 bytes (0 B, 0 B) copied, 0.0 s, 0 B/s",
+    ];
+    let output = output.into_iter().fold(String::new(), |mut acc, s| {
+        acc.push_str(s);
+        acc.push('\n');
+        acc
+    });
+    new_ucmd!().run().stderr_only(&output).success();
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn test_excl_causes_failure_when_present() {
+    let fname = "this-file-exists-excl.txt";
+    assert_fixture_exists!(&fname);
+
+    let (_fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["of=this-file-exists-excl.txt", "conv=excl"])
+        .fails();
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn test_noatime_does_not_update_infile_atime() {
+    // NOTE: Not all environments support tracking access time. If this
+    // test fails on some systems and passes on others, assume the functionality
+    // is not working and the systems that pass it simply don't update file access time.
+    let fname = "this-ifile-exists-noatime.txt";
+    assert_fixture_exists!(&fname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", "iflag=noatime", inf!(fname)]);
+
+    let pre_atime = fix.metadata(fname).accessed().unwrap();
+
+    ucmd.run().no_stderr().success();
+
+    let post_atime = fix.metadata(fname).accessed().unwrap();
+    assert_eq!(pre_atime, post_atime);
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn test_noatime_does_not_update_ofile_atime() {
+    // NOTE: Not all environments support tracking access time. If this
+    // test fails on some systems and passes on others, assume the functionality
+    // is not working and the systems that pass it simply don't update file access time.
+    let fname = "this-ofile-exists-noatime.txt";
+    assert_fixture_exists!(&fname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", "oflag=noatime", of!(fname)]);
+
+    let pre_atime = fix.metadata(fname).accessed().unwrap();
+
+    ucmd.pipe_in("").run().no_stderr().success();
+
+    let post_atime = fix.metadata(fname).accessed().unwrap();
+    assert_eq!(pre_atime, post_atime);
+}
+
+#[cfg(target_os = "linux")]
+#[test]
+fn test_nocreat_causes_failure_when_outfile_not_present() {
+    let fname = "this-file-does-not-exist.txt";
+    assert_fixture_not_exists!(&fname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["conv=nocreat", of!(&fname)])
+        .pipe_in("")
+        .fails()
+        .stderr_is("dd Error: No such file or directory (os error 2)");
+    assert!(!fix.file_exists(fname));
+}
+
+#[test]
+fn test_notrunc_does_not_truncate() {
+    // Set up test if needed (eg. after failure)
+    let fname = "this-file-exists-notrunc.txt";
+    let fpath = fixture_path!(fname);
+    match fpath.metadata() {
+        Ok(m) if m.len() == 256 => {}
+        _ => build_test_file!(&fpath, &build_ascii_block(256)),
+    }
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", "conv=notrunc", of!(&fname), "if=null.txt"])
+        .run()
+        .no_stdout()
+        .no_stderr()
+        .success();
+
+    assert_eq!(256, fix.metadata(fname).len());
+}
+
+#[test]
+fn test_existing_file_truncated() {
+    // Set up test if needed (eg. after failure)
+    let fname = "this-file-exists-truncated.txt";
+    let fpath = fixture_path!(fname);
+    match fpath.metadata() {
+        Ok(m) if m.len() == 256 => {}
+        _ => build_test_file!(&fpath, &vec![0; 256]),
+    }
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", "if=null.txt", of!(fname)])
+        .run()
+        .no_stdout()
+        .no_stderr()
+        .success();
+
+    assert_eq!(0, fix.metadata(fname).len());
+}
+
+#[test]
+fn test_null_stats() {
+    let stats = vec![
+        "0+0 records in\n",
+        "0+0 records out\n",
+        "0 bytes (0 B, 0 B) copied, 0.0 s, 0 B/s\n",
+    ];
+    let stats = stats.into_iter().fold(String::new(), |mut acc, s| {
+        acc.push_str(s);
+        acc
+    });
+
+    new_ucmd!()
+        .args(&["if=null.txt"])
+        .run()
+        .stderr_only(stats)
+        .success();
+}
+
+#[test]
+fn test_null_fullblock() {
+    new_ucmd!()
+        .args(&["if=null.txt", "status=none", "iflag=fullblock"])
+        .run()
+        .no_stdout()
+        .no_stderr()
+        .success();
+}
+
+#[cfg(unix)]
+#[ignore] // See note below before using this test.
+#[test]
+fn test_fullblock() {
+    let tname = "fullblock-from-urand";
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+    let exp_stats = vec![
+        "1+0 records in\n",
+        "1+0 records out\n",
+        "134217728 bytes (134 MB, 128 MiB) copied,",
+    ];
+    let exp_stats = exp_stats.into_iter().fold(Vec::new(), |mut acc, s| {
+        acc.extend(s.bytes());
+        acc
+    });
+
+    let ucmd = new_ucmd!()
+        .args(&[
+            "if=/dev/urandom",
+            of!(&tmp_fn),
+            "bs=128M",
+            // Note: In order for this test to actually test iflag=fullblock, the bs=VALUE
+            // must be big enough to 'overwhelm' urandom's store of bytes.
+            // Try executing 'dd if=/dev/urandom bs=128M count=1' (i.e without iflag=fullblock).
+            // The stats should contain the line: '0+1 records in' indicating a partial read.
+            // Since my system only copies 32 MiB without fullblock, I expect 128 MiB to be
+            // a reasonable value for testing most systems.
+            "count=1",
+            "iflag=fullblock",
+        ])
+        .run();
+    ucmd.success();
+
+    let run_stats = &ucmd.stderr()[..exp_stats.len()];
+    assert_eq!(exp_stats, run_stats);
+}
+
+// Fileio
+#[test]
+fn test_ys_to_stdout() {
+    let output: Vec<_> = String::from("y\n").bytes().cycle().take(1024).collect();
+    let output = String::from_utf8(output).unwrap();
+
+    new_ucmd!()
+        .args(&["status=none", "if=y-nl-1k.txt"])
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_zeros_to_stdout() {
+    let output = vec![0; 256 * 1024];
+    let output = String::from_utf8(output).unwrap();
+    new_ucmd!()
+        .args(&["status=none", "if=zero-256k.txt"])
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_to_stdout_with_ibs_obs() {
+    let output: Vec<_> = String::from("y\n").bytes().cycle().take(1024).collect();
+    let output = String::from_utf8(output).unwrap();
+
+    new_ucmd!()
+        .args(&["status=none", "if=y-nl-1k.txt", "ibs=521", "obs=1031"])
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_ascii_10k_to_stdout() {
+    let output = build_ascii_block(1024 * 1024);
+    // build_test_file!("ascii-10k.txt", &output);
+    let output = String::from_utf8(output).unwrap();
+
+    new_ucmd!()
+        .args(&["status=none", "if=ascii-10k.txt"])
+        .run()
+        .no_stderr()
+        .stdout_is(output)
+        .success();
+}
+
+#[test]
+fn test_zeros_to_file() {
+    let tname = "zero-256k";
+    let test_fn = format!("{}.txt", tname);
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+    assert_fixture_exists!(test_fn);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", inf!(test_fn), of!(tmp_fn)])
+        .run()
+        .no_stderr()
+        .no_stdout()
+        .success();
+
+    cmp_file!(
+        File::open(fixture_path!(&test_fn)).unwrap(),
+        fix.open(&tmp_fn)
+    );
+}
+
+#[test]
+fn test_to_file_with_ibs_obs() {
+    let tname = "zero-256k";
+    let test_fn = format!("{}.txt", tname);
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+    assert_fixture_exists!(test_fn);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&[
+        "status=none",
+        inf!(test_fn),
+        of!(tmp_fn),
+        "ibs=222",
+        "obs=111",
+    ])
+    .run()
+    .no_stderr()
+    .no_stdout()
+    .success();
+
+    cmp_file!(
+        File::open(fixture_path!(&test_fn)).unwrap(),
+        fix.open(&tmp_fn)
+    );
+}
+
+#[test]
+fn test_ascii_521k_to_file() {
+    let tname = "ascii-521k";
+    let input = build_ascii_block(512 * 1024);
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", of!(tmp_fn)])
+        .pipe_in(input.clone())
+        .run()
+        .no_stderr()
+        .no_stdout()
+        .success();
+
+    assert_eq!(512 * 1024, fix.metadata(&tmp_fn).len());
+
+    cmp_file!(
+        {
+            let mut input_f = tempfile().unwrap();
+            input_f.write_all(&input).unwrap();
+            input_f
+        },
+        fix.open(&tmp_fn)
+    );
+}
+
+#[ignore]
+#[cfg(unix)]
+#[test]
+fn test_ascii_5_gibi_to_file() {
+    let tname = "ascii-5G";
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&[
+        "status=none",
+        "count=5G",
+        "iflag=count_bytes",
+        "if=/dev/zero",
+        of!(tmp_fn),
+    ])
+    .run()
+    .no_stderr()
+    .no_stdout()
+    .success();
+
+    assert_eq!(5 * 1024 * 1024 * 1024, fix.metadata(&tmp_fn).len());
+}
+
+#[test]
+fn test_self_transfer() {
+    let fname = "self-transfer-256k.txt";
+    assert_fixture_exists!(fname);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", "conv=notrunc", inf!(fname), of!(fname)]);
+
+    assert!(fix.file_exists(fname));
+    assert_eq!(256 * 1024, fix.metadata(fname).len());
+
+    ucmd.run().no_stdout().no_stderr().success();
+
+    assert!(fix.file_exists(fname));
+    assert_eq!(256 * 1024, fix.metadata(fname).len());
+}
+
+#[test]
+fn test_unicode_filenames() {
+    let tname = "😎💚🦊";
+    let test_fn = format!("{}.txt", tname);
+    let tmp_fn = format!("TESTFILE-{}.tmp", &tname);
+    assert_fixture_exists!(test_fn);
+
+    let (fix, mut ucmd) = at_and_ucmd!();
+    ucmd.args(&["status=none", inf!(test_fn), of!(tmp_fn)])
+        .run()
+        .no_stderr()
+        .no_stdout()
+        .success();
+
+    cmp_file!(
+        File::open(fixture_path!(&test_fn)).unwrap(),
+        fix.open(&tmp_fn)
+    );
+}
+
+// conv=[ascii,ebcdic,ibm], conv=[ucase,lcase], conv=[block,unblock], conv=sync
+// TODO: Move conv tests from unit test module
diff --git a/tests/by-util/test_env.rs b/tests/by-util/test_env.rs
index 1d76c433d..ecb215f8c 100644
--- a/tests/by-util/test_env.rs
+++ b/tests/by-util/test_env.rs
@@ -108,6 +108,15 @@ fn test_ignore_environment() {
     scene.ucmd().arg("-").run().no_stdout();
 }
 
+#[test]
+fn test_empty_name() {
+    new_ucmd!()
+        .arg("-i")
+        .arg("=xyz")
+        .run()
+        .stderr_only("env: warning: no name specified for value 'xyz'");
+}
+
 #[test]
 fn test_null_delimiter() {
     let out = new_ucmd!()
diff --git a/tests/by-util/test_expand.rs b/tests/by-util/test_expand.rs
index 834a09736..9c06fe904 100644
--- a/tests/by-util/test_expand.rs
+++ b/tests/by-util/test_expand.rs
@@ -1,4 +1,5 @@
 use crate::common::util::*;
+// spell-checker:ignore (ToDO) taaaa tbbbb tcccc
 
 #[test]
 fn test_with_tab() {
@@ -53,3 +54,140 @@ fn test_with_multiple_files() {
         .stdout_contains("    return")
         .stdout_contains("        ");
 }
+
+#[test]
+fn test_tabs_space_separated_list() {
+    new_ucmd!()
+        .args(&["--tabs", "3 6 9"])
+        .pipe_in("a\tb\tc\td\te")
+        .succeeds()
+        .stdout_is("a  b  c  d e");
+}
+
+#[test]
+fn test_tabs_mixed_style_list() {
+    new_ucmd!()
+        .args(&["--tabs", ", 3,6 9"])
+        .pipe_in("a\tb\tc\td\te")
+        .succeeds()
+        .stdout_is("a  b  c  d e");
+}
+
+#[test]
+fn test_tabs_empty_string() {
+    new_ucmd!()
+        .args(&["--tabs", ""])
+        .pipe_in("a\tb\tc")
+        .succeeds()
+        .stdout_is("a       b       c");
+}
+
+#[test]
+fn test_tabs_comma_only() {
+    new_ucmd!()
+        .args(&["--tabs", ","])
+        .pipe_in("a\tb\tc")
+        .succeeds()
+        .stdout_is("a       b       c");
+}
+
+#[test]
+fn test_tabs_space_only() {
+    new_ucmd!()
+        .args(&["--tabs", " "])
+        .pipe_in("a\tb\tc")
+        .succeeds()
+        .stdout_is("a       b       c");
+}
+
+#[test]
+fn test_tabs_slash() {
+    new_ucmd!()
+        .args(&["--tabs", "/"])
+        .pipe_in("a\tb\tc")
+        .succeeds()
+        .stdout_is("a       b       c");
+}
+
+#[test]
+fn test_tabs_plus() {
+    new_ucmd!()
+        .args(&["--tabs", "+"])
+        .pipe_in("a\tb\tc")
+        .succeeds()
+        .stdout_is("a       b       c");
+}
+
+#[test]
+fn test_tabs_trailing_slash() {
+    new_ucmd!()
+        .arg("--tabs=1,/5")
+        .pipe_in("\ta\tb\tc")
+        .succeeds()
+        //          0         1
+        //          01234567890
+        .stdout_is(" a   b    c");
+}
+
+#[test]
+fn test_tabs_trailing_slash_long_columns() {
+    new_ucmd!()
+        .arg("--tabs=1,/3")
+        .pipe_in("\taaaa\tbbbb\tcccc")
+        .succeeds()
+        //          0         1
+        //          01234567890123456
+        .stdout_is(" aaaa bbbb  cccc");
+}
+
+#[test]
+fn test_tabs_trailing_plus() {
+    new_ucmd!()
+        .arg("--tabs=1,+5")
+        .pipe_in("\ta\tb\tc")
+        .succeeds()
+        //          0         1
+        //          012345678901
+        .stdout_is(" a    b    c");
+}
+
+#[test]
+fn test_tabs_trailing_plus_long_columns() {
+    new_ucmd!()
+        .arg("--tabs=1,+3")
+        .pipe_in("\taaaa\tbbbb\tcccc")
+        .succeeds()
+        //          0         1
+        //          012345678901234567
+        .stdout_is(" aaaa  bbbb  cccc");
+}
+
+#[test]
+fn test_tabs_must_be_ascending() {
+    new_ucmd!()
+        .arg("--tabs=1,1")
+        .fails()
+        .stderr_contains("tab sizes must be ascending");
+}
+
+#[test]
+fn test_tabs_keep_last_trailing_specifier() {
+    // If there are multiple trailing specifiers, use only the last one
+    // before the number.
+    new_ucmd!()
+        .arg("--tabs=1,+/+/5")
+        .pipe_in("\ta\tb\tc")
+        .succeeds()
+        //          0         1
+        //          01234567890
+        .stdout_is(" a   b    c");
+}
+
+#[test]
+fn test_tabs_comma_separated_no_numbers() {
+    new_ucmd!()
+        .arg("--tabs=+,/,+,/")
+        .pipe_in("\ta\tb\tc")
+        .succeeds()
+        .stdout_is("        a       b       c");
+}
diff --git a/tests/by-util/test_factor.rs b/tests/by-util/test_factor.rs
index a3f06ea8a..bcb1238bf 100644
--- a/tests/by-util/test_factor.rs
+++ b/tests/by-util/test_factor.rs
@@ -8,7 +8,10 @@
 
 // spell-checker:ignore (methods) hexdigest
 
+use tempfile::TempDir;
+
 use crate::common::util::*;
+use std::fs::OpenOptions;
 use std::time::SystemTime;
 
 #[path = "../../src/uu/factor/sieve.rs"]
@@ -24,6 +27,43 @@ use self::sieve::Sieve;
 const NUM_PRIMES: usize = 10000;
 const NUM_TESTS: usize = 100;
 
+#[test]
+fn test_parallel() {
+    // factor should only flush the buffer at line breaks
+    let n_integers = 100_000;
+    let mut input_string = String::new();
+    for i in 0..=n_integers {
+        input_string.push_str(&(format!("{} ", i))[..]);
+    }
+
+    let tmp_dir = TempDir::new().unwrap();
+    let tmp_dir = AtPath::new(tmp_dir.path());
+    tmp_dir.touch("output");
+    let output = OpenOptions::new()
+        .append(true)
+        .open(tmp_dir.plus("output"))
+        .unwrap();
+
+    for mut child in (0..10)
+        .map(|_| {
+            new_ucmd!()
+                .set_stdout(output.try_clone().unwrap())
+                .pipe_in(input_string.clone())
+                .run_no_wait()
+        })
+        .collect::<Vec<_>>()
+    {
+        assert_eq!(child.wait().unwrap().code().unwrap(), 0);
+    }
+
+    let result = TestScenario::new(util_name!())
+        .ccmd("sort")
+        .arg(tmp_dir.plus("output"))
+        .succeeds();
+    let hash_check = sha1::Sha1::from(result.stdout()).hexdigest();
+    assert_eq!(hash_check, "cc743607c0ff300ff575d92f4ff0c87d5660c393");
+}
+
 #[test]
 fn test_first_100000_integers() {
     extern crate sha1;
diff --git a/tests/by-util/test_hashsum.rs b/tests/by-util/test_hashsum.rs
index f059e53f3..545b4ee78 100644
--- a/tests/by-util/test_hashsum.rs
+++ b/tests/by-util/test_hashsum.rs
@@ -1,3 +1,4 @@
+// spell-checker:ignore checkfile
 macro_rules! get_hash(
     ($str:expr) => (
         $str.split(' ').collect::<Vec<&str>>()[0]
@@ -12,6 +13,7 @@ macro_rules! test_digest {
         static DIGEST_ARG: &'static str = concat!("--", stringify!($t));
         static BITS_ARG: &'static str = concat!("--bits=", stringify!($size));
         static EXPECTED_FILE: &'static str = concat!(stringify!($id), ".expected");
+        static CHECK_FILE: &'static str = concat!(stringify!($id), ".checkfile");
 
         #[test]
         fn test_single_file() {
@@ -26,6 +28,40 @@ macro_rules! test_digest {
             assert_eq!(ts.fixtures.read(EXPECTED_FILE),
                        get_hash!(ts.ucmd().arg(DIGEST_ARG).arg(BITS_ARG).pipe_in_fixture("input.txt").succeeds().no_stderr().stdout_str()));
         }
+
+        #[test]
+        fn test_check() {
+            let ts = TestScenario::new("hashsum");
+            ts.ucmd()
+                .args(&[DIGEST_ARG, BITS_ARG, "--check", CHECK_FILE])
+                .succeeds()
+                .no_stderr()
+                .stdout_is("input.txt: OK\n");
+        }
+
+        #[cfg(windows)]
+        #[test]
+        fn test_text_mode() {
+            // TODO Replace this with hard-coded files that store the
+            // expected output of text mode on an input file that has
+            // "\r\n" line endings.
+            let result = new_ucmd!()
+                .args(&[DIGEST_ARG, BITS_ARG, "-b"])
+                .pipe_in("a\nb\nc\n")
+                .succeeds();
+            let expected = result.no_stderr().stdout();
+            // Replace the "*-\n" at the end of the output with " -\n".
+            // The asterisk indicates that the digest was computed in
+            // binary mode.
+            let n = expected.len();
+            let expected = [&expected[..n - 3], &[b' ', b'-', b'\n']].concat();
+            new_ucmd!()
+                .args(&[DIGEST_ARG, BITS_ARG, "-t"])
+                .pipe_in("a\r\nb\r\nc\r\n")
+                .succeeds()
+                .no_stderr()
+                .stdout_is(std::str::from_utf8(&expected).unwrap());
+        }
     }
     )*)
 }
diff --git a/tests/by-util/test_head.rs b/tests/by-util/test_head.rs
old mode 100755
new mode 100644
diff --git a/tests/by-util/test_hostname.rs b/tests/by-util/test_hostname.rs
index 3fcb1ae8b..45acff1b5 100644
--- a/tests/by-util/test_hostname.rs
+++ b/tests/by-util/test_hostname.rs
@@ -10,8 +10,8 @@ fn test_hostname() {
     assert!(ls_default_res.stdout().len() >= ls_domain_res.stdout().len());
 }
 
-// FixME: fails for "MacOS"
-#[cfg(not(target_vendor = "apple"))]
+// FixME: fails for "MacOS" and "freebsd" "failed to lookup address information: Name does not resolve"
+#[cfg(not(any(target_os = "macos", target_os = "freebsd")))]
 #[test]
 fn test_hostname_ip() {
     let result = new_ucmd!().arg("-i").succeeds();
diff --git a/tests/by-util/test_id.rs b/tests/by-util/test_id.rs
index e62f105de..db918aa33 100644
--- a/tests/by-util/test_id.rs
+++ b/tests/by-util/test_id.rs
@@ -17,9 +17,9 @@ fn test_id_no_specified_user() {
     let exp_result = unwrap_or_return!(expected_result(&ts, &[]));
     let mut _exp_stdout = exp_result.stdout_str().to_string();
 
-    #[cfg(target_os = "linux")]
+    #[cfg(not(feature = "feat_selinux"))]
     {
-        // NOTE: (SELinux NotImplemented) strip 'context' part from exp_stdout:
+        // NOTE: strip 'context' part from exp_stdout if selinux not enabled:
         // example:
         // uid=1001(runner) gid=121(docker) groups=121(docker),4(adm),101(systemd-journal) \
         // context=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
@@ -363,3 +363,88 @@ fn test_id_zero() {
         }
     }
 }
+
+#[test]
+#[cfg(feature = "feat_selinux")]
+fn test_id_context() {
+    use selinux::{self, KernelSupport};
+    if selinux::kernel_support() == KernelSupport::Unsupported {
+        println!("test skipped: Kernel has no support for SElinux context",);
+        return;
+    }
+    let ts = TestScenario::new(util_name!());
+    for c_flag in &["-Z", "--context"] {
+        ts.ucmd()
+            .args(&[c_flag])
+            .succeeds()
+            .stdout_only(unwrap_or_return!(expected_result(&ts, &[c_flag])).stdout_str());
+        for &z_flag in &["-z", "--zero"] {
+            let args = [c_flag, z_flag];
+            ts.ucmd()
+                .args(&args)
+                .succeeds()
+                .stdout_only(unwrap_or_return!(expected_result(&ts, &args)).stdout_str());
+            for &opt1 in &["--name", "--real"] {
+                // id: cannot print only names or real IDs in default format
+                let args = [opt1, c_flag];
+                ts.ucmd()
+                    .args(&args)
+                    .succeeds()
+                    .stdout_only(unwrap_or_return!(expected_result(&ts, &args)).stdout_str());
+                let args = [opt1, c_flag, z_flag];
+                ts.ucmd()
+                    .args(&args)
+                    .succeeds()
+                    .stdout_only(unwrap_or_return!(expected_result(&ts, &args)).stdout_str());
+                for &opt2 in &["--user", "--group", "--groups"] {
+                    // u/g/G n/r z Z
+                    // for now, we print clap's standard response for "conflicts_with" instead of:
+                    // id: cannot print "only" of more than one choice
+                    let args = [opt2, c_flag, opt1];
+                    let _result = ts.ucmd().args(&args).fails();
+                    // let exp_result = unwrap_or_return!(expected_result(&args));
+                    // result
+                    //     .stdout_is(exp_result.stdout_str())
+                    //     .stderr_is(exp_result.stderr_str())
+                    //     .code_is(exp_result.code());
+                }
+            }
+            for &opt2 in &["--user", "--group", "--groups"] {
+                // u/g/G z Z
+                // for now, we print clap's standard response for "conflicts_with" instead of:
+                // id: cannot print "only" of more than one choice
+                let args = [opt2, c_flag];
+                let _result = ts.ucmd().args(&args).fails();
+                // let exp_result = unwrap_or_return!(expected_result(&args));
+                // result
+                //     .stdout_is(exp_result.stdout_str())
+                //     .stderr_is(exp_result.stderr_str())
+                //     .code_is(exp_result.code());
+            }
+        }
+    }
+}
+
+#[test]
+#[cfg(unix)]
+fn test_id_no_specified_user_posixly() {
+    // gnu/tests/id/no-context.sh
+
+    let ts = TestScenario::new(util_name!());
+    let result = ts.ucmd().env("POSIXLY_CORRECT", "1").run();
+    assert!(!result.stdout_str().contains("context="));
+    if !is_ci() {
+        result.success();
+    }
+
+    #[cfg(all(target_os = "linux", feature = "feat_selinux"))]
+    {
+        use selinux::{self, KernelSupport};
+        if selinux::kernel_support() == KernelSupport::Unsupported {
+            println!("test skipped: Kernel has no support for SElinux context",);
+        } else {
+            let result = ts.ucmd().succeeds();
+            assert!(result.stdout_str().contains("context="));
+        }
+    }
+}
diff --git a/tests/by-util/test_install.rs b/tests/by-util/test_install.rs
index 06808db6b..339a40454 100644
--- a/tests/by-util/test_install.rs
+++ b/tests/by-util/test_install.rs
@@ -4,7 +4,7 @@ use crate::common::util::*;
 use filetime::FileTime;
 use rust_users::*;
 use std::os::unix::fs::PermissionsExt;
-#[cfg(not(windows))]
+#[cfg(not(any(windows, target_os = "freebsd")))]
 use std::process::Command;
 #[cfg(target_os = "linux")]
 use std::thread::sleep;
@@ -551,7 +551,9 @@ fn test_install_copy_then_compare_file_with_extra_mode() {
 }
 
 const STRIP_TARGET_FILE: &str = "helloworld_installed";
+#[cfg(not(any(windows, target_os = "freebsd")))]
 const SYMBOL_DUMP_PROGRAM: &str = "objdump";
+#[cfg(not(any(windows, target_os = "freebsd")))]
 const STRIP_SOURCE_FILE_SYMBOL: &str = "main";
 
 fn strip_source_file() -> &'static str {
@@ -563,7 +565,8 @@ fn strip_source_file() -> &'static str {
 }
 
 #[test]
-#[cfg(not(windows))]
+// FixME: Freebsd fails on 'No such file or directory'
+#[cfg(not(any(windows, target_os = "freebsd")))]
 fn test_install_and_strip() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;
@@ -586,7 +589,8 @@ fn test_install_and_strip() {
 }
 
 #[test]
-#[cfg(not(windows))]
+// FixME: Freebsd fails on 'No such file or directory'
+#[cfg(not(any(windows, target_os = "freebsd")))]
 fn test_install_and_strip_with_program() {
     let scene = TestScenario::new(util_name!());
     let at = &scene.fixtures;
diff --git a/tests/by-util/test_join.rs b/tests/by-util/test_join.rs
index 8dbdadba7..1d92bf8e7 100644
--- a/tests/by-util/test_join.rs
+++ b/tests/by-util/test_join.rs
@@ -94,6 +94,18 @@ fn unpaired_lines() {
         .arg("2")
         .succeeds()
         .stdout_only_fixture("unpaired_lines.expected");
+
+    new_ucmd!()
+        .arg("fields_3.txt")
+        .arg("fields_2.txt")
+        .arg("-1")
+        .arg("2")
+        .arg("-a")
+        .arg("1")
+        .arg("-a")
+        .arg("2")
+        .succeeds()
+        .stdout_only_fixture("unpaired_lines_outer.expected");
 }
 
 #[test]
@@ -107,6 +119,18 @@ fn suppress_joined() {
         .arg("2")
         .succeeds()
         .stdout_only_fixture("suppress_joined.expected");
+
+    new_ucmd!()
+        .arg("fields_3.txt")
+        .arg("fields_2.txt")
+        .arg("-1")
+        .arg("2")
+        .arg("-a")
+        .arg("1")
+        .arg("-v")
+        .arg("2")
+        .succeeds()
+        .stdout_only_fixture("suppress_joined_outer.expected");
 }
 
 #[test]
@@ -203,6 +227,19 @@ fn autoformat() {
         .pipe_in("1 x y z\n2 p")
         .succeeds()
         .stdout_only("1 x y z a\n2 p   b\n");
+
+    new_ucmd!()
+        .arg("-")
+        .arg("fields_2.txt")
+        .arg("-a")
+        .arg("1")
+        .arg("-o")
+        .arg("auto")
+        .arg("-e")
+        .arg(".")
+        .pipe_in("1 x y z\n2 p\n99 a b\n")
+        .succeeds()
+        .stdout_only("1 x y z a\n2 p . . b\n99 a b . .\n");
 }
 
 #[test]
diff --git a/tests/by-util/test_kill.rs b/tests/by-util/test_kill.rs
index fe5d4557a..40b9cec67 100644
--- a/tests/by-util/test_kill.rs
+++ b/tests/by-util/test_kill.rs
@@ -56,6 +56,12 @@ fn test_kill_list_all_signals() {
         .stdout_contains("HUP");
 }
 
+#[test]
+fn test_kill_list_final_new_line() {
+    let re = Regex::new("\\n$").unwrap();
+    assert!(re.is_match(new_ucmd!().arg("-l").succeeds().stdout_str()));
+}
+
 #[test]
 fn test_kill_list_all_signals_as_table() {
     // Check for a few signals.  Do not try to be comprehensive.
@@ -104,6 +110,26 @@ fn test_kill_with_signal_number_old_form() {
     assert_eq!(target.wait_for_signal(), Some(9));
 }
 
+#[test]
+fn test_kill_with_signal_name_old_form() {
+    let mut target = Target::new();
+    new_ucmd!()
+        .arg("-KILL")
+        .arg(format!("{}", target.pid()))
+        .succeeds();
+    assert_eq!(target.wait_for_signal(), Some(libc::SIGKILL));
+}
+
+#[test]
+fn test_kill_with_signal_prefixed_name_old_form() {
+    let mut target = Target::new();
+    new_ucmd!()
+        .arg("-SIGKILL")
+        .arg(format!("{}", target.pid()))
+        .succeeds();
+    assert_eq!(target.wait_for_signal(), Some(libc::SIGKILL));
+}
+
 #[test]
 fn test_kill_with_signal_number_new_form() {
     let mut target = Target::new();
@@ -125,3 +151,14 @@ fn test_kill_with_signal_name_new_form() {
         .succeeds();
     assert_eq!(target.wait_for_signal(), Some(libc::SIGKILL));
 }
+
+#[test]
+fn test_kill_with_signal_prefixed_name_new_form() {
+    let mut target = Target::new();
+    new_ucmd!()
+        .arg("-s")
+        .arg("SIGKILL")
+        .arg(format!("{}", target.pid()))
+        .succeeds();
+    assert_eq!(target.wait_for_signal(), Some(libc::SIGKILL));
+}
diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
index 44d14c304..56711d6e0 100644
--- a/tests/by-util/test_ls.rs
+++ b/tests/by-util/test_ls.rs
@@ -1,4 +1,4 @@
-// spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup somefile somegroup somehiddenbackup somehiddenfile
+// spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup lrwx somefile somegroup somehiddenbackup somehiddenfile
 
 #[cfg(unix)]
 extern crate unix_socket;
@@ -128,6 +128,7 @@ fn test_ls_width() {
         scene
             .ucmd()
             .args(&option.split(' ').collect::<Vec<_>>())
+            .arg("-C")
             .succeeds()
             .stdout_only("test-width-1  test-width-2  test-width-3  test-width-4\n");
     }
@@ -136,30 +137,33 @@ fn test_ls_width() {
         scene
             .ucmd()
             .args(&option.split(' ').collect::<Vec<_>>())
+            .arg("-C")
             .succeeds()
             .stdout_only("test-width-1  test-width-3\ntest-width-2  test-width-4\n");
     }
 
-    for option in &[
-        "-w 25",
-        "-w=25",
-        "--width=25",
-        "--width 25",
-        "-w 0",
-        "-w=0",
-        "--width=0",
-        "--width 0",
-    ] {
+    for option in &["-w 25", "-w=25", "--width=25", "--width 25"] {
         scene
             .ucmd()
             .args(&option.split(' ').collect::<Vec<_>>())
+            .arg("-C")
             .succeeds()
             .stdout_only("test-width-1\ntest-width-2\ntest-width-3\ntest-width-4\n");
     }
 
+    for option in &["-w 0", "-w=0", "--width=0", "--width 0"] {
+        scene
+            .ucmd()
+            .args(&option.split(' ').collect::<Vec<_>>())
+            .arg("-C")
+            .succeeds()
+            .stdout_only("test-width-1  test-width-2  test-width-3  test-width-4\n");
+    }
+
     scene
         .ucmd()
         .arg("-w=bad")
+        .arg("-C")
         .fails()
         .stderr_contains("invalid line width");
 
@@ -167,6 +171,7 @@ fn test_ls_width() {
         scene
             .ucmd()
             .args(&option.split(' ').collect::<Vec<_>>())
+            .arg("-C")
             .fails()
             .stderr_only("ls: invalid line width: '1a'");
     }
@@ -184,16 +189,10 @@ fn test_ls_columns() {
     // Columns is the default
     let result = scene.ucmd().succeeds();
 
-    #[cfg(not(windows))]
     result.stdout_only("test-columns-1\ntest-columns-2\ntest-columns-3\ntest-columns-4\n");
-    #[cfg(windows)]
-    result.stdout_only("test-columns-1  test-columns-2  test-columns-3  test-columns-4\n");
 
     for option in &["-C", "--format=columns"] {
         let result = scene.ucmd().arg(option).succeeds();
-        #[cfg(not(windows))]
-        result.stdout_only("test-columns-1\ntest-columns-2\ntest-columns-3\ntest-columns-4\n");
-        #[cfg(windows)]
         result.stdout_only("test-columns-1  test-columns-2  test-columns-3  test-columns-4\n");
     }
 
@@ -205,6 +204,38 @@ fn test_ls_columns() {
             .succeeds()
             .stdout_only("test-columns-1  test-columns-3\ntest-columns-2  test-columns-4\n");
     }
+
+    // On windows we are always able to get the terminal size, so we can't simulate falling back to the
+    // environment variable.
+    #[cfg(not(windows))]
+    {
+        for option in &["-C", "--format=columns"] {
+            scene
+                .ucmd()
+                .env("COLUMNS", "40")
+                .arg(option)
+                .succeeds()
+                .stdout_only("test-columns-1  test-columns-3\ntest-columns-2  test-columns-4\n");
+        }
+
+        scene
+            .ucmd()
+            .env("COLUMNS", "garbage")
+            .arg("-C")
+            .succeeds()
+            .stdout_is("test-columns-1  test-columns-2  test-columns-3  test-columns-4\n")
+            .stderr_is("ls: ignoring invalid width in environment variable COLUMNS: 'garbage'");
+    }
+    scene
+        .ucmd()
+        .arg("-Cw0")
+        .succeeds()
+        .stdout_only("test-columns-1  test-columns-2  test-columns-3  test-columns-4\n");
+    scene
+        .ucmd()
+        .arg("-mw0")
+        .succeeds()
+        .stdout_only("test-columns-1, test-columns-2, test-columns-3, test-columns-4\n");
 }
 
 #[test]
@@ -220,11 +251,7 @@ fn test_ls_across() {
         let result = scene.ucmd().arg(option).succeeds();
         // Because the test terminal has width 0, this is the same output as
         // the columns option.
-        if cfg!(unix) {
-            result.stdout_only("test-across-1\ntest-across-2\ntest-across-3\ntest-across-4\n");
-        } else {
-            result.stdout_only("test-across-1  test-across-2  test-across-3  test-across-4\n");
-        }
+        result.stdout_only("test-across-1  test-across-2  test-across-3  test-across-4\n");
     }
 
     for option in &["-x", "--format=across"] {
@@ -250,11 +277,7 @@ fn test_ls_commas() {
 
     for option in &["-m", "--format=commas"] {
         let result = scene.ucmd().arg(option).succeeds();
-        if cfg!(unix) {
-            result.stdout_only("test-commas-1,\ntest-commas-2,\ntest-commas-3,\ntest-commas-4\n");
-        } else {
-            result.stdout_only("test-commas-1, test-commas-2, test-commas-3, test-commas-4\n");
-        }
+        result.stdout_only("test-commas-1, test-commas-2, test-commas-3, test-commas-4\n");
     }
 
     for option in &["-m", "--format=commas"] {
@@ -310,6 +333,261 @@ fn test_ls_long() {
     }
 }
 
+#[cfg(not(windows))]
+#[test]
+fn test_ls_long_format() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+    at.mkdir(&at.plus_as_string("test-long-dir"));
+    at.touch(&at.plus_as_string("test-long-dir/test-long-file"));
+    at.mkdir(&at.plus_as_string("test-long-dir/test-long-dir"));
+
+    for arg in &["-l", "--long", "--format=long", "--format=verbose"] {
+        // Assuming sane username do not have spaces within them.
+        // A line of the output should be:
+        // One of the characters -bcCdDlMnpPsStTx?
+        // rwx, with - for missing permissions, thrice.
+        // Zero or one "." for indicating a file with security context
+        // A number, preceded by column whitespace, and followed by a single space.
+        // A username, currently [^ ], followed by column whitespace, twice (or thrice for Hurd).
+        // A number, followed by a single space.
+        // A month, followed by a single space.
+        // A day, preceded by column whitespace, and followed by a single space.
+        // Either a year or a time, currently [0-9:]+, preceded by column whitespace,
+        // and followed by a single space.
+        // Whatever comes after is irrelevant to this specific test.
+        scene.ucmd().arg(arg).arg("test-long-dir").succeeds().stdout_matches(&Regex::new(
+            r"\n[-bcCdDlMnpPsStTx?]([r-][w-][xt-]){3}\.? +\d+ [^ ]+ +[^ ]+( +[^ ]+)? +\d+ [A-Z][a-z]{2} {0,2}\d{0,2} {0,2}[0-9:]+ "
+        ).unwrap());
+    }
+
+    // This checks for the line with the .. entry. The uname and group should be digits.
+    scene.ucmd().arg("-lan").arg("test-long-dir").succeeds().stdout_matches(&Regex::new(
+        r"\nd([r-][w-][xt-]){3}\.? +\d+ \d+ +\d+( +\d+)? +\d+ [A-Z][a-z]{2} {0,2}\d{0,2} {0,2}[0-9:]+ \.\."
+    ).unwrap());
+}
+
+/// This test tests `ls -laR --color`.
+/// This test is mainly about coloring, but, the recursion, symlink `->` processing,
+/// and `.` and `..` being present in `-a` all need to work for the test to pass.
+/// This test does not really test anything provided by `-l` but the file names and symlinks.
+#[cfg(all(feature = "ln", feature = "mkdir", feature = "touch"))]
+#[test]
+#[cfg(all(feature = "ln", feature = "mkdir", feature = "touch"))]
+fn test_ls_long_symlink_color() {
+    // If you break this test after breaking mkdir, touch, or ln, do not be alarmed!
+    // This test is made for ls, but it attempts to run those utils in the process.
+
+    // Having Some([2, 0]) in a color basically means that "it has the same color as whatever
+    // is in the 2nd expected output, the 0th color", where the 0th color is the name color, and
+    // the 1st color is the target color, in a fixed-size array of size 2.
+    // Basically these are references to be used for indexing the `colors` vector defined below.
+    type ColorReference = Option<[usize; 2]>;
+
+    // The string between \x1b[ and m
+    type Color = String;
+
+    // The string between the color start and the color end is the file name itself.
+    type Name = String;
+
+    let scene = TestScenario::new(util_name!());
+
+    // .
+    // ├── dir1
+    // │   ├── file1
+    // │   ├── dir2
+    // │   │   └── dir3
+    // │   ├── ln-dir-invalid -> dir1/dir2
+    // │   ├── ln-up2 -> ../..
+    // │   └── ln-root -> /
+    // ├── ln-file1 -> dir1/file1
+    // ├── ln-file-invalid -> dir1/invalid-target
+    // └── ln-dir3 -> ./dir1/dir2/dir3
+    prepare_folder_structure(&scene);
+
+    // We memoize the colors so we can refer to them later.
+    // Each entry will be the colors of the link name and link target of a specific output.
+    let mut colors: Vec<[Color; 2]> = vec![];
+
+    // The contents of each tuple are the expected colors and names for the link and target.
+    // We will loop over the ls output and compare to those.
+    // None values mean that we do not know what color to expect yet, as LS_COLOR might
+    // be set differently, and as different implementations of ls may use different codes,
+    // for example, our ls uses `[1;36m` while the GNU ls uses `[01;36m`.
+    //
+    // These have been sorting according to default ls sort, and this affects the order of
+    // discovery of colors, so be very careful when changing directory/file names being created.
+    let expected_output: [(ColorReference, &str, ColorReference, &str); 6] = [
+        // We don't know what colors are what the first time we meet a link.
+        (None, "ln-dir3", None, "./dir1/dir2/dir3"),
+        // We have acquired [0, 0], which should be the link color,
+        // and [0, 1], which should be the dir color, and we can compare to them from now on.
+        (None, "ln-file-invalid", Some([1, 1]), "dir1/invalid-target"),
+        // We acquired [1, 1], the non-existent color.
+        (Some([0, 0]), "ln-file1", None, "dir1/file1"),
+        (Some([1, 1]), "ln-dir-invalid", Some([1, 1]), "dir1/dir2"),
+        (Some([0, 0]), "ln-root", Some([0, 1]), "/"),
+        (Some([0, 0]), "ln-up2", Some([0, 1]), "../.."),
+    ];
+
+    // We are only interested in lines or the ls output that are symlinks. These start with "lrwx".
+    let result = scene.ucmd().arg("-laR").arg("--color").arg(".").succeeds();
+    let mut result_lines = result
+        .stdout_str()
+        .lines()
+        .filter(|line| line.starts_with("lrwx"))
+        .enumerate();
+
+    // For each enumerated line, we assert that the output of ls matches the expected output.
+    //
+    // The unwraps within get_index_name_target will panic if a line starting lrwx does
+    // not have `colored_name -> target` within it.
+    while let Some((i, name, target)) = get_index_name_target(&mut result_lines) {
+        // The unwraps within capture_colored_string will panic if the name/target's color
+        // format is invalid.
+        let (matched_name_color, matched_name) = capture_colored_string(&name);
+        let (matched_target_color, matched_target) = capture_colored_string(&target);
+
+        colors.push([matched_name_color, matched_target_color]);
+
+        // We borrow them again after having moved them. This unwrap will never panic.
+        let [matched_name_color, matched_target_color] = colors.last().unwrap();
+
+        // We look up the Colors that are expected in `colors` using the ColorReferences
+        // stored in `expected_output`.
+        let expected_name_color = expected_output[i]
+            .0
+            .map(|color_reference| colors[color_reference[0]][color_reference[1]].as_str());
+        let expected_target_color = expected_output[i]
+            .2
+            .map(|color_reference| colors[color_reference[0]][color_reference[1]].as_str());
+
+        // This is the important part. The asserts inside assert_names_and_colors_are_equal
+        // will panic if the colors or names do not match the expected colors or names.
+        // Keep in mind an expected color `Option<&str>` of None can mean either that we
+        // don't expect any color here, as in `expected_output[2], or don't know what specific
+        // color to expect yet, as in expected_output[0:1].
+        assert_names_and_colors_are_equal(
+            matched_name_color,
+            expected_name_color,
+            &matched_name,
+            expected_output[i].1,
+            matched_target_color,
+            expected_target_color,
+            &matched_target,
+            expected_output[i].3,
+        );
+    }
+
+    // End of test, only definitions of the helper functions used above follows...
+
+    fn get_index_name_target<'a, I>(lines: &mut I) -> Option<(usize, Name, Name)>
+    where
+        I: Iterator<Item = (usize, &'a str)>,
+    {
+        match lines.next() {
+            Some((c, s)) => {
+                // `name` is whatever comes between \x1b (inclusive) and the arrow.
+                let name = String::from("\x1b")
+                    + s.split(" -> ")
+                        .next()
+                        .unwrap()
+                        .split(" \x1b")
+                        .last()
+                        .unwrap();
+                // `target` is whatever comes after the arrow.
+                let target = s.split(" -> ").last().unwrap().to_string();
+                Some((c, name, target))
+            }
+            None => None,
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn assert_names_and_colors_are_equal(
+        name_color: &str,
+        expected_name_color: Option<&str>,
+        name: &str,
+        expected_name: &str,
+        target_color: &str,
+        expected_target_color: Option<&str>,
+        target: &str,
+        expected_target: &str,
+    ) {
+        // Names are always compared.
+        assert_eq!(&name, &expected_name);
+        assert_eq!(&target, &expected_target);
+
+        // Colors are only compared when we have inferred what color we are looking for.
+        if expected_name_color.is_some() {
+            assert_eq!(&name_color, &expected_name_color.unwrap());
+        }
+        if expected_target_color.is_some() {
+            assert_eq!(&target_color, &expected_target_color.unwrap());
+        }
+    }
+
+    fn capture_colored_string(input: &str) -> (Color, Name) {
+        let colored_name = Regex::new(r"\x1b\[([0-9;]+)m(.+)\x1b\[0m").unwrap();
+        match colored_name.captures(input) {
+            Some(captures) => (
+                captures.get(1).unwrap().as_str().to_string(),
+                captures.get(2).unwrap().as_str().to_string(),
+            ),
+            None => ("".to_string(), input.to_string()),
+        }
+    }
+
+    fn prepare_folder_structure(scene: &TestScenario) {
+        // There is no way to change directory in the CI, so this is the best we can do.
+        // Also, keep in mind that windows might require privilege to symlink directories.
+        //
+        // We use scene.ccmd instead of scene.fixtures because we care about relative symlinks.
+        // So we're going to try out the built mkdir, touch, and ln here, and we expect them to succeed.
+        scene.ccmd("mkdir").arg("dir1").succeeds();
+        scene.ccmd("mkdir").arg("dir1/dir2").succeeds();
+        scene.ccmd("mkdir").arg("dir1/dir2/dir3").succeeds();
+        scene.ccmd("touch").arg("dir1/file1").succeeds();
+
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("dir1/dir2")
+            .arg("dir1/ln-dir-invalid")
+            .succeeds();
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("./dir1/dir2/dir3")
+            .arg("ln-dir3")
+            .succeeds();
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("../..")
+            .arg("dir1/ln-up2")
+            .succeeds();
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("/")
+            .arg("dir1/ln-root")
+            .succeeds();
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("dir1/file1")
+            .arg("ln-file1")
+            .succeeds();
+        scene
+            .ccmd("ln")
+            .arg("-s")
+            .arg("dir1/invalid-target")
+            .arg("ln-file-invalid")
+            .succeeds();
+    }
+}
+
 #[test]
 fn test_ls_long_total_size() {
     let scene = TestScenario::new(util_name!());
@@ -360,55 +638,57 @@ fn test_ls_long_formats() {
     let at = &scene.fixtures;
     at.touch(&at.plus_as_string("test-long-formats"));
 
+    // Zero or one "." for indicating a file with security context
+
     // Regex for three names, so all of author, group and owner
-    let re_three = Regex::new(r"[xrw-]{9} \d ([-0-9_a-z]+ ){3}0").unwrap();
+    let re_three = Regex::new(r"[xrw-]{9}\.? \d ([-0-9_a-z]+ ){3}0").unwrap();
 
     #[cfg(unix)]
-    let re_three_num = Regex::new(r"[xrw-]{9} \d (\d+ ){3}0").unwrap();
+    let re_three_num = Regex::new(r"[xrw-]{9}\.? \d (\d+ ){3}0").unwrap();
 
     // Regex for two names, either:
     // - group and owner
     // - author and owner
     // - author and group
-    let re_two = Regex::new(r"[xrw-]{9} \d ([-0-9_a-z]+ ){2}0").unwrap();
+    let re_two = Regex::new(r"[xrw-]{9}\.? \d ([-0-9_a-z]+ ){2}0").unwrap();
 
     #[cfg(unix)]
-    let re_two_num = Regex::new(r"[xrw-]{9} \d (\d+ ){2}0").unwrap();
+    let re_two_num = Regex::new(r"[xrw-]{9}\.? \d (\d+ ){2}0").unwrap();
 
     // Regex for one name: author, group or owner
-    let re_one = Regex::new(r"[xrw-]{9} \d [-0-9_a-z]+ 0").unwrap();
+    let re_one = Regex::new(r"[xrw-]{9}\.? \d [-0-9_a-z]+ 0").unwrap();
 
     #[cfg(unix)]
-    let re_one_num = Regex::new(r"[xrw-]{9} \d \d+ 0").unwrap();
+    let re_one_num = Regex::new(r"[xrw-]{9}\.? \d \d+ 0").unwrap();
 
     // Regex for no names
-    let re_zero = Regex::new(r"[xrw-]{9} \d 0").unwrap();
+    let re_zero = Regex::new(r"[xrw-]{9}\.? \d 0").unwrap();
 
-    let result = scene
+    scene
         .ucmd()
         .arg("-l")
         .arg("--author")
         .arg("test-long-formats")
-        .succeeds();
-    assert!(re_three.is_match(result.stdout_str()));
+        .succeeds()
+        .stdout_matches(&re_three);
 
-    let result = scene
+    scene
         .ucmd()
         .arg("-l1")
         .arg("--author")
         .arg("test-long-formats")
-        .succeeds();
-    assert!(re_three.is_match(result.stdout_str()));
+        .succeeds()
+        .stdout_matches(&re_three);
 
     #[cfg(unix)]
     {
-        let result = scene
+        scene
             .ucmd()
             .arg("-n")
             .arg("--author")
             .arg("test-long-formats")
-            .succeeds();
-        assert!(re_three_num.is_match(result.stdout_str()));
+            .succeeds()
+            .stdout_matches(&re_three_num);
     }
 
     for arg in &[
@@ -418,22 +698,22 @@ fn test_ls_long_formats() {
         "-lG --author",           // only author and owner
         "-l --no-group --author", // only author and owner
     ] {
-        let result = scene
+        scene
             .ucmd()
             .args(&arg.split(' ').collect::<Vec<_>>())
             .arg("test-long-formats")
-            .succeeds();
-        assert!(re_two.is_match(result.stdout_str()));
+            .succeeds()
+            .stdout_matches(&re_two);
 
         #[cfg(unix)]
         {
-            let result = scene
+            scene
                 .ucmd()
                 .arg("-n")
                 .args(&arg.split(' ').collect::<Vec<_>>())
                 .arg("test-long-formats")
-                .succeeds();
-            assert!(re_two_num.is_match(result.stdout_str()));
+                .succeeds()
+                .stdout_matches(&re_two_num);
         }
     }
 
@@ -447,22 +727,22 @@ fn test_ls_long_formats() {
         "-l --no-group", // only owner
         "-gG --author",  // only author
     ] {
-        let result = scene
+        scene
             .ucmd()
             .args(&arg.split(' ').collect::<Vec<_>>())
             .arg("test-long-formats")
-            .succeeds();
-        assert!(re_one.is_match(result.stdout_str()));
+            .succeeds()
+            .stdout_matches(&re_one);
 
         #[cfg(unix)]
         {
-            let result = scene
+            scene
                 .ucmd()
                 .arg("-n")
                 .args(&arg.split(' ').collect::<Vec<_>>())
                 .arg("test-long-formats")
-                .succeeds();
-            assert!(re_one_num.is_match(result.stdout_str()));
+                .succeeds()
+                .stdout_matches(&re_one_num);
         }
     }
 
@@ -479,22 +759,22 @@ fn test_ls_long_formats() {
         "-og1",
         "-og1l",
     ] {
-        let result = scene
+        scene
             .ucmd()
             .args(&arg.split(' ').collect::<Vec<_>>())
             .arg("test-long-formats")
-            .succeeds();
-        assert!(re_zero.is_match(result.stdout_str()));
+            .succeeds()
+            .stdout_matches(&re_zero);
 
         #[cfg(unix)]
         {
-            let result = scene
+            scene
                 .ucmd()
                 .arg("-n")
                 .args(&arg.split(' ').collect::<Vec<_>>())
                 .arg("test-long-formats")
-                .succeeds();
-            assert!(re_zero.is_match(result.stdout_str()));
+                .succeeds()
+                .stdout_matches(&re_zero);
         }
     }
 }
@@ -571,13 +851,11 @@ fn test_ls_sort_name() {
     at.touch("test-1");
     at.touch("test-2");
 
-    let sep = if cfg!(unix) { "\n" } else { "  " };
-
     scene
         .ucmd()
         .arg("--sort=name")
         .succeeds()
-        .stdout_is(["test-1", "test-2", "test-3\n"].join(sep));
+        .stdout_is("test-1\ntest-2\ntest-3\n");
 
     let scene_dot = TestScenario::new(util_name!());
     let at = &scene_dot.fixtures;
@@ -591,7 +869,7 @@ fn test_ls_sort_name() {
         .arg("--sort=name")
         .arg("-A")
         .succeeds()
-        .stdout_is([".a", ".b", "a", "b\n"].join(sep));
+        .stdout_is(".a\n.b\na\nb\n");
 }
 
 #[test]
@@ -612,28 +890,16 @@ fn test_ls_order_size() {
     scene.ucmd().arg("-al").succeeds();
 
     let result = scene.ucmd().arg("-S").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
-    #[cfg(windows)]
-    result.stdout_only("test-4  test-3  test-2  test-1\n");
 
     let result = scene.ucmd().arg("-S").arg("-r").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-1\ntest-2\ntest-3\ntest-4\n");
-    #[cfg(windows)]
-    result.stdout_only("test-1  test-2  test-3  test-4\n");
 
     let result = scene.ucmd().arg("--sort=size").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
-    #[cfg(windows)]
-    result.stdout_only("test-4  test-3  test-2  test-1\n");
 
     let result = scene.ucmd().arg("--sort=size").arg("-r").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-1\ntest-2\ntest-3\ntest-4\n");
-    #[cfg(windows)]
-    result.stdout_only("test-1  test-2  test-3  test-4\n");
 }
 
 #[test]
@@ -755,9 +1021,6 @@ fn test_ls_styles() {
 
     at.touch("test2");
     let result = scene.ucmd().arg("--full-time").arg("-x").succeeds();
-    #[cfg(not(windows))]
-    assert_eq!(result.stdout_str(), "test\ntest2\n");
-    #[cfg(windows)]
     assert_eq!(result.stdout_str(), "test  test2\n");
 }
 
@@ -794,28 +1057,16 @@ fn test_ls_order_time() {
 
     // ctime was changed at write, so the order is 4 3 2 1
     let result = scene.ucmd().arg("-t").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
-    #[cfg(windows)]
-    result.stdout_only("test-4  test-3  test-2  test-1\n");
 
     let result = scene.ucmd().arg("--sort=time").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
-    #[cfg(windows)]
-    result.stdout_only("test-4  test-3  test-2  test-1\n");
 
     let result = scene.ucmd().arg("-tr").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-1\ntest-2\ntest-3\ntest-4\n");
-    #[cfg(windows)]
-    result.stdout_only("test-1  test-2  test-3  test-4\n");
 
     let result = scene.ucmd().arg("--sort=time").arg("-r").succeeds();
-    #[cfg(not(windows))]
     result.stdout_only("test-1\ntest-2\ntest-3\ntest-4\n");
-    #[cfg(windows)]
-    result.stdout_only("test-1  test-2  test-3  test-4\n");
 
     // 3 was accessed last in the read
     // So the order should be 2 3 4 1
@@ -826,19 +1077,11 @@ fn test_ls_order_time() {
 
         // It seems to be dependent on the platform whether the access time is actually set
         if file3_access > file4_access {
-            if cfg!(not(windows)) {
-                result.stdout_only("test-3\ntest-4\ntest-2\ntest-1\n");
-            } else {
-                result.stdout_only("test-3  test-4  test-2  test-1\n");
-            }
+            result.stdout_only("test-3\ntest-4\ntest-2\ntest-1\n");
         } else {
             // Access time does not seem to be set on Windows and some other
             // systems so the order is 4 3 2 1
-            if cfg!(not(windows)) {
-                result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
-            } else {
-                result.stdout_only("test-4  test-3  test-2  test-1\n");
-            }
+            result.stdout_only("test-4\ntest-3\ntest-2\ntest-1\n");
         }
     }
 
@@ -991,6 +1234,7 @@ fn test_ls_color() {
         .ucmd()
         .arg("--color")
         .arg("-w=15")
+        .arg("-C")
         .succeeds()
         .stdout_only(format!(
             "{}  test-color\nb  {}\n",
@@ -1008,7 +1252,7 @@ fn test_ls_inode() {
     at.touch(file);
 
     let re_short = Regex::new(r" *(\d+) test_inode").unwrap();
-    let re_long = Regex::new(r" *(\d+) [xrw-]{10} \d .+ test_inode").unwrap();
+    let re_long = Regex::new(r" *(\d+) [xrw-]{10}\.? \d .+ test_inode").unwrap();
 
     let result = scene.ucmd().arg("test_inode").arg("-i").succeeds();
     assert!(re_short.is_match(result.stdout_str()));
@@ -1374,6 +1618,7 @@ fn test_ls_quoting_style() {
         // Default is shell-escape
         scene
             .ucmd()
+            .arg("--hide-control-chars")
             .arg("one\ntwo")
             .succeeds()
             .stdout_only("'one'$'\\n''two'\n");
@@ -1395,23 +1640,8 @@ fn test_ls_quoting_style() {
         ] {
             scene
                 .ucmd()
-                .arg(arg)
-                .arg("one\ntwo")
-                .succeeds()
-                .stdout_only(format!("{}\n", correct));
-        }
-
-        for (arg, correct) in &[
-            ("--quoting-style=literal", "one?two"),
-            ("-N", "one?two"),
-            ("--literal", "one?two"),
-            ("--quoting-style=shell", "one?two"),
-            ("--quoting-style=shell-always", "'one?two'"),
-        ] {
-            scene
-                .ucmd()
-                .arg(arg)
                 .arg("--hide-control-chars")
+                .arg(arg)
                 .arg("one\ntwo")
                 .succeeds()
                 .stdout_only(format!("{}\n", correct));
@@ -1421,7 +1651,7 @@ fn test_ls_quoting_style() {
             ("--quoting-style=literal", "one\ntwo"),
             ("-N", "one\ntwo"),
             ("--literal", "one\ntwo"),
-            ("--quoting-style=shell", "one\ntwo"),
+            ("--quoting-style=shell", "one\ntwo"), // FIXME: GNU ls quotes this case
             ("--quoting-style=shell-always", "'one\ntwo'"),
         ] {
             scene
@@ -1448,6 +1678,7 @@ fn test_ls_quoting_style() {
         ] {
             scene
                 .ucmd()
+                .arg("--hide-control-chars")
                 .arg(arg)
                 .arg("one\\two")
                 .succeeds()
@@ -1463,6 +1694,7 @@ fn test_ls_quoting_style() {
         ] {
             scene
                 .ucmd()
+                .arg("--hide-control-chars")
                 .arg(arg)
                 .arg("one\n&two")
                 .succeeds()
@@ -1493,6 +1725,7 @@ fn test_ls_quoting_style() {
     ] {
         scene
             .ucmd()
+            .arg("--hide-control-chars")
             .arg(arg)
             .arg("one two")
             .succeeds()
@@ -1516,6 +1749,7 @@ fn test_ls_quoting_style() {
     ] {
         scene
             .ucmd()
+            .arg("--hide-control-chars")
             .arg(arg)
             .arg("one")
             .succeeds()
@@ -2009,11 +2243,7 @@ fn test_ls_path() {
     };
     scene.ucmd().arg(&abs_path).run().stdout_is(expected_stdout);
 
-    let expected_stdout = if cfg!(windows) {
-        format!("{}  {}\n", path, file1)
-    } else {
-        format!("{}\n{}\n", path, file1)
-    };
+    let expected_stdout = format!("{}\n{}\n", path, file1);
     scene
         .ucmd()
         .arg(file1)
@@ -2046,3 +2276,68 @@ fn test_ls_dangling_symlinks() {
         .succeeds() // this should fail, though at the moment, ls lacks a way to propagate errors encountered during display
         .stdout_contains(if cfg!(windows) { "dangle" } else { "? dangle" });
 }
+
+#[test]
+#[cfg(feature = "feat_selinux")]
+fn test_ls_context1() {
+    use selinux::{self, KernelSupport};
+    if selinux::kernel_support() == KernelSupport::Unsupported {
+        println!("test skipped: Kernel has no support for SElinux context",);
+        return;
+    }
+
+    let file = "test_ls_context_file";
+    let expected = format!("unconfined_u:object_r:user_tmp_t:s0 {}\n", file);
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.touch(file);
+    ucmd.args(&["-Z", file]).succeeds().stdout_is(expected);
+}
+
+#[test]
+#[cfg(feature = "feat_selinux")]
+fn test_ls_context2() {
+    use selinux::{self, KernelSupport};
+    if selinux::kernel_support() == KernelSupport::Unsupported {
+        println!("test skipped: Kernel has no support for SElinux context",);
+        return;
+    }
+    let ts = TestScenario::new(util_name!());
+    for c_flag in &["-Z", "--context"] {
+        ts.ucmd()
+            .args(&[c_flag, &"/"])
+            .succeeds()
+            .stdout_only(unwrap_or_return!(expected_result(&ts, &[c_flag, &"/"])).stdout_str());
+    }
+}
+
+#[test]
+#[cfg(feature = "feat_selinux")]
+fn test_ls_context_format() {
+    use selinux::{self, KernelSupport};
+    if selinux::kernel_support() == KernelSupport::Unsupported {
+        println!("test skipped: Kernel has no support for SElinux context",);
+        return;
+    }
+    let ts = TestScenario::new(util_name!());
+    // NOTE:
+    // --format=long/verbose matches the output of GNU's ls for --context
+    // except for the size count which may differ to the size count reported by GNU's ls.
+    for word in &[
+        "across",
+        "commas",
+        "horizontal",
+        // "long",
+        "single-column",
+        // "verbose",
+        "vertical",
+    ] {
+        let format = format!("--format={}", word);
+        ts.ucmd()
+            .args(&[&"-Z", &format.as_str(), &"/"])
+            .succeeds()
+            .stdout_only(
+                unwrap_or_return!(expected_result(&ts, &[&"-Z", &format.as_str(), &"/"]))
+                    .stdout_str(),
+            );
+    }
+}
diff --git a/tests/by-util/test_mkdir.rs b/tests/by-util/test_mkdir.rs
index 54a6fe3c8..f3451fb5e 100644
--- a/tests/by-util/test_mkdir.rs
+++ b/tests/by-util/test_mkdir.rs
@@ -1,4 +1,6 @@
 use crate::common::util::*;
+#[cfg(not(windows))]
+use std::os::unix::fs::PermissionsExt;
 
 static TEST_DIR1: &str = "mkdir_test1";
 static TEST_DIR2: &str = "mkdir_test2";
@@ -65,3 +67,36 @@ fn test_mkdir_dup_file() {
     // mkdir should fail for a file even if -p is specified.
     scene.ucmd().arg("-p").arg(TEST_FILE7).fails();
 }
+
+#[test]
+#[cfg(not(windows))]
+fn test_symbolic_mode() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    ucmd.arg("-m").arg("a=rwx").arg(TEST_DIR1).succeeds();
+    let perms = at.metadata(TEST_DIR1).permissions().mode();
+    assert_eq!(perms, 0o40777)
+}
+
+#[test]
+#[cfg(not(windows))]
+fn test_symbolic_alteration() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    ucmd.arg("-m").arg("-w").arg(TEST_DIR1).succeeds();
+    let perms = at.metadata(TEST_DIR1).permissions().mode();
+    assert_eq!(perms, 0o40555)
+}
+
+#[test]
+#[cfg(not(windows))]
+fn test_multi_symbolic() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    ucmd.arg("-m")
+        .arg("u=rwx,g=rx,o=")
+        .arg(TEST_DIR1)
+        .succeeds();
+    let perms = at.metadata(TEST_DIR1).permissions().mode();
+    assert_eq!(perms, 0o40750)
+}
diff --git a/tests/by-util/test_more.rs b/tests/by-util/test_more.rs
index 9b28ee24e..4b2719d8f 100644
--- a/tests/by-util/test_more.rs
+++ b/tests/by-util/test_more.rs
@@ -15,11 +15,15 @@ fn test_more_dir_arg() {
     // Maybe we could capture the error, i.e. "Device not found" in that case
     // but I am leaving this for later
     if atty::is(atty::Stream::Stdout) {
-        let result = new_ucmd!().arg(".").run();
+        let ts = TestScenario::new(util_name!());
+        let result = ts.ucmd().arg(".").run();
         result.failure();
-        const EXPECTED_ERROR_MESSAGE: &str =
-            "more: '.' is a directory.\nTry 'more --help' for more information.";
-        assert_eq!(result.stderr_str().trim(), EXPECTED_ERROR_MESSAGE);
+        let expected_error_message = &format!(
+            "{0}: '.' is a directory.\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        );
+        assert_eq!(result.stderr_str().trim(), expected_error_message);
     } else {
     }
 }
diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs
index 02c65f68d..8d9b00664 100644
--- a/tests/by-util/test_mv.rs
+++ b/tests/by-util/test_mv.rs
@@ -522,14 +522,17 @@ fn test_mv_backup_off() {
 
 #[test]
 fn test_mv_backup_no_clobber_conflicting_options() {
-    let (_, mut ucmd) = at_and_ucmd!();
+    let ts = TestScenario::new(util_name!());
 
-    ucmd.arg("--backup")
+    ts.ucmd().arg("--backup")
         .arg("--no-clobber")
         .arg("file1")
         .arg("file2")
         .fails()
-        .stderr_is("mv: options --backup and --no-clobber are mutually exclusive\nTry 'mv --help' for more information.");
+        .stderr_is(&format!("{0}: options --backup and --no-clobber are mutually exclusive\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        ));
 }
 
 #[test]
diff --git a/tests/by-util/test_nice.rs b/tests/by-util/test_nice.rs
index 25886de78..7a99a333d 100644
--- a/tests/by-util/test_nice.rs
+++ b/tests/by-util/test_nice.rs
@@ -22,10 +22,15 @@ fn test_negative_adjustment() {
 
 #[test]
 fn test_adjustment_with_no_command_should_error() {
-    new_ucmd!()
+    let ts = TestScenario::new(util_name!());
+
+    ts.ucmd()
     .args(&["-n", "19"])
     .run()
-    .stderr_is("nice: A command must be given with an adjustment.\nTry \"nice --help\" for more information.\n");
+    .stderr_is(&format!("{0}: A command must be given with an adjustment.\nTry '{1} {0} --help' for more information.\n",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[test]
diff --git a/tests/by-util/test_od.rs b/tests/by-util/test_od.rs
index 33d7d4dc4..6c167b325 100644
--- a/tests/by-util/test_od.rs
+++ b/tests/by-util/test_od.rs
@@ -1,3 +1,4 @@
+// spell-checker:ignore abcdefghijklmnopqrstuvwxyz
 //  * This file is part of the uutils coreutils package.
 //  *
 //  * For the full copyright and license information, please view the LICENSE
@@ -35,9 +36,10 @@ fn test_file() {
     {
         let mut f = File::create(&file).unwrap();
         // spell-checker:disable-next-line
-        if f.write_all(b"abcdefghijklmnopqrstuvwxyz\n").is_err() {
-            panic!("Test setup failed - could not write file");
-        }
+        assert!(
+            !f.write_all(b"abcdefghijklmnopqrstuvwxyz\n").is_err(),
+            "Test setup failed - could not write file"
+        );
     }
 
     new_ucmd!()
@@ -46,6 +48,17 @@ fn test_file() {
         .succeeds()
         .no_stderr()
         .stdout_is(unindent(ALPHA_OUT));
+
+    // Ensure that default format matches `-t o2`, and that `-t` does not absorb file argument
+    new_ucmd!()
+        .arg("--endian=little")
+        .arg("-t")
+        .arg("o2")
+        .arg(file.as_os_str())
+        .succeeds()
+        .no_stderr()
+        .stdout_is(unindent(ALPHA_OUT));
+
     let _ = remove_file(file);
 }
 
@@ -64,9 +77,10 @@ fn test_2files() {
     // spell-checker:disable-next-line
     for &(path, data) in &[(&file1, "abcdefghijklmnop"), (&file2, "qrstuvwxyz\n")] {
         let mut f = File::create(&path).unwrap();
-        if f.write_all(data.as_bytes()).is_err() {
-            panic!("Test setup failed - could not write file");
-        }
+        assert!(
+            !f.write_all(data.as_bytes()).is_err(),
+            "Test setup failed - could not write file"
+        );
     }
 
     new_ucmd!()
@@ -115,9 +129,10 @@ fn test_from_mixed() {
     let (data1, data2, data3) = ("abcdefg", "hijklmnop", "qrstuvwxyz\n");
     for &(path, data) in &[(&file1, data1), (&file3, data3)] {
         let mut f = File::create(&path).unwrap();
-        if f.write_all(data.as_bytes()).is_err() {
-            panic!("Test setup failed - could not write file");
-        }
+        assert!(
+            !f.write_all(data.as_bytes()).is_err(),
+            "Test setup failed - could not write file"
+        );
     }
 
     new_ucmd!()
diff --git a/tests/by-util/test_pr.rs b/tests/by-util/test_pr.rs
index 4a79a3eda..5c16e7acc 100644
--- a/tests/by-util/test_pr.rs
+++ b/tests/by-util/test_pr.rs
@@ -68,41 +68,36 @@ fn test_with_numbering_option_with_number_width() {
 fn test_with_long_header_option() {
     let test_file_path = "test_one_page.log";
     let expected_test_file_path = "test_one_page_header.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
     let header = "new file";
-    scenario
-        .args(&["--header=new file", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(
-            expected_test_file_path,
-            &[("{last_modified_time}", &value), ("{header}", header)],
-        );
-
-    new_ucmd!()
-        .args(&["-h", header, test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(
-            expected_test_file_path,
-            &[("{last_modified_time}", &value), ("{header}", header)],
-        );
+    for args in &[&["-h", header][..], &["--header=new file"][..]] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(args)
+            .arg(test_file_path)
+            .succeeds()
+            .stdout_is_templated_fixture(
+                expected_test_file_path,
+                &[("{last_modified_time}", &value), ("{header}", header)],
+            );
+    }
 }
 
 #[test]
 fn test_with_double_space_option() {
     let test_file_path = "test_one_page.log";
     let expected_test_file_path = "test_one_page_double_line.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
-    scenario
-        .args(&["-d", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&["--double-space", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
+    for &arg in &["-d", "--double-space"] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&[arg, test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(
+                expected_test_file_path,
+                &[("{last_modified_time}", &value)],
+            );
+    }
 }
 
 #[test]
@@ -188,33 +183,28 @@ fn test_with_page_range() {
     let test_file_path = "test.log";
     let expected_test_file_path = "test_page_range_1.log.expected";
     let expected_test_file_path1 = "test_page_range_2.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
-    scenario
-        .args(&["--pages=15", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&["+15", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&["--pages=15:17", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(
-            expected_test_file_path1,
-            &[("{last_modified_time}", &value)],
-        );
-
-    new_ucmd!()
-        .args(&["+15:17", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(
-            expected_test_file_path1,
-            &[("{last_modified_time}", &value)],
-        );
+    for &arg in &["--pages=15", "+15"] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&[arg, test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(
+                expected_test_file_path,
+                &[("{last_modified_time}", &value)],
+            );
+    }
+    for &arg in &["--pages=15:17", "+15:17"] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&[arg, test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(
+                expected_test_file_path1,
+                &[("{last_modified_time}", &value)],
+            );
+    }
 }
 
 #[test]
@@ -232,19 +222,17 @@ fn test_with_no_header_trailer_option() {
 #[test]
 fn test_with_page_length_option() {
     let test_file_path = "test.log";
-    let expected_test_file_path = "test_page_length.log.expected";
-    let expected_test_file_path1 = "test_page_length1.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
-    scenario
-        .args(&["--pages=2:3", "-l", "100", "-n", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&["--pages=2:3", "-l", "5", "-n", test_file_path])
-        .succeeds()
-        .stdout_is_fixture(expected_test_file_path1);
+    for (arg, expected) in &[
+        ("100", "test_page_length.log.expected"),
+        ("5", "test_page_length1.log.expected"),
+    ] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&["--pages=2:3", "-l", arg, "-n", test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(expected, &[("{last_modified_time}", &value)]);
+    }
 }
 
 #[test]
@@ -277,17 +265,17 @@ fn test_with_stdin() {
 fn test_with_column() {
     let test_file_path = "column.log";
     let expected_test_file_path = "column.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
-    scenario
-        .args(&["--pages=3:5", "--column=3", "-n", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&["--pages=3:5", "-3", "-n", test_file_path])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
+    for arg in &["-3", "--column=3"] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&["--pages=3:5", arg, "-n", test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(
+                expected_test_file_path,
+                &[("{last_modified_time}", &value)],
+            );
+    }
 }
 
 #[test]
@@ -305,36 +293,17 @@ fn test_with_column_across_option() {
 #[test]
 fn test_with_column_across_option_and_column_separator() {
     let test_file_path = "column.log";
-    let expected_test_file_path = "column_across_sep.log.expected";
-    let expected_test_file_path1 = "column_across_sep1.log.expected";
-    let mut scenario = new_ucmd!();
-    let value = file_last_modified_time(&scenario, test_file_path);
-    scenario
-        .args(&[
-            "--pages=3:5",
-            "--column=3",
-            "-s|",
-            "-a",
-            "-n",
-            test_file_path,
-        ])
-        .succeeds()
-        .stdout_is_templated_fixture(expected_test_file_path, &[("{last_modified_time}", &value)]);
-
-    new_ucmd!()
-        .args(&[
-            "--pages=3:5",
-            "--column=3",
-            "-Sdivide",
-            "-a",
-            "-n",
-            test_file_path,
-        ])
-        .succeeds()
-        .stdout_is_templated_fixture(
-            expected_test_file_path1,
-            &[("{last_modified_time}", &value)],
-        );
+    for (arg, expected) in &[
+        ("-s|", "column_across_sep.log.expected"),
+        ("-Sdivide", "column_across_sep1.log.expected"),
+    ] {
+        let mut scenario = new_ucmd!();
+        let value = file_last_modified_time(&scenario, test_file_path);
+        scenario
+            .args(&["--pages=3:5", "--column=3", arg, "-a", "-n", test_file_path])
+            .succeeds()
+            .stdout_is_templated_fixture(expected, &[("{last_modified_time}", &value)]);
+    }
 }
 
 #[test]
diff --git a/tests/by-util/test_pwd.rs b/tests/by-util/test_pwd.rs
index 2779b9e62..bc08ddbb0 100644
--- a/tests/by-util/test_pwd.rs
+++ b/tests/by-util/test_pwd.rs
@@ -1,9 +1,13 @@
+// spell-checker:ignore (words) symdir somefakedir
+
+use std::path::PathBuf;
+
 use crate::common::util::*;
 
 #[test]
 fn test_default() {
     let (at, mut ucmd) = at_and_ucmd!();
-    ucmd.run().stdout_is(at.root_dir_resolved() + "\n");
+    ucmd.succeeds().stdout_is(at.root_dir_resolved() + "\n");
 }
 
 #[test]
@@ -11,3 +15,118 @@ fn test_failed() {
     let (_at, mut ucmd) = at_and_ucmd!();
     ucmd.arg("will-fail").fails();
 }
+
+#[cfg(unix)]
+#[test]
+fn test_deleted_dir() {
+    use std::process::Command;
+
+    let ts = TestScenario::new(util_name!());
+    let at = ts.fixtures.clone();
+    let output = Command::new("sh")
+        .arg("-c")
+        .arg(format!(
+            "cd '{}'; mkdir foo; cd foo; rmdir ../foo; exec {} {}",
+            at.root_dir_resolved(),
+            ts.bin_path.to_str().unwrap(),
+            ts.util_name,
+        ))
+        .output()
+        .unwrap();
+    assert!(!output.status.success());
+    assert!(output.stdout.is_empty());
+    assert_eq!(
+        output.stderr,
+        b"pwd: failed to get current directory: No such file or directory\n"
+    );
+}
+
+struct Env {
+    ucmd: UCommand,
+    #[cfg(not(windows))]
+    root: String,
+    subdir: String,
+    symdir: String,
+}
+
+fn symlinked_env() -> Env {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.mkdir("subdir");
+    // Note: on Windows this requires admin permissions
+    at.symlink_dir("subdir", "symdir");
+    let root = PathBuf::from(at.root_dir_resolved());
+    ucmd.raw.current_dir(root.join("symdir"));
+    #[cfg(not(windows))]
+    ucmd.env("PWD", root.join("symdir"));
+    Env {
+        ucmd,
+        #[cfg(not(windows))]
+        root: root.to_string_lossy().into_owned(),
+        subdir: root.join("subdir").to_string_lossy().into_owned(),
+        symdir: root.join("symdir").to_string_lossy().into_owned(),
+    }
+}
+
+#[test]
+fn test_symlinked_logical() {
+    let mut env = symlinked_env();
+    env.ucmd.arg("-L").succeeds().stdout_is(env.symdir + "\n");
+}
+
+#[test]
+fn test_symlinked_physical() {
+    let mut env = symlinked_env();
+    env.ucmd.arg("-P").succeeds().stdout_is(env.subdir + "\n");
+}
+
+#[test]
+fn test_symlinked_default() {
+    let mut env = symlinked_env();
+    env.ucmd.succeeds().stdout_is(env.subdir + "\n");
+}
+
+#[cfg(not(windows))]
+pub mod untrustworthy_pwd_var {
+    use std::path::Path;
+
+    use super::*;
+
+    #[test]
+    fn test_nonexistent_logical() {
+        let (at, mut ucmd) = at_and_ucmd!();
+        ucmd.arg("-L")
+            .env("PWD", "/somefakedir")
+            .succeeds()
+            .stdout_is(at.root_dir_resolved() + "\n");
+    }
+
+    #[test]
+    fn test_wrong_logical() {
+        let mut env = symlinked_env();
+        env.ucmd
+            .arg("-L")
+            .env("PWD", env.root)
+            .succeeds()
+            .stdout_is(env.subdir + "\n");
+    }
+
+    #[test]
+    fn test_redundant_logical() {
+        let mut env = symlinked_env();
+        env.ucmd
+            .arg("-L")
+            .env("PWD", Path::new(&env.symdir).join("."))
+            .succeeds()
+            .stdout_is(env.subdir + "\n");
+    }
+
+    #[test]
+    fn test_relative_logical() {
+        let mut env = symlinked_env();
+        env.ucmd
+            .arg("-L")
+            .env("PWD", ".")
+            .succeeds()
+            .stdout_is(env.subdir + "\n");
+    }
+}
diff --git a/tests/by-util/test_readlink.rs b/tests/by-util/test_readlink.rs
index 51aebbed2..25f29004f 100644
--- a/tests/by-util/test_readlink.rs
+++ b/tests/by-util/test_readlink.rs
@@ -2,6 +2,17 @@ use crate::common::util::*;
 
 static GIBBERISH: &str = "supercalifragilisticexpialidocious";
 
+#[test]
+fn test_resolve() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    at.touch("foo");
+    at.symlink_file("foo", "bar");
+
+    scene.ucmd().arg("bar").succeeds().stdout_contains("foo\n");
+}
+
 #[test]
 fn test_canonicalize() {
     let (at, mut ucmd) = at_and_ucmd!();
diff --git a/tests/by-util/test_realpath.rs b/tests/by-util/test_realpath.rs
index e1384ac74..72bf5b6ea 100644
--- a/tests/by-util/test_realpath.rs
+++ b/tests/by-util/test_realpath.rs
@@ -1,5 +1,9 @@
 use crate::common::util::*;
 
+use std::path::Path;
+
+static GIBBERISH: &str = "supercalifragilisticexpialidocious";
+
 #[test]
 fn test_realpath_current_directory() {
     let (at, mut ucmd) = at_and_ucmd!();
@@ -106,3 +110,95 @@ fn test_realpath_file_and_links_strip_zero() {
         .succeeds()
         .stdout_contains("bar\u{0}");
 }
+
+#[test]
+fn test_realpath_physical_mode() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    at.mkdir("dir1");
+    at.mkdir_all("dir2/bar");
+    at.symlink_dir("dir2/bar", "dir1/foo");
+
+    scene
+        .ucmd()
+        .arg("dir1/foo/..")
+        .succeeds()
+        .stdout_contains("dir2\n");
+}
+
+#[test]
+fn test_realpath_logical_mode() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    at.mkdir("dir1");
+    at.mkdir("dir2");
+    at.symlink_dir("dir2", "dir1/foo");
+
+    scene
+        .ucmd()
+        .arg("-L")
+        .arg("dir1/foo/..")
+        .succeeds()
+        .stdout_contains("dir1\n");
+}
+
+#[test]
+fn test_realpath_dangling() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.symlink_file("nonexistent-file", "link");
+    ucmd.arg("link")
+        .succeeds()
+        .stdout_only(at.plus_as_string("nonexistent-file\n"));
+}
+
+#[test]
+fn test_realpath_loop() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.symlink_file("2", "1");
+    at.symlink_file("3", "2");
+    at.symlink_file("1", "3");
+    ucmd.arg("1")
+        .succeeds()
+        .stdout_only(at.plus_as_string("2\n"));
+}
+
+#[test]
+fn test_realpath_default_allows_final_non_existent() {
+    let p = Path::new("").join(GIBBERISH);
+    let (at, mut ucmd) = at_and_ucmd!();
+    let expect = path_concat!(at.root_dir_resolved(), p.to_str().unwrap()) + "\n";
+    ucmd.arg(p.as_os_str()).succeeds().stdout_only(expect);
+}
+
+#[test]
+fn test_realpath_default_forbids_non_final_non_existent() {
+    let p = Path::new("").join(GIBBERISH).join(GIBBERISH);
+    new_ucmd!().arg(p.to_str().unwrap()).fails();
+}
+
+#[test]
+fn test_realpath_existing() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    ucmd.arg("-e")
+        .arg(".")
+        .succeeds()
+        .stdout_only(at.plus_as_string(&format!("{}\n", at.root_dir_resolved())));
+}
+
+#[test]
+fn test_realpath_existing_error() {
+    new_ucmd!().arg("-e").arg(GIBBERISH).fails();
+}
+
+#[test]
+fn test_realpath_missing() {
+    let p = Path::new("").join(GIBBERISH).join(GIBBERISH);
+    let (at, mut ucmd) = at_and_ucmd!();
+    let expect = path_concat!(at.root_dir_resolved(), p.to_str().unwrap()) + "\n";
+    ucmd.arg("-m")
+        .arg(p.as_os_str())
+        .succeeds()
+        .stdout_only(expect);
+}
diff --git a/tests/by-util/test_rm.rs b/tests/by-util/test_rm.rs
index 0592be244..092a5f00d 100644
--- a/tests/by-util/test_rm.rs
+++ b/tests/by-util/test_rm.rs
@@ -169,6 +169,29 @@ fn test_rm_recursive() {
     assert!(!at.file_exists(file_b));
 }
 
+#[test]
+fn test_rm_recursive_multiple() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let dir = "test_rm_recursive_directory";
+    let file_a = "test_rm_recursive_directory/test_rm_recursive_file_a";
+    let file_b = "test_rm_recursive_directory/test_rm_recursive_file_b";
+
+    at.mkdir(dir);
+    at.touch(file_a);
+    at.touch(file_b);
+
+    ucmd.arg("-r")
+        .arg("-r")
+        .arg("-r")
+        .arg(dir)
+        .succeeds()
+        .no_stderr();
+
+    assert!(!at.dir_exists(dir));
+    assert!(!at.file_exists(file_a));
+    assert!(!at.file_exists(file_b));
+}
+
 #[test]
 fn test_rm_directory_without_flag() {
     let (at, mut ucmd) = at_and_ucmd!();
@@ -255,10 +278,12 @@ fn test_rm_force_no_operand() {
 
 #[test]
 fn test_rm_no_operand() {
-    let mut ucmd = new_ucmd!();
-
-    ucmd.fails()
-        .stderr_is("rm: missing an argument\nrm: for help, try 'rm --help'\n");
+    let ts = TestScenario::new(util_name!());
+    ts.ucmd().fails().stderr_is(&format!(
+        "{0}: missing an argument\n{0}: for help, try '{1} {0} --help'\n",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[test]
diff --git a/tests/by-util/test_rmdir.rs b/tests/by-util/test_rmdir.rs
index 4b74b2522..c8f22aa6c 100644
--- a/tests/by-util/test_rmdir.rs
+++ b/tests/by-util/test_rmdir.rs
@@ -1,126 +1,238 @@
 use crate::common::util::*;
 
+const DIR: &str = "dir";
+const DIR_FILE: &str = "dir/file";
+const NESTED_DIR: &str = "dir/ect/ory";
+const NESTED_DIR_FILE: &str = "dir/ect/ory/file";
+
+#[cfg(windows)]
+const NOT_FOUND: &str = "The system cannot find the file specified.";
+#[cfg(not(windows))]
+const NOT_FOUND: &str = "No such file or directory";
+
+#[cfg(windows)]
+const NOT_EMPTY: &str = "The directory is not empty.";
+#[cfg(not(windows))]
+const NOT_EMPTY: &str = "Directory not empty";
+
+#[cfg(windows)]
+const NOT_A_DIRECTORY: &str = "The directory name is invalid.";
+#[cfg(not(windows))]
+const NOT_A_DIRECTORY: &str = "Not a directory";
+
 #[test]
 fn test_rmdir_empty_directory_no_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_empty_no_parents";
 
-    at.mkdir(dir);
-    assert!(at.dir_exists(dir));
+    at.mkdir(DIR);
 
-    ucmd.arg(dir).succeeds().no_stderr();
+    ucmd.arg(DIR).succeeds().no_stderr();
 
-    assert!(!at.dir_exists(dir));
+    assert!(!at.dir_exists(DIR));
 }
 
 #[test]
 fn test_rmdir_empty_directory_with_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_empty/with/parents";
 
-    at.mkdir_all(dir);
-    assert!(at.dir_exists(dir));
+    at.mkdir_all(NESTED_DIR);
 
-    ucmd.arg("-p").arg(dir).succeeds().no_stderr();
+    ucmd.arg("-p").arg(NESTED_DIR).succeeds().no_stderr();
 
-    assert!(!at.dir_exists(dir));
+    assert!(!at.dir_exists(NESTED_DIR));
+    assert!(!at.dir_exists(DIR));
 }
 
 #[test]
 fn test_rmdir_nonempty_directory_no_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_nonempty_no_parents";
-    let file = "test_rmdir_nonempty_no_parents/foo";
 
-    at.mkdir(dir);
-    assert!(at.dir_exists(dir));
+    at.mkdir(DIR);
+    at.touch(DIR_FILE);
 
-    at.touch(file);
-    assert!(at.file_exists(file));
+    ucmd.arg(DIR)
+        .fails()
+        .stderr_is(format!("rmdir: failed to remove 'dir': {}", NOT_EMPTY));
 
-    ucmd.arg(dir).fails().stderr_is(
-        "rmdir: failed to remove 'test_rmdir_nonempty_no_parents': Directory not \
-         empty\n",
-    );
-
-    assert!(at.dir_exists(dir));
+    assert!(at.dir_exists(DIR));
 }
 
 #[test]
 fn test_rmdir_nonempty_directory_with_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_nonempty/with/parents";
-    let file = "test_rmdir_nonempty/with/parents/foo";
 
-    at.mkdir_all(dir);
-    assert!(at.dir_exists(dir));
+    at.mkdir_all(NESTED_DIR);
+    at.touch(NESTED_DIR_FILE);
 
-    at.touch(file);
-    assert!(at.file_exists(file));
+    ucmd.arg("-p").arg(NESTED_DIR).fails().stderr_is(format!(
+        "rmdir: failed to remove 'dir/ect/ory': {}",
+        NOT_EMPTY
+    ));
 
-    ucmd.arg("-p").arg(dir).fails().stderr_is(
-        "rmdir: failed to remove 'test_rmdir_nonempty/with/parents': Directory not \
-         empty\nrmdir: failed to remove 'test_rmdir_nonempty/with': Directory not \
-         empty\nrmdir: failed to remove 'test_rmdir_nonempty': Directory not \
-         empty\n",
-    );
-
-    assert!(at.dir_exists(dir));
+    assert!(at.dir_exists(NESTED_DIR));
 }
 
 #[test]
 fn test_rmdir_ignore_nonempty_directory_no_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_ignore_nonempty_no_parents";
-    let file = "test_rmdir_ignore_nonempty_no_parents/foo";
 
-    at.mkdir(dir);
-    assert!(at.dir_exists(dir));
-
-    at.touch(file);
-    assert!(at.file_exists(file));
+    at.mkdir(DIR);
+    at.touch(DIR_FILE);
 
     ucmd.arg("--ignore-fail-on-non-empty")
-        .arg(dir)
+        .arg(DIR)
         .succeeds()
         .no_stderr();
 
-    assert!(at.dir_exists(dir));
+    assert!(at.dir_exists(DIR));
 }
 
 #[test]
 fn test_rmdir_ignore_nonempty_directory_with_parents() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_rmdir_ignore_nonempty/with/parents";
-    let file = "test_rmdir_ignore_nonempty/with/parents/foo";
 
-    at.mkdir_all(dir);
-    assert!(at.dir_exists(dir));
-
-    at.touch(file);
-    assert!(at.file_exists(file));
+    at.mkdir_all(NESTED_DIR);
+    at.touch(NESTED_DIR_FILE);
 
     ucmd.arg("--ignore-fail-on-non-empty")
         .arg("-p")
-        .arg(dir)
+        .arg(NESTED_DIR)
         .succeeds()
         .no_stderr();
 
-    assert!(at.dir_exists(dir));
+    assert!(at.dir_exists(NESTED_DIR));
 }
 
 #[test]
-fn test_rmdir_remove_symlink_match_gnu_error() {
+fn test_rmdir_not_a_directory() {
     let (at, mut ucmd) = at_and_ucmd!();
 
-    let file = "file";
-    let fl = "fl";
-    at.touch(file);
-    assert!(at.file_exists(file));
-    at.symlink_file(file, fl);
-    assert!(at.file_exists(fl));
+    at.touch("file");
 
-    ucmd.arg("fl/")
+    ucmd.arg("--ignore-fail-on-non-empty")
+        .arg("file")
         .fails()
-        .stderr_is("rmdir: failed to remove 'fl/': Not a directory");
+        .no_stdout()
+        .stderr_is(format!(
+            "rmdir: failed to remove 'file': {}",
+            NOT_A_DIRECTORY
+        ));
+}
+
+#[test]
+fn test_verbose_single() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.mkdir(DIR);
+
+    ucmd.arg("-v")
+        .arg(DIR)
+        .succeeds()
+        .no_stderr()
+        .stdout_is("rmdir: removing directory, 'dir'\n");
+}
+
+#[test]
+fn test_verbose_multi() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.mkdir(DIR);
+
+    ucmd.arg("-v")
+        .arg("does_not_exist")
+        .arg(DIR)
+        .fails()
+        .stdout_is(
+            "rmdir: removing directory, 'does_not_exist'\n\
+             rmdir: removing directory, 'dir'\n",
+        )
+        .stderr_is(format!(
+            "rmdir: failed to remove 'does_not_exist': {}",
+            NOT_FOUND
+        ));
+}
+
+#[test]
+fn test_verbose_nested_failure() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.mkdir_all(NESTED_DIR);
+    at.touch("dir/ect/file");
+
+    ucmd.arg("-pv")
+        .arg(NESTED_DIR)
+        .fails()
+        .stdout_is(
+            "rmdir: removing directory, 'dir/ect/ory'\n\
+             rmdir: removing directory, 'dir/ect'\n",
+        )
+        .stderr_is(format!("rmdir: failed to remove 'dir/ect': {}", NOT_EMPTY));
+}
+
+#[cfg(unix)]
+#[test]
+fn test_rmdir_ignore_nonempty_no_permissions() {
+    use std::fs;
+
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    // We make the *parent* dir read-only to prevent deleting the dir in it.
+    at.mkdir_all("dir/ect/ory");
+    at.touch("dir/ect/ory/file");
+    let dir_ect = at.plus("dir/ect");
+    let mut perms = fs::metadata(&dir_ect).unwrap().permissions();
+    perms.set_readonly(true);
+    fs::set_permissions(&dir_ect, perms.clone()).unwrap();
+
+    // rmdir should now get a permissions error that it interprets as
+    // a non-empty error.
+    ucmd.arg("--ignore-fail-on-non-empty")
+        .arg("dir/ect/ory")
+        .succeeds()
+        .no_stderr();
+
+    assert!(at.dir_exists("dir/ect/ory"));
+
+    // Politely restore permissions for cleanup
+    perms.set_readonly(false);
+    fs::set_permissions(&dir_ect, perms).unwrap();
+}
+
+#[test]
+fn test_rmdir_remove_symlink_file() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.touch("file");
+    at.symlink_file("file", "fl");
+
+    ucmd.arg("fl/").fails().stderr_is(format!(
+        "rmdir: failed to remove 'fl/': {}",
+        NOT_A_DIRECTORY
+    ));
+}
+
+// This behavior is known to happen on Linux but not all Unixes
+#[cfg(any(target_os = "linux", target_os = "android"))]
+#[test]
+fn test_rmdir_remove_symlink_dir() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.mkdir("dir");
+    at.symlink_dir("dir", "dl");
+
+    ucmd.arg("dl/")
+        .fails()
+        .stderr_is("rmdir: failed to remove 'dl/': Symbolic link not followed");
+}
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+#[test]
+fn test_rmdir_remove_symlink_dangling() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.symlink_dir("dir", "dl");
+
+    ucmd.arg("dl/")
+        .fails()
+        .stderr_is("rmdir: failed to remove 'dl/': Symbolic link not followed");
 }
diff --git a/tests/by-util/test_runcon.rs b/tests/by-util/test_runcon.rs
new file mode 100644
index 000000000..047ce5769
--- /dev/null
+++ b/tests/by-util/test_runcon.rs
@@ -0,0 +1,151 @@
+// spell-checker:ignore (jargon) xattributes
+
+#![cfg(feature = "feat_selinux")]
+
+use crate::common::util::*;
+
+// TODO: Check the implementation of `--compute` somehow.
+
+#[test]
+fn version() {
+    new_ucmd!().arg("--version").succeeds();
+    new_ucmd!().arg("-V").succeeds();
+}
+
+#[test]
+fn help() {
+    new_ucmd!().arg("--help").succeeds();
+    new_ucmd!().arg("-h").succeeds();
+}
+
+#[test]
+fn print() {
+    new_ucmd!().succeeds();
+
+    for &flag in &["-c", "--compute"] {
+        new_ucmd!().arg(flag).succeeds();
+    }
+
+    for &flag in &[
+        "-t", "--type", "-u", "--user", "-r", "--role", "-l", "--range",
+    ] {
+        new_ucmd!().args(&[flag, "example"]).succeeds();
+        new_ucmd!().args(&[flag, "example1,example2"]).succeeds();
+    }
+}
+
+#[test]
+fn invalid() {
+    new_ucmd!().arg("invalid").fails().code_is(1);
+
+    let args = &[
+        "unconfined_u:unconfined_r:unconfined_t:s0",
+        "inexistent-file",
+    ];
+    new_ucmd!().args(args).fails().code_is(127);
+
+    let args = &["invalid", "/bin/true"];
+    new_ucmd!().args(args).fails().code_is(1);
+
+    let args = &["--compute", "inexistent-file"];
+    new_ucmd!().args(args).fails().code_is(1);
+
+    let args = &["--compute", "--compute"];
+    new_ucmd!().args(args).fails().code_is(1);
+
+    // clap has an issue that makes this test fail: https://github.com/clap-rs/clap/issues/1543
+    // TODO: Enable this code once the issue is fixed in the clap version we're using.
+    //new_ucmd!().arg("--compute=example").fails().code_is(1);
+
+    for &flag in &[
+        "-t", "--type", "-u", "--user", "-r", "--role", "-l", "--range",
+    ] {
+        new_ucmd!().arg(flag).fails().code_is(1);
+
+        let args = &[flag, "example", flag, "example"];
+        new_ucmd!().args(args).fails().code_is(1);
+    }
+}
+
+#[test]
+fn plain_context() {
+    let ctx = "unconfined_u:unconfined_r:unconfined_t:s0-s0";
+    new_ucmd!().args(&[ctx, "/bin/true"]).succeeds();
+    new_ucmd!().args(&[ctx, "/bin/false"]).fails().code_is(1);
+
+    let output = new_ucmd!().args(&[ctx, "sestatus", "-v"]).succeeds();
+    let r = get_sestatus_context(output.stdout());
+    assert_eq!(r, "unconfined_u:unconfined_r:unconfined_t:s0");
+
+    let ctx = "system_u:unconfined_r:unconfined_t:s0-s0";
+    new_ucmd!().args(&[ctx, "/bin/true"]).succeeds();
+
+    let ctx = "system_u:system_r:unconfined_t:s0";
+    let output = new_ucmd!().args(&[ctx, "sestatus", "-v"]).succeeds();
+    assert_eq!(get_sestatus_context(output.stdout()), ctx);
+}
+
+#[test]
+fn custom_context() {
+    let t_ud = "unconfined_t";
+    let u_ud = "unconfined_u";
+    let r_ud = "unconfined_r";
+
+    new_ucmd!().args(&["--compute", "/bin/true"]).succeeds();
+
+    let args = &["--compute", "/bin/false"];
+    new_ucmd!().args(args).fails().code_is(1);
+
+    let args = &["--type", t_ud, "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    let args = &["--compute", "--type", t_ud, "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    let args = &["--user=system_u", "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    let args = &["--compute", "--user=system_u", "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    let args = &["--role=system_r", "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    let args = &["--compute", "--role=system_r", "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    new_ucmd!().args(&["--range=s0", "/bin/true"]).succeeds();
+
+    let args = &["--compute", "--range=s0", "/bin/true"];
+    new_ucmd!().args(args).succeeds();
+
+    for &(ctx, u, r) in &[
+        ("unconfined_u:unconfined_r:unconfined_t:s0", u_ud, r_ud),
+        ("system_u:unconfined_r:unconfined_t:s0", "system_u", r_ud),
+        ("unconfined_u:system_r:unconfined_t:s0", u_ud, "system_r"),
+        ("system_u:system_r:unconfined_t:s0", "system_u", "system_r"),
+    ] {
+        let args = &["-t", t_ud, "-u", u, "-r", r, "-l", "s0", "sestatus", "-v"];
+
+        let output = new_ucmd!().args(args).succeeds();
+        assert_eq!(get_sestatus_context(output.stdout()), ctx);
+    }
+}
+
+fn get_sestatus_context(output: &[u8]) -> &str {
+    let re = regex::bytes::Regex::new(r#"Current context:\s*(\S+)\s*"#)
+        .expect("Invalid regular expression");
+
+    output
+        .split(|&b| b == b'\n')
+        .find(|&b| b.starts_with(b"Current context:"))
+        .and_then(|line| {
+            re.captures_iter(line)
+                .next()
+                .and_then(|c| c.get(1))
+                .as_ref()
+                .map(regex::bytes::Match::as_bytes)
+        })
+        .and_then(|bytes| std::str::from_utf8(bytes).ok())
+        .expect("Output of sestatus is unexpected")
+}
diff --git a/tests/by-util/test_seq.rs b/tests/by-util/test_seq.rs
index be04bf1fd..6ed3cb67d 100644
--- a/tests/by-util/test_seq.rs
+++ b/tests/by-util/test_seq.rs
@@ -1,17 +1,139 @@
 use crate::common::util::*;
+use std::io::Read;
+
+#[test]
+fn test_hex_rejects_sign_after_identifier() {
+    new_ucmd!()
+        .args(&["0x-123ABC"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid hexadecimal argument: '0x-123ABC'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["0x+123ABC"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid hexadecimal argument: '0x+123ABC'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["-0x-123ABC"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid hexadecimal argument: '-0x-123ABC'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["-0x+123ABC"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid hexadecimal argument: '-0x+123ABC'")
+        .stderr_contains("for more information.");
+}
+
+#[test]
+fn test_hex_lowercase_uppercase() {
+    new_ucmd!()
+        .args(&["0xa", "0xA"])
+        .succeeds()
+        .stdout_is("10\n");
+    new_ucmd!()
+        .args(&["0Xa", "0XA"])
+        .succeeds()
+        .stdout_is("10\n");
+}
+
+#[test]
+fn test_hex_big_number() {
+    new_ucmd!()
+        .args(&[
+            "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+            "0x100000000000000000000000000000000",
+        ])
+        .succeeds()
+        .stdout_is(
+            "340282366920938463463374607431768211455\n340282366920938463463374607431768211456\n",
+        );
+}
+
+#[test]
+fn test_hex_identifier_in_wrong_place() {
+    new_ucmd!()
+        .args(&["1234ABCD0x"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid hexadecimal argument: '1234ABCD0x'")
+        .stderr_contains("for more information.");
+}
 
 #[test]
 fn test_rejects_nan() {
-    new_ucmd!().args(&["NaN"]).fails().stderr_only(
-        "seq: invalid 'not-a-number' argument: 'NaN'\nTry 'seq --help' for more information.",
-    );
+    let ts = TestScenario::new(util_name!());
+
+    ts.ucmd().args(&["NaN"]).fails().stderr_only(format!(
+        "{0}: invalid 'not-a-number' argument: 'NaN'\nTry '{1} {0} --help' for more information.",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[test]
 fn test_rejects_non_floats() {
-    new_ucmd!().args(&["foo"]).fails().stderr_only(
-        "seq: invalid floating point argument: 'foo'\nTry 'seq --help' for more information.",
-    );
+    let ts = TestScenario::new(util_name!());
+
+    ts.ucmd().args(&["foo"]).fails().stderr_only(&format!(
+        "{0}: invalid floating point argument: 'foo'\nTry '{1} {0} --help' for more information.",
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
+}
+
+#[test]
+fn test_invalid_float() {
+    new_ucmd!()
+        .args(&["1e2.3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["1e2.3", "2"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["1", "1e2.3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["1e2.3", "2", "3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["1", "1e2.3", "3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+    new_ucmd!()
+        .args(&["1", "2", "1e2.3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
+}
+
+#[test]
+fn test_width_invalid_float() {
+    new_ucmd!()
+        .args(&["-w", "1e2.3"])
+        .fails()
+        .no_stdout()
+        .stderr_contains("invalid floating point argument: '1e2.3'")
+        .stderr_contains("for more information.");
 }
 
 // ---- Tests for the big integer based path ----
@@ -132,3 +254,293 @@ fn test_seq_wrong_arg_floats() {
 fn test_zero_step_floats() {
     new_ucmd!().args(&["10.0", "0", "32"]).fails();
 }
+
+#[test]
+fn test_preserve_negative_zero_start() {
+    new_ucmd!()
+        .args(&["-0", "1"])
+        .succeeds()
+        .stdout_is("-0\n1\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-0", "1", "2"])
+        .succeeds()
+        .stdout_is("-0\n1\n2\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-0", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0\n1\n2\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_drop_negative_zero_end() {
+    new_ucmd!()
+        .args(&["1", "-1", "-0"])
+        .succeeds()
+        .stdout_is("1\n0\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_scientific_notation() {
+    new_ucmd!()
+        .args(&["-w", "999", "1e3"])
+        .succeeds()
+        .stdout_is("0999\n1000\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_negative_zero() {
+    new_ucmd!()
+        .args(&["-w", "-0", "1"])
+        .succeeds()
+        .stdout_is("-0\n01\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0", "1", "2"])
+        .succeeds()
+        .stdout_is("-0\n01\n02\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0\n01\n02\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_negative_zero_decimal_notation() {
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1.0"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1", "2"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n02.0\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n02.0\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1.0", "2"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n02.0\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.0", "1.0", "2.0"])
+        .succeeds()
+        .stdout_is("-0.0\n01.0\n02.0\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_negative_zero_scientific_notation() {
+    new_ucmd!()
+        .args(&["-w", "-0e0", "1"])
+        .succeeds()
+        .stdout_is("-0\n01\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0e0", "1", "2"])
+        .succeeds()
+        .stdout_is("-0\n01\n02\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0e0", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0\n01\n02\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", "-0e+1", "1"])
+        .succeeds()
+        .stdout_is("-00\n001\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0e+1", "1", "2"])
+        .succeeds()
+        .stdout_is("-00\n001\n002\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0e+1", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-00\n001\n002\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", "-0.000e0", "1"])
+        .succeeds()
+        .stdout_is("-0.000\n01.000\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e0", "1", "2"])
+        .succeeds()
+        .stdout_is("-0.000\n01.000\n02.000\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e0", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0.000\n01.000\n02.000\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", "-0.000e-2", "1"])
+        .succeeds()
+        .stdout_is("-0.00000\n01.00000\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e-2", "1", "2"])
+        .succeeds()
+        .stdout_is("-0.00000\n01.00000\n02.00000\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e-2", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-0.00000\n01.00000\n02.00000\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1", "2"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n0000002\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n0000002\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1", "2"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n0000002\n")
+        .no_stderr();
+    new_ucmd!()
+        .args(&["-w", "-0.000e5", "1", "2.0"])
+        .succeeds()
+        .stdout_is("-000000\n0000001\n0000002\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_decimal_scientific_notation_increment() {
+    new_ucmd!()
+        .args(&["-w", ".1", "1e-2", ".11"])
+        .succeeds()
+        .stdout_is("0.10\n0.11\n")
+        .no_stderr();
+
+    new_ucmd!()
+        .args(&["-w", ".0", "1.500e-1", ".2"])
+        .succeeds()
+        .stdout_is("0.0000\n0.1500\n")
+        .no_stderr();
+}
+
+/// Test that trailing zeros in the start argument contribute to precision.
+#[test]
+fn test_width_decimal_scientific_notation_trailing_zeros_start() {
+    new_ucmd!()
+        .args(&["-w", ".1000", "1e-2", ".11"])
+        .succeeds()
+        .stdout_is("0.1000\n0.1100\n")
+        .no_stderr();
+}
+
+/// Test that trailing zeros in the increment argument contribute to precision.
+#[test]
+fn test_width_decimal_scientific_notation_trailing_zeros_increment() {
+    new_ucmd!()
+        .args(&["-w", "1e-1", "0.0100", ".11"])
+        .succeeds()
+        .stdout_is("0.1000\n0.1100\n")
+        .no_stderr();
+}
+
+/// Test that trailing zeros in the end argument do not contribute to width.
+#[test]
+fn test_width_decimal_scientific_notation_trailing_zeros_end() {
+    new_ucmd!()
+        .args(&["-w", "1e-1", "1e-2", ".1100"])
+        .succeeds()
+        .stdout_is("0.10\n0.11\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_width_floats() {
+    new_ucmd!()
+        .args(&["-w", "9.0", "10.0"])
+        .succeeds()
+        .stdout_is("09.0\n10.0\n")
+        .no_stderr();
+}
+
+// TODO This is duplicated from `test_yes.rs`; refactor them.
+/// Run `seq`, capture some of the output, close the pipe, and verify it.
+fn run(args: &[&str], expected: &[u8]) {
+    let mut cmd = new_ucmd!();
+    let mut child = cmd.args(args).run_no_wait();
+    let mut stdout = child.stdout.take().unwrap();
+    let mut buf = vec![0; expected.len()];
+    stdout.read_exact(&mut buf).unwrap();
+    drop(stdout);
+    assert!(child.wait().unwrap().success());
+    assert_eq!(buf.as_slice(), expected);
+}
+
+#[test]
+fn test_neg_inf() {
+    run(&["--", "-inf", "0"], b"-inf\n-inf\n-inf\n");
+}
+
+#[test]
+fn test_inf() {
+    run(&["inf"], b"1\n2\n3\n");
+}
+
+#[test]
+fn test_ignore_leading_whitespace() {
+    new_ucmd!()
+        .arg("   1")
+        .succeeds()
+        .stdout_is("1\n")
+        .no_stderr();
+}
+
+#[test]
+fn test_trailing_whitespace_error() {
+    // In some locales, the GNU error message has curly quotes (‘)
+    // instead of straight quotes ('). We just test the straight single
+    // quotes.
+    new_ucmd!()
+        .arg("1 ")
+        .fails()
+        .no_stdout()
+        .stderr_contains("seq: invalid floating point argument: '1 '")
+        // FIXME The second line of the error message is "Try 'seq
+        // --help' for more information."
+        .stderr_contains("for more information.");
+}
diff --git a/tests/by-util/test_sort.rs b/tests/by-util/test_sort.rs
index 4a1cc3fa9..2aa26ad24 100644
--- a/tests/by-util/test_sort.rs
+++ b/tests/by-util/test_sort.rs
@@ -181,7 +181,7 @@ fn test_check_zero_terminated_failure() {
         .arg("-c")
         .arg("zero-terminated.txt")
         .fails()
-        .stdout_is("sort: zero-terminated.txt:2: disorder: ../../fixtures/du\n");
+        .stderr_only("sort: zero-terminated.txt:2: disorder: ../../fixtures/du\n");
 }
 
 #[test]
@@ -220,32 +220,29 @@ fn test_random_shuffle_contains_all_lines() {
 
 #[test]
 fn test_random_shuffle_two_runs_not_the_same() {
-    // check to verify that two random shuffles are not equal; this has the
-    // potential to fail in the very unlikely event that the random order is the same
-    // as the starting order, or if both random sorts end up having the same order.
-    const FILE: &str = "default_unsorted_ints.expected";
-    let (at, _ucmd) = at_and_ucmd!();
-    let result = new_ucmd!().arg("-R").arg(FILE).run().stdout_move_str();
-    let expected = at.read(FILE);
-    let unexpected = new_ucmd!().arg("-R").arg(FILE).run().stdout_move_str();
+    for arg in &["-R", "-k1,1R"] {
+        // check to verify that two random shuffles are not equal; this has the
+        // potential to fail in the very unlikely event that the random order is the same
+        // as the starting order, or if both random sorts end up having the same order.
+        const FILE: &str = "default_unsorted_ints.expected";
+        let (at, _ucmd) = at_and_ucmd!();
+        let result = new_ucmd!().arg(arg).arg(FILE).run().stdout_move_str();
+        let expected = at.read(FILE);
+        let unexpected = new_ucmd!().arg(arg).arg(FILE).run().stdout_move_str();
 
-    assert_ne!(result, expected);
-    assert_ne!(result, unexpected);
+        assert_ne!(result, expected);
+        assert_ne!(result, unexpected);
+    }
 }
 
 #[test]
-fn test_random_shuffle_contains_two_runs_not_the_same() {
-    // check to verify that two random shuffles are not equal; this has the
-    // potential to fail in the unlikely event that random order is the same
-    // as the starting order, or if both random sorts end up having the same order.
-    const FILE: &str = "default_unsorted_ints.expected";
-    let (at, _ucmd) = at_and_ucmd!();
-    let result = new_ucmd!().arg("-R").arg(FILE).run().stdout_move_str();
-    let expected = at.read(FILE);
-    let unexpected = new_ucmd!().arg("-R").arg(FILE).run().stdout_move_str();
-
-    assert_ne!(result, expected);
-    assert_ne!(result, unexpected);
+fn test_random_ignore_case() {
+    let input = "ABC\nABc\nAbC\nAbc\naBC\naBc\nabC\nabc\n";
+    new_ucmd!()
+        .args(&["-fR"])
+        .pipe_in(input)
+        .succeeds()
+        .stdout_is(input);
 }
 
 #[test]
@@ -534,7 +531,7 @@ fn test_keys_invalid_field() {
     new_ucmd!()
         .args(&["-k", "1."])
         .fails()
-        .stderr_only("sort: failed to parse key `1.`: failed to parse character index ``: cannot parse integer from empty string");
+        .stderr_only("sort: failed to parse key '1.': failed to parse character index '': cannot parse integer from empty string");
 }
 
 #[test]
@@ -542,7 +539,7 @@ fn test_keys_invalid_field_option() {
     new_ucmd!()
         .args(&["-k", "1.1x"])
         .fails()
-        .stderr_only("sort: failed to parse key `1.1x`: invalid option: `x`");
+        .stderr_only("sort: failed to parse key '1.1x': invalid option: 'x'");
 }
 
 #[test]
@@ -550,7 +547,7 @@ fn test_keys_invalid_field_zero() {
     new_ucmd!()
         .args(&["-k", "0.1"])
         .fails()
-        .stderr_only("sort: failed to parse key `0.1`: field index can not be 0");
+        .stderr_only("sort: failed to parse key '0.1': field index can not be 0");
 }
 
 #[test]
@@ -558,7 +555,7 @@ fn test_keys_invalid_char_zero() {
     new_ucmd!()
         .args(&["-k", "1.0"])
         .fails()
-        .stderr_only("sort: failed to parse key `1.0`: invalid character index 0 for the start position of a field");
+        .stderr_only("sort: failed to parse key '1.0': invalid character index 0 for the start position of a field");
 }
 
 #[test]
@@ -774,14 +771,15 @@ fn test_check() {
         new_ucmd!()
             .arg(diagnose_arg)
             .arg("check_fail.txt")
+            .arg("--buffer-size=10b")
             .fails()
-            .stdout_is("sort: check_fail.txt:6: disorder: 5\n");
+            .stderr_only("sort: check_fail.txt:6: disorder: 5\n");
 
         new_ucmd!()
             .arg(diagnose_arg)
             .arg("multiple_files.expected")
             .succeeds()
-            .stdout_is("");
+            .stderr_is("");
     }
 }
 
@@ -796,6 +794,18 @@ fn test_check_silent() {
     }
 }
 
+#[test]
+fn test_check_unique() {
+    // Due to a clap bug the combination "-cu" does not work. "-c -u" works.
+    // See https://github.com/clap-rs/clap/issues/2624
+    new_ucmd!()
+        .args(&["-c", "-u"])
+        .pipe_in("A\nA\n")
+        .fails()
+        .code_is(1)
+        .stderr_only("sort: -:2: disorder: A");
+}
+
 #[test]
 fn test_dictionary_and_nonprinting_conflicts() {
     let conflicting_args = ["n", "h", "g", "M"];
@@ -839,9 +849,9 @@ fn test_nonexistent_file() {
         .status_code(2)
         .stderr_only(
             #[cfg(not(windows))]
-            "sort: cannot read: \"nonexistent.txt\": No such file or directory (os error 2)",
+            "sort: cannot read: nonexistent.txt: No such file or directory",
             #[cfg(windows)]
-            "sort: cannot read: \"nonexistent.txt\": The system cannot find the file specified. (os error 2)",
+            "sort: cannot read: nonexistent.txt: The system cannot find the file specified.",
         );
 }
 
@@ -883,6 +893,29 @@ fn test_compress() {
         .stdout_only_fixture("ext_sort.expected");
 }
 
+#[test]
+#[cfg(target_os = "linux")]
+fn test_compress_merge() {
+    new_ucmd!()
+        .args(&[
+            "--compress-program",
+            "gzip",
+            "-S",
+            "10",
+            "--batch-size=2",
+            "-m",
+            "--unique",
+            "merge_ints_interleaved_1.txt",
+            "merge_ints_interleaved_2.txt",
+            "merge_ints_interleaved_3.txt",
+            "merge_ints_interleaved_3.txt",
+            "merge_ints_interleaved_2.txt",
+            "merge_ints_interleaved_1.txt",
+        ])
+        .succeeds()
+        .stdout_only_fixture("merge_ints_interleaved.expected");
+}
+
 #[test]
 fn test_compress_fail() {
     TestScenario::new(util_name!())
@@ -959,3 +992,129 @@ fn test_key_takes_one_arg() {
         .succeeds()
         .stdout_is_fixture("keys_open_ended.expected");
 }
+
+#[test]
+fn test_verifies_out_file() {
+    let inputs = ["" /* no input */, "some input"];
+    for &input in &inputs {
+        new_ucmd!()
+            .args(&["-o", "nonexistent_dir/nonexistent_file"])
+            .pipe_in(input)
+            .ignore_stdin_write_error()
+            .fails()
+            .status_code(2)
+            .stderr_only(
+                #[cfg(not(windows))]
+                "sort: open failed: nonexistent_dir/nonexistent_file: No such file or directory",
+                #[cfg(windows)]
+                "sort: open failed: nonexistent_dir/nonexistent_file: The system cannot find the path specified.",
+            );
+    }
+}
+
+#[test]
+fn test_verifies_files_after_keys() {
+    new_ucmd!()
+        .args(&[
+            "-o",
+            "nonexistent_dir/nonexistent_file",
+            "-k",
+            "0",
+            "nonexistent_dir/input_file",
+        ])
+        .fails()
+        .status_code(2)
+        .stderr_contains("failed to parse key");
+}
+
+#[test]
+#[cfg(unix)]
+fn test_verifies_input_files() {
+    new_ucmd!()
+        .args(&["/dev/random", "nonexistent_file"])
+        .fails()
+        .status_code(2)
+        .stderr_is("sort: cannot read: nonexistent_file: No such file or directory");
+}
+
+#[test]
+fn test_separator_null() {
+    new_ucmd!()
+        .args(&["-k1,1", "-k3,3", "-t", "\\0"])
+        .pipe_in("z\0a\0b\nz\0b\0a\na\0z\0z\n")
+        .succeeds()
+        .stdout_only("a\0z\0z\nz\0b\0a\nz\0a\0b\n");
+}
+
+#[test]
+fn test_output_is_input() {
+    let input = "a\nb\nc\n";
+    let (at, mut cmd) = at_and_ucmd!();
+    at.touch("file");
+    at.append("file", input);
+    cmd.args(&["-m", "-u", "-o", "file", "file", "file", "file"])
+        .succeeds();
+    assert_eq!(at.read("file"), input);
+}
+
+#[test]
+#[cfg(unix)]
+fn test_output_device() {
+    new_ucmd!()
+        .args(&["-o", "/dev/null"])
+        .pipe_in("input")
+        .succeeds();
+}
+
+#[test]
+fn test_merge_empty_input() {
+    new_ucmd!()
+        .args(&["-m", "empty.txt"])
+        .succeeds()
+        .no_stderr()
+        .no_stdout();
+}
+
+#[test]
+fn test_no_error_for_version() {
+    new_ucmd!()
+        .arg("--version")
+        .succeeds()
+        .stdout_contains("sort");
+}
+
+#[test]
+fn test_wrong_args_exit_code() {
+    new_ucmd!()
+        .arg("--misspelled")
+        .fails()
+        .status_code(2)
+        .stderr_contains("--misspelled");
+}
+
+#[test]
+#[cfg(unix)]
+fn test_tmp_files_deleted_on_sigint() {
+    use std::{fs::read_dir, time::Duration};
+
+    use nix::{sys::signal, unistd::Pid};
+
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.mkdir("tmp_dir");
+    ucmd.args(&[
+        "ext_sort.txt",
+        "--buffer-size=1", // with a small buffer size `sort` will be forced to create a temporary directory very soon.
+        "--temporary-directory=tmp_dir",
+    ]);
+    let mut child = ucmd.run_no_wait();
+    // wait a short amount of time so that `sort` can create a temporary directory.
+    std::thread::sleep(Duration::from_millis(100));
+    // `sort` should have created a temporary directory.
+    assert!(read_dir(at.plus("tmp_dir")).unwrap().next().is_some());
+    // kill sort with SIGINT
+    signal::kill(Pid::from_raw(child.id() as i32), signal::SIGINT).unwrap();
+    // wait for `sort` to exit
+    assert_eq!(child.wait().unwrap().code(), Some(2));
+    // `sort` should have deleted the temporary directory again.
+    assert!(read_dir(at.plus("tmp_dir")).unwrap().next().is_none());
+}
diff --git a/tests/by-util/test_stat.rs b/tests/by-util/test_stat.rs
index 7cff0d89c..9bbb1c1ca 100644
--- a/tests/by-util/test_stat.rs
+++ b/tests/by-util/test_stat.rs
@@ -64,7 +64,7 @@ mod test_generate_tokens {
 
     #[test]
     fn printf_format() {
-        let s = "%-# 15a\\r\\\"\\\\\\a\\b\\e\\f\\v%+020.-23w\\x12\\167\\132\\112\\n";
+        let s = "%-# 15a\\t\\r\\\"\\\\\\a\\b\\e\\f\\v%+020.-23w\\x12\\167\\132\\112\\n";
         let expected = vec![
             Token::Directive {
                 flag: F_LEFT | F_ALTER | F_SPACE,
@@ -72,6 +72,7 @@ mod test_generate_tokens {
                 precision: -1,
                 format: 'a',
             },
+            Token::Char('\t'),
             Token::Char('\r'),
             Token::Char('"'),
             Token::Char('\\'),
@@ -101,7 +102,7 @@ fn test_invalid_option() {
     new_ucmd!().arg("-w").arg("-q").arg("/").fails();
 }
 
-#[cfg(any(target_os = "linux", target_vendor = "apple"))]
+#[cfg(unix)]
 const NORMAL_FORMAT_STR: &str =
     "%a %A %b %B %d %D %f %F %g %G %h %i %m %n %o %s %u %U %x %X %y %Y %z %Z"; // avoid "%w %W" (birth/creation) due to `stat` limitations and linux kernel & rust version capability variations
 #[cfg(any(target_os = "linux"))]
diff --git a/tests/by-util/test_stdbuf.rs b/tests/by-util/test_stdbuf.rs
index 66892ea0f..c05b65d70 100644
--- a/tests/by-util/test_stdbuf.rs
+++ b/tests/by-util/test_stdbuf.rs
@@ -25,15 +25,19 @@ fn test_stdbuf_line_buffered_stdout() {
 #[cfg(not(target_os = "windows"))]
 #[test]
 fn test_stdbuf_no_buffer_option_fails() {
-    new_ucmd!().args(&["head"]).fails().stderr_is(
+    let ts = TestScenario::new(util_name!());
+
+    ts.ucmd().args(&["head"]).fails().stderr_is(&format!(
         "error: The following required arguments were not provided:\n    \
          --error <MODE>\n    \
          --input <MODE>\n    \
          --output <MODE>\n\n\
          USAGE:\n    \
-         stdbuf OPTION... COMMAND\n\n\
+         {1} {0} OPTION... COMMAND\n\n\
          For more information try --help",
-    );
+        ts.util_name,
+        ts.bin_path.to_string_lossy()
+    ));
 }
 
 #[cfg(not(target_os = "windows"))]
@@ -49,9 +53,16 @@ fn test_stdbuf_trailing_var_arg() {
 #[cfg(not(target_os = "windows"))]
 #[test]
 fn test_stdbuf_line_buffering_stdin_fails() {
-    new_ucmd!().args(&["-i", "L", "head"]).fails().stderr_is(
-        "stdbuf: line buffering stdin is meaningless\nTry 'stdbuf --help' for more information.",
-    );
+    let ts = TestScenario::new(util_name!());
+
+    ts.ucmd()
+        .args(&["-i", "L", "head"])
+        .fails()
+        .stderr_is(&format!(
+            "{0}: line buffering stdin is meaningless\nTry '{1} {0} --help' for more information.",
+            ts.util_name,
+            ts.bin_path.to_string_lossy()
+        ));
 }
 
 #[cfg(not(target_os = "windows"))]
diff --git a/tests/by-util/test_sum.rs b/tests/by-util/test_sum.rs
index f09ba9d00..0248c05cf 100644
--- a/tests/by-util/test_sum.rs
+++ b/tests/by-util/test_sum.rs
@@ -59,7 +59,7 @@ fn test_invalid_file() {
 
     at.mkdir("a");
 
-    ucmd.arg("a").fails().stderr_is("sum: 'a' Is a directory");
+    ucmd.arg("a").fails().stderr_is("sum: a: Is a directory");
 }
 
 #[test]
@@ -68,5 +68,5 @@ fn test_invalid_metadata() {
 
     ucmd.arg("b")
         .fails()
-        .stderr_is("sum: 'b' No such file or directory");
+        .stderr_is("sum: b: No such file or directory");
 }
diff --git a/tests/by-util/test_tac.rs b/tests/by-util/test_tac.rs
index a8adbb28e..323aa5149 100644
--- a/tests/by-util/test_tac.rs
+++ b/tests/by-util/test_tac.rs
@@ -1,3 +1,4 @@
+// spell-checker:ignore axxbxx bxxaxx axxx axxxx xxaxx xxax xxxxa axyz zyax zyxa
 use crate::common::util::*;
 
 #[test]
@@ -23,7 +24,7 @@ fn test_stdin_non_newline_separator_before() {
         .args(&["-b", "-s", ":"])
         .pipe_in("100:200:300:400:500")
         .run()
-        .stdout_is("500:400:300:200:100");
+        .stdout_is(":500:400:300:200100");
 }
 
 #[test]
@@ -66,5 +67,205 @@ fn test_invalid_input() {
         .ucmd()
         .arg("a")
         .fails()
-        .stderr_contains("dir: read error: Invalid argument");
+        .stderr_contains("a: read error: Invalid argument");
+}
+
+#[test]
+fn test_no_line_separators() {
+    new_ucmd!().pipe_in("a").succeeds().stdout_is("a");
+}
+
+#[test]
+fn test_before_trailing_separator_no_leading_separator() {
+    new_ucmd!()
+        .arg("-b")
+        .pipe_in("a\nb\n")
+        .succeeds()
+        .stdout_is("\n\nba");
+}
+
+#[test]
+fn test_before_trailing_separator_and_leading_separator() {
+    new_ucmd!()
+        .arg("-b")
+        .pipe_in("\na\nb\n")
+        .succeeds()
+        .stdout_is("\n\nb\na");
+}
+
+#[test]
+fn test_before_leading_separator_no_trailing_separator() {
+    new_ucmd!()
+        .arg("-b")
+        .pipe_in("\na\nb")
+        .succeeds()
+        .stdout_is("\nb\na");
+}
+
+#[test]
+fn test_before_no_separator() {
+    new_ucmd!()
+        .arg("-b")
+        .pipe_in("ab")
+        .succeeds()
+        .stdout_is("ab");
+}
+
+#[test]
+fn test_before_empty_file() {
+    new_ucmd!().arg("-b").pipe_in("").succeeds().stdout_is("");
+}
+
+#[test]
+fn test_multi_char_separator() {
+    new_ucmd!()
+        .args(&["-s", "xx"])
+        .pipe_in("axxbxx")
+        .succeeds()
+        .stdout_is("bxxaxx");
+}
+
+#[test]
+fn test_multi_char_separator_overlap() {
+    // The right-most pair of "x" characters in the input is treated as
+    // the only line separator. That is, "axxx" is interpreted as having
+    // one line comprising the string "ax" followed by the line
+    // separator "xx".
+    new_ucmd!()
+        .args(&["-s", "xx"])
+        .pipe_in("axxx")
+        .succeeds()
+        .stdout_is("axxx");
+
+    // Each non-overlapping pair of "x" characters in the input is
+    // treated as a line separator. That is, "axxxx" is interpreted as
+    // having two lines:
+    //
+    // * the second line is the empty string "" followed by the line
+    //   separator "xx",
+    // * the first line is the string "a" followed by the line separator
+    //   "xx".
+    //
+    // The lines are printed in reverse, resulting in "xx" followed by
+    // "axx".
+    new_ucmd!()
+        .args(&["-s", "xx"])
+        .pipe_in("axxxx")
+        .succeeds()
+        .stdout_is("xxaxx");
+}
+
+#[test]
+fn test_multi_char_separator_overlap_before() {
+    // With the "-b" option, the line separator is assumed to be at the
+    // beginning of the line. In this case, That is, "axxx" is
+    // interpreted as having two lines:
+    //
+    // * the second line is the empty string "" preceded by the line
+    //   separator "xx",
+    // * the first line is the string "ax" preceded by no line
+    //   separator, since there are no more characters preceding it.
+    //
+    // The lines are printed in reverse, resulting in "xx" followed by
+    // "ax".
+    new_ucmd!()
+        .args(&["-b", "-s", "xx"])
+        .pipe_in("axxx")
+        .succeeds()
+        .stdout_is("xxax");
+
+    // With the "-b" option, the line separator is assumed to be at the
+    // beginning of the line. Each non-overlapping pair of "x"
+    // characters in the input is treated as a line separator. That is,
+    // "axxxx" is interpreted as having three lines:
+    //
+    // * the third line is the empty string "" preceded by the line
+    //   separator "xx" (the last two "x" characters in the input
+    //   string),
+    // * the second line is the empty string "" preceded by the line
+    //   separator "xx" (the first two "x" characters in the input
+    //   string),
+    // * the first line is the string "a" preceded by no line separator,
+    //   since there are no more characters preceding it.
+    //
+    // The lines are printed in reverse, resulting in "xx" followed by
+    // "xx" followed by "a".
+    new_ucmd!()
+        .args(&["-b", "-s", "xx"])
+        .pipe_in("axxxx")
+        .succeeds()
+        .stdout_is("xxxxa");
+}
+
+#[test]
+fn test_null_separator() {
+    new_ucmd!()
+        .args(&["-s", ""])
+        .pipe_in("a\0b\0")
+        .succeeds()
+        .stdout_is("b\0a\0");
+}
+
+#[test]
+fn test_regex() {
+    new_ucmd!()
+        .args(&["-r", "-s", "[xyz]+"])
+        .pipe_in("axyz")
+        .succeeds()
+        .no_stderr()
+        .stdout_is("zyax");
+
+    new_ucmd!()
+        .args(&["-r", "-s", ":+"])
+        .pipe_in("a:b::c:::d::::")
+        .succeeds()
+        .no_stderr()
+        .stdout_is(":::d:::c::b:a:");
+
+    new_ucmd!()
+        .args(&["-r", "-s", r"[\+]+[-]+[\+]+"])
+        //   line  0     1        2
+        //        |--||-----||--------|
+        .pipe_in("a+-+b++--++c+d-e+---+")
+        .succeeds()
+        .no_stderr()
+        //   line       2        1    0
+        //          |--------||-----||--|
+        .stdout_is("c+d-e+---+b++--++a+-+");
+}
+
+#[test]
+fn test_regex_before() {
+    new_ucmd!()
+        .args(&["-b", "-r", "-s", "[xyz]+"])
+        .pipe_in("axyz")
+        .succeeds()
+        .no_stderr()
+        .stdout_is("zyxa");
+
+    new_ucmd!()
+        .args(&["-b", "-r", "-s", ":+"])
+        .pipe_in(":a::b:::c::::d")
+        .succeeds()
+        .stdout_is(":d::::c:::b::a");
+
+    // Because `tac` searches for matches of the regular expression from
+    // right to left, the second to last line is
+    //
+    //     +--++b
+    //
+    // not
+    //
+    //     ++--++b
+    //
+    new_ucmd!()
+        .args(&["-b", "-r", "-s", r"[\+]+[-]+[\+]+"])
+        //   line   0     1       2
+        //        |---||----||--------|
+        .pipe_in("+-+a++--++b+---+c+d-e")
+        .succeeds()
+        .no_stderr()
+        //   line       2        1    0
+        //          |--------||----||---|
+        .stdout_is("+---+c+d-e+--++b+-+a+");
 }
diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs
index e8dd63317..26d8106f0 100644
--- a/tests/by-util/test_tail.rs
+++ b/tests/by-util/test_tail.rs
@@ -23,6 +23,15 @@ fn test_stdin_default() {
         .stdout_is_fixture("foobar_stdin_default.expected");
 }
 
+#[test]
+fn test_stdin_explicit() {
+    new_ucmd!()
+        .pipe_in_fixture(FOOBAR_TXT)
+        .arg("-")
+        .run()
+        .stdout_is_fixture("foobar_stdin_default.expected");
+}
+
 #[test]
 fn test_single_default() {
     new_ucmd!()
@@ -416,3 +425,23 @@ fn test_tail_num_with_undocumented_sign_bytes() {
         .succeeds()
         .stdout_is("efghijklmnopqrstuvwxyz");
 }
+
+#[test]
+#[cfg(unix)]
+fn test_tail_bytes_for_funny_files() {
+    // gnu/tests/tail-2/tail-c.sh
+    let ts = TestScenario::new(util_name!());
+    let at = &ts.fixtures;
+    for &file in &["/proc/version", "/sys/kernel/profiling"] {
+        if !at.file_exists(file) {
+            continue;
+        }
+        let args = ["--bytes", "1", file];
+        let result = ts.ucmd().args(&args).run();
+        let exp_result = unwrap_or_return!(expected_result(&ts, &args));
+        result
+            .stdout_is(exp_result.stdout_str())
+            .stderr_is(exp_result.stderr_str())
+            .code_is(exp_result.code());
+    }
+}
diff --git a/tests/by-util/test_test.rs b/tests/by-util/test_test.rs
index 79c24651a..db74265a4 100644
--- a/tests/by-util/test_test.rs
+++ b/tests/by-util/test_test.rs
@@ -35,6 +35,35 @@ fn test_solo_and_or_or_is_a_literal() {
     new_ucmd!().arg("-o").succeeds();
 }
 
+#[test]
+fn test_some_literals() {
+    let scenario = TestScenario::new(util_name!());
+    let tests = [
+        "a string",
+        "(",
+        ")",
+        "-",
+        "--",
+        "-0",
+        "-f",
+        "--help",
+        "--version",
+        "-eq",
+        "-lt",
+        "-ef",
+        "[",
+    ];
+
+    for test in &tests {
+        scenario.ucmd().arg(test).succeeds();
+    }
+
+    // run the inverse of all these tests
+    for test in &tests {
+        scenario.ucmd().arg("!").arg(test).run().status_code(1);
+    }
+}
+
 #[test]
 fn test_double_not_is_false() {
     new_ucmd!().args(&["!", "!"]).run().status_code(1);
@@ -99,21 +128,6 @@ fn test_zero_len_of_empty() {
     new_ucmd!().args(&["-z", ""]).succeeds();
 }
 
-#[test]
-fn test_solo_parenthesis_is_literal() {
-    let scenario = TestScenario::new(util_name!());
-    let tests = [["("], [")"]];
-
-    for test in &tests {
-        scenario.ucmd().args(&test[..]).succeeds();
-    }
-}
-
-#[test]
-fn test_solo_empty_parenthetical_is_error() {
-    new_ucmd!().args(&["(", ")"]).run().status_code(2);
-}
-
 #[test]
 fn test_zero_len_equals_zero_len() {
     new_ucmd!().args(&["", "=", ""]).succeeds();
@@ -139,6 +153,7 @@ fn test_string_comparison() {
         ["contained\nnewline", "=", "contained\nnewline"],
         ["(", "=", "("],
         ["(", "!=", ")"],
+        ["(", "!=", "="],
         ["!", "=", "!"],
         ["=", "=", "="],
     ];
@@ -199,11 +214,13 @@ fn test_a_bunch_of_not() {
 
 #[test]
 fn test_pseudofloat_equal() {
+    // string comparison; test(1) doesn't support comparison of actual floats
     new_ucmd!().args(&["123.45", "=", "123.45"]).succeeds();
 }
 
 #[test]
 fn test_pseudofloat_not_equal() {
+    // string comparison; test(1) doesn't support comparison of actual floats
     new_ucmd!().args(&["123.45", "!=", "123.450"]).succeeds();
 }
 
@@ -230,6 +247,16 @@ fn test_some_int_compares() {
     for test in &tests {
         scenario.ucmd().args(&test[..]).succeeds();
     }
+
+    // run the inverse of all these tests
+    for test in &tests {
+        scenario
+            .ucmd()
+            .arg("!")
+            .args(&test[..])
+            .run()
+            .status_code(1);
+    }
 }
 
 #[test]
@@ -257,6 +284,16 @@ fn test_negative_int_compare() {
     for test in &tests {
         scenario.ucmd().args(&test[..]).succeeds();
     }
+
+    // run the inverse of all these tests
+    for test in &tests {
+        scenario
+            .ucmd()
+            .arg("!")
+            .args(&test[..])
+            .run()
+            .status_code(1);
+    }
 }
 
 #[test]
@@ -283,7 +320,7 @@ fn test_invalid_utf8_integer_compare() {
 
     cmd.run()
         .status_code(2)
-        .stderr_is("test: invalid integer 'fo�o'");
+        .stderr_is("test: invalid integer $'fo\\x80o'");
 
     let mut cmd = new_ucmd!();
     cmd.raw.arg(arg);
@@ -291,7 +328,7 @@ fn test_invalid_utf8_integer_compare() {
 
     cmd.run()
         .status_code(2)
-        .stderr_is("test: invalid integer 'fo�o'");
+        .stderr_is("test: invalid integer $'fo\\x80o'");
 }
 
 #[test]
@@ -477,7 +514,9 @@ fn test_nonexistent_file_is_not_symlink() {
 }
 
 #[test]
-#[cfg(not(windows))] // Windows has no concept of sticky bit
+// FixME: freebsd fails with 'chmod: sticky_file: Inappropriate file type or format'
+// Windows has no concept of sticky bit
+#[cfg(not(any(windows, target_os = "freebsd")))]
 fn test_file_is_sticky() {
     let scenario = TestScenario::new(util_name!());
     let mut ucmd = scenario.ucmd();
@@ -497,6 +536,93 @@ fn test_file_is_not_sticky() {
         .status_code(1);
 }
 
+#[test]
+fn test_solo_empty_parenthetical_is_error() {
+    new_ucmd!().args(&["(", ")"]).run().status_code(2);
+}
+
+#[test]
+fn test_parenthesized_literal() {
+    let scenario = TestScenario::new(util_name!());
+    let tests = [
+        "a string",
+        "(",
+        ")",
+        "-",
+        "--",
+        "-0",
+        "-f",
+        "--help",
+        "--version",
+        "-e",
+        "-t",
+        "!",
+        "-n",
+        "-z",
+        "[",
+        "-a",
+        "-o",
+    ];
+
+    for test in &tests {
+        scenario.ucmd().arg("(").arg(test).arg(")").succeeds();
+    }
+
+    // run the inverse of all these tests
+    for test in &tests {
+        scenario
+            .ucmd()
+            .arg("!")
+            .arg("(")
+            .arg(test)
+            .arg(")")
+            .run()
+            .status_code(1);
+    }
+}
+
+#[test]
+fn test_parenthesized_op_compares_literal_parenthesis() {
+    // ensure we aren’t treating this case as “string length of literal equal
+    // sign”
+    new_ucmd!().args(&["(", "=", ")"]).run().status_code(1);
+}
+
+#[test]
+fn test_parenthesized_string_comparison() {
+    let scenario = TestScenario::new(util_name!());
+    let tests = [
+        ["(", "foo", "!=", "bar", ")"],
+        ["(", "contained\nnewline", "=", "contained\nnewline", ")"],
+        ["(", "(", "=", "(", ")"],
+        ["(", "(", "!=", ")", ")"],
+        ["(", "!", "=", "!", ")"],
+        ["(", "=", "=", "=", ")"],
+    ];
+
+    for test in &tests {
+        scenario.ucmd().args(&test[..]).succeeds();
+    }
+
+    // run the inverse of all these tests
+    for test in &tests {
+        scenario
+            .ucmd()
+            .arg("!")
+            .args(&test[..])
+            .run()
+            .status_code(1);
+    }
+}
+
+#[test]
+fn test_parenthesized_right_parenthesis_as_literal() {
+    new_ucmd!()
+        .args(&["(", "-f", ")", ")"])
+        .run()
+        .status_code(1);
+}
+
 #[test]
 #[cfg(not(windows))]
 fn test_file_owned_by_euid() {
diff --git a/tests/by-util/test_touch.rs b/tests/by-util/test_touch.rs
index 3ed7f3bb2..983d14fe2 100644
--- a/tests/by-util/test_touch.rs
+++ b/tests/by-util/test_touch.rs
@@ -6,6 +6,7 @@ use self::touch::filetime::{self, FileTime};
 extern crate time;
 
 use crate::common::util::*;
+use std::fs::remove_file;
 use std::path::PathBuf;
 
 fn get_file_times(at: &AtPath, path: &str) -> (FileTime, FileTime) {
@@ -16,6 +17,7 @@ fn get_file_times(at: &AtPath, path: &str) -> (FileTime, FileTime) {
     )
 }
 
+#[cfg(not(target_os = "freebsd"))]
 fn get_symlink_times(at: &AtPath, path: &str) -> (FileTime, FileTime) {
     let m = at.symlink_metadata(path);
     (
@@ -290,6 +292,8 @@ fn test_touch_set_both() {
 }
 
 #[test]
+// FixME: Fails on freebsd because of a different nanos
+#[cfg(not(target_os = "freebsd"))]
 fn test_touch_no_dereference() {
     let (at, mut ucmd) = at_and_ucmd!();
     let file_a = "test_touch_no_dereference_a";
@@ -320,7 +324,8 @@ fn test_touch_no_dereference() {
 
 #[test]
 fn test_touch_reference() {
-    let (at, mut ucmd) = at_and_ucmd!();
+    let scenario = TestScenario::new("touch");
+    let (at, mut _ucmd) = (scenario.fixtures.clone(), scenario.ucmd());
     let file_a = "test_touch_reference_a";
     let file_b = "test_touch_reference_b";
     let start_of_year = str_to_filetime("%Y%m%d%H%M", "201501010000");
@@ -328,15 +333,21 @@ fn test_touch_reference() {
     at.touch(file_a);
     set_file_times(&at, file_a, start_of_year, start_of_year);
     assert!(at.file_exists(file_a));
+    for &opt in &["-r", "--ref", "--reference"] {
+        scenario
+            .ccmd("touch")
+            .args(&[opt, file_a, file_b])
+            .succeeds()
+            .no_stderr();
 
-    ucmd.args(&["-r", file_a, file_b]).succeeds().no_stderr();
+        assert!(at.file_exists(file_b));
 
-    assert!(at.file_exists(file_b));
-
-    let (atime, mtime) = get_file_times(&at, file_b);
-    assert_eq!(atime, mtime);
-    assert_eq!(atime, start_of_year);
-    assert_eq!(mtime, start_of_year);
+        let (atime, mtime) = get_file_times(&at, file_b);
+        assert_eq!(atime, mtime);
+        assert_eq!(atime, start_of_year);
+        assert_eq!(mtime, start_of_year);
+        let _ = remove_file(file_b);
+    }
 }
 
 #[test]
diff --git a/tests/by-util/test_tr.rs b/tests/by-util/test_tr.rs
index 8a3e36625..bd022b1c2 100644
--- a/tests/by-util/test_tr.rs
+++ b/tests/by-util/test_tr.rs
@@ -286,6 +286,8 @@ fn test_interpret_backslash_at_eol_literally() {
 }
 
 #[test]
+// FixME: panicked at 'failed to write to stdin of child: Broken pipe (os error 32)
+#[cfg(not(target_os = "freebsd"))]
 fn test_more_than_2_sets() {
     new_ucmd!()
         .args(&["'abcdefgh'", "'a", "'b'"])
diff --git a/tests/by-util/test_tty.rs b/tests/by-util/test_tty.rs
index 6ba8cd029..ed490e7ab 100644
--- a/tests/by-util/test_tty.rs
+++ b/tests/by-util/test_tty.rs
@@ -65,10 +65,24 @@ fn test_wrong_argument() {
 }
 
 #[test]
-#[cfg(not(windows))]
+// FixME: freebsd panic
+#[cfg(all(unix, not(target_os = "freebsd")))]
 fn test_stdout_fail() {
-    let mut child = new_ucmd!().run_no_wait();
-    drop(child.stdout.take());
-    let status = child.wait().unwrap();
+    use std::process::{Command, Stdio};
+    let ts = TestScenario::new(util_name!());
+    // Sleep inside a shell to ensure the process doesn't finish before we've
+    // closed its stdout
+    let mut proc = Command::new("sh")
+        .arg("-c")
+        .arg(format!(
+            "sleep 0.2; exec {} {}",
+            ts.bin_path.to_str().unwrap(),
+            ts.util_name
+        ))
+        .stdout(Stdio::piped())
+        .spawn()
+        .unwrap();
+    drop(proc.stdout.take());
+    let status = proc.wait().unwrap();
     assert_eq!(status.code(), Some(3));
 }
diff --git a/tests/by-util/test_uniq.rs b/tests/by-util/test_uniq.rs
index c191ffcaf..cd013891b 100644
--- a/tests/by-util/test_uniq.rs
+++ b/tests/by-util/test_uniq.rs
@@ -145,7 +145,9 @@ fn test_invalid_utf8() {
         .arg("not-utf8-sequence.txt")
         .run()
         .failure()
-        .stderr_only("uniq: invalid utf-8 sequence of 1 bytes from index 0");
+        .stderr_only(
+            "uniq: failed to convert line to utf8: invalid utf-8 sequence of 1 bytes from index 0",
+        );
 }
 
 #[test]
diff --git a/tests/by-util/test_unlink.rs b/tests/by-util/test_unlink.rs
index 1999e965c..6b4fc41da 100644
--- a/tests/by-util/test_unlink.rs
+++ b/tests/by-util/test_unlink.rs
@@ -14,29 +14,33 @@ fn test_unlink_file() {
 
 #[test]
 fn test_unlink_multiple_files() {
-    let (at, mut ucmd) = at_and_ucmd!();
+    let ts = TestScenario::new(util_name!());
+
+    let (at, mut ucmd) = (ts.fixtures.clone(), ts.ucmd());
     let file_a = "test_unlink_multiple_file_a";
     let file_b = "test_unlink_multiple_file_b";
 
     at.touch(file_a);
     at.touch(file_b);
 
-    ucmd.arg(file_a).arg(file_b).fails().stderr_is(
-        "unlink: extra operand: 'test_unlink_multiple_file_b'\nTry 'unlink --help' \
-         for more information.\n",
-    );
+    ucmd.arg(file_a)
+        .arg(file_b)
+        .fails()
+        .stderr_contains("USAGE");
 }
 
 #[test]
 fn test_unlink_directory() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let dir = "test_unlink_empty_directory";
+    let dir = "dir";
 
     at.mkdir(dir);
 
-    ucmd.arg(dir).fails().stderr_is(
-        "unlink: cannot unlink 'test_unlink_empty_directory': Not a regular file \
-         or symlink\n",
+    let res = ucmd.arg(dir).fails();
+    let stderr = res.stderr_str();
+    assert!(
+        stderr == "unlink: cannot unlink 'dir': Is a directory\n"
+            || stderr == "unlink: cannot unlink 'dir': Permission denied\n"
     );
 }
 
@@ -44,8 +48,21 @@ fn test_unlink_directory() {
 fn test_unlink_nonexistent() {
     let file = "test_unlink_nonexistent";
 
-    new_ucmd!().arg(file).fails().stderr_is(
-        "unlink: Cannot stat 'test_unlink_nonexistent': No such file or directory \
-         (os error 2)\n",
-    );
+    new_ucmd!()
+        .arg(file)
+        .fails()
+        .stderr_is("unlink: cannot unlink 'test_unlink_nonexistent': No such file or directory\n");
+}
+
+#[test]
+fn test_unlink_symlink() {
+    let (at, mut ucmd) = at_and_ucmd!();
+
+    at.touch("foo");
+    at.symlink_file("foo", "bar");
+
+    ucmd.arg("bar").succeeds().no_stderr();
+
+    assert!(at.file_exists("foo"));
+    assert!(!at.file_exists("bar"));
 }
diff --git a/tests/by-util/test_wc.rs b/tests/by-util/test_wc.rs
index 88c65c997..eabaf58eb 100644
--- a/tests/by-util/test_wc.rs
+++ b/tests/by-util/test_wc.rs
@@ -1,6 +1,6 @@
 use crate::common::util::*;
 
-// spell-checker:ignore (flags) lwmcL clmwL ; (path) bogusfile emptyfile manyemptylines moby notrailingnewline onelongemptyline onelongword
+// spell-checker:ignore (flags) lwmcL clmwL ; (path) bogusfile emptyfile manyemptylines moby notrailingnewline onelongemptyline onelongword weirdchars
 
 #[test]
 fn test_count_bytes_large_stdin() {
@@ -53,11 +53,16 @@ fn test_utf8() {
         .args(&["-lwmcL"])
         .pipe_in_fixture("UTF_8_test.txt")
         .run()
-        .stdout_is("    300    4969   22781   22213      79\n");
-    // GNU returns "    300    2086   22219   22781      79"
-    //
-    // TODO: we should fix the word, character, and byte count to
-    // match the behavior of GNU wc
+        .stdout_is("    303    2119   22457   23025      79\n");
+}
+
+#[test]
+fn test_utf8_extra() {
+    new_ucmd!()
+        .arg("-lwmcL")
+        .pipe_in_fixture("UTF_8_weirdchars.txt")
+        .run()
+        .stdout_is("     25      87     442     513      48\n");
 }
 
 #[test]
@@ -200,22 +205,33 @@ fn test_file_bytes_dictate_width() {
 /// Test that getting counts from a directory is an error.
 #[test]
 fn test_read_from_directory_error() {
-    // TODO To match GNU `wc`, the `stdout` should be:
-    //
-    //     "      0       0       0 .\n"
-    //
+    #[cfg(not(windows))]
+    const STDERR: &str = ".: Is a directory";
+    #[cfg(windows)]
+    const STDERR: &str = ".: Access is denied";
+
+    #[cfg(not(windows))]
+    const STDOUT: &str = "      0       0       0 .\n";
+    #[cfg(windows)]
+    const STDOUT: &str = "";
+
     new_ucmd!()
         .args(&["."])
         .fails()
-        .stderr_contains(".: Is a directory\n")
-        .stdout_is("0 0 0 .\n");
+        .stderr_contains(STDERR)
+        .stdout_is(STDOUT);
 }
 
 /// Test that getting counts from nonexistent file is an error.
 #[test]
 fn test_read_from_nonexistent_file() {
+    #[cfg(not(windows))]
+    const MSG: &str = "bogusfile: No such file or directory";
+    #[cfg(windows)]
+    const MSG: &str = "bogusfile: The system cannot find the file specified";
     new_ucmd!()
         .args(&["bogusfile"])
         .fails()
-        .stderr_contains("bogusfile: No such file or directory\n");
+        .stderr_contains(MSG)
+        .stdout_is("");
 }
diff --git a/tests/by-util/test_whoami.rs b/tests/by-util/test_whoami.rs
index 3e8d5afa6..340c1434f 100644
--- a/tests/by-util/test_whoami.rs
+++ b/tests/by-util/test_whoami.rs
@@ -3,7 +3,6 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-#[cfg(unix)]
 use crate::common::util::*;
 
 #[test]
@@ -34,7 +33,6 @@ fn test_normal_compare_id() {
 }
 
 #[test]
-#[cfg(unix)]
 fn test_normal_compare_env() {
     let whoami = whoami();
     if whoami == "nobody" {
diff --git a/tests/by-util/test_yes.rs b/tests/by-util/test_yes.rs
index 651491045..7e950e1ea 100644
--- a/tests/by-util/test_yes.rs
+++ b/tests/by-util/test_yes.rs
@@ -1 +1,72 @@
-// ToDO: add tests
+use std::io::Read;
+
+use crate::common::util::*;
+
+/// Run `yes`, capture some of the output, close the pipe, and verify it.
+fn run(args: &[&str], expected: &[u8]) {
+    let mut cmd = new_ucmd!();
+    let mut child = cmd.args(args).run_no_wait();
+    let mut stdout = child.stdout.take().unwrap();
+    let mut buf = vec![0; expected.len()];
+    stdout.read_exact(&mut buf).unwrap();
+    drop(stdout);
+    assert!(child.wait().unwrap().success());
+    assert_eq!(buf.as_slice(), expected);
+}
+
+#[test]
+fn test_simple() {
+    run(&[], b"y\ny\ny\ny\n");
+}
+
+#[test]
+fn test_args() {
+    run(&["a", "bar", "c"], b"a bar c\na bar c\na ba");
+}
+
+#[test]
+fn test_long_output() {
+    run(&[], "y\n".repeat(512 * 1024).as_bytes());
+}
+
+/// Test with an output that seems likely to get mangled in case of incomplete writes.
+#[test]
+fn test_long_odd_output() {
+    run(&["abcdef"], "abcdef\n".repeat(1024 * 1024).as_bytes());
+}
+
+/// Test with an input that doesn't fit in the standard buffer.
+#[test]
+fn test_long_input() {
+    #[cfg(not(windows))]
+    const TIMES: usize = 14000;
+    // On Windows the command line is limited to 8191 bytes.
+    // This is not actually enough to fill the buffer, but it's still nice to
+    // try something long.
+    #[cfg(windows)]
+    const TIMES: usize = 500;
+    let arg = "abcdefg".repeat(TIMES) + "\n";
+    let expected_out = arg.repeat(30);
+    run(&[&arg[..arg.len() - 1]], expected_out.as_bytes());
+}
+
+#[test]
+#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "netbsd"))]
+fn test_piped_to_dev_full() {
+    use std::fs::OpenOptions;
+
+    for &append in &[true, false] {
+        {
+            let dev_full = OpenOptions::new()
+                .write(true)
+                .append(append)
+                .open("/dev/full")
+                .unwrap();
+
+            new_ucmd!()
+                .set_stdout(dev_full)
+                .fails()
+                .stderr_contains("No space left on device");
+        }
+    }
+}
diff --git a/tests/common/macros.rs b/tests/common/macros.rs
index 62b8c4824..108bc0fb7 100644
--- a/tests/common/macros.rs
+++ b/tests/common/macros.rs
@@ -31,7 +31,11 @@ macro_rules! path_concat {
 #[macro_export]
 macro_rules! util_name {
     () => {
-        module_path!().split("_").nth(1).expect("no test name")
+        module_path!()
+            .split("_")
+            .nth(1)
+            .and_then(|s| s.split("::").next())
+            .expect("no test name")
     };
 }
 
diff --git a/tests/common/util.rs b/tests/common/util.rs
index 68b7caa9b..e71f18573 100644
--- a/tests/common/util.rs
+++ b/tests/common/util.rs
@@ -3,7 +3,7 @@
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
 
-//spell-checker: ignore (linux) rlimit prlimit Rlim coreutil
+//spell-checker: ignore (linux) rlimit prlimit Rlim coreutil ggroups
 
 #![allow(dead_code)]
 
@@ -163,25 +163,23 @@ impl CmdResult {
 
     /// asserts that the command resulted in a success (zero) status code
     pub fn success(&self) -> &CmdResult {
-        if !self.success {
-            panic!(
-                "Command was expected to succeed.\nstdout = {}\n stderr = {}",
-                self.stdout_str(),
-                self.stderr_str()
-            );
-        }
+        assert!(
+            self.success,
+            "Command was expected to succeed.\nstdout = {}\n stderr = {}",
+            self.stdout_str(),
+            self.stderr_str()
+        );
         self
     }
 
     /// asserts that the command resulted in a failure (non-zero) status code
     pub fn failure(&self) -> &CmdResult {
-        if self.success {
-            panic!(
-                "Command was expected to fail.\nstdout = {}\n stderr = {}",
-                self.stdout_str(),
-                self.stderr_str()
-            );
-        }
+        assert!(
+            !self.success,
+            "Command was expected to fail.\nstdout = {}\n stderr = {}",
+            self.stdout_str(),
+            self.stderr_str()
+        );
         self
     }
 
@@ -197,12 +195,11 @@ impl CmdResult {
     /// 1.  you can not know exactly what stdout will be or
     /// 2.  you know that stdout will also be empty
     pub fn no_stderr(&self) -> &CmdResult {
-        if !self.stderr.is_empty() {
-            panic!(
-                "Expected stderr to be empty, but it's:\n{}",
-                self.stderr_str()
-            );
-        }
+        assert!(
+            self.stderr.is_empty(),
+            "Expected stderr to be empty, but it's:\n{}",
+            self.stderr_str()
+        );
         self
     }
 
@@ -213,12 +210,11 @@ impl CmdResult {
     /// 1.  you can not know exactly what stderr will be or
     /// 2.  you know that stderr will also be empty
     pub fn no_stdout(&self) -> &CmdResult {
-        if !self.stdout.is_empty() {
-            panic!(
-                "Expected stdout to be empty, but it's:\n{}",
-                self.stderr_str()
-            );
-        }
+        assert!(
+            self.stdout.is_empty(),
+            "Expected stdout to be empty, but it's:\n{}",
+            self.stderr_str()
+        );
         self
     }
 
@@ -514,43 +510,86 @@ impl AtPath {
     }
 
     pub fn write(&self, name: &str, contents: &str) {
-        log_info("open(write)", self.plus_as_string(name));
+        log_info("write(default)", self.plus_as_string(name));
         std::fs::write(self.plus(name), contents)
             .unwrap_or_else(|e| panic!("Couldn't write {}: {}", name, e));
     }
 
     pub fn write_bytes(&self, name: &str, contents: &[u8]) {
-        log_info("open(write)", self.plus_as_string(name));
+        log_info("write(default)", self.plus_as_string(name));
         std::fs::write(self.plus(name), contents)
             .unwrap_or_else(|e| panic!("Couldn't write {}: {}", name, e));
     }
 
     pub fn append(&self, name: &str, contents: &str) {
-        log_info("open(append)", self.plus_as_string(name));
+        log_info("write(append)", self.plus_as_string(name));
         let mut f = OpenOptions::new()
             .write(true)
             .append(true)
+            .create(true)
             .open(self.plus(name))
             .unwrap();
         f.write_all(contents.as_bytes())
-            .unwrap_or_else(|e| panic!("Couldn't write {}: {}", name, e));
+            .unwrap_or_else(|e| panic!("Couldn't write(append) {}: {}", name, e));
     }
 
     pub fn append_bytes(&self, name: &str, contents: &[u8]) {
-        log_info("open(append)", self.plus_as_string(name));
+        log_info("write(append)", self.plus_as_string(name));
         let mut f = OpenOptions::new()
             .write(true)
             .append(true)
+            .create(true)
             .open(self.plus(name))
             .unwrap();
         f.write_all(contents)
-            .unwrap_or_else(|e| panic!("Couldn't append to {}: {}", name, e));
+            .unwrap_or_else(|e| panic!("Couldn't write(append) to {}: {}", name, e));
+    }
+
+    pub fn truncate(&self, name: &str, contents: &str) {
+        log_info("write(truncate)", self.plus_as_string(name));
+        let mut f = OpenOptions::new()
+            .write(true)
+            .truncate(true)
+            .create(true)
+            .open(self.plus(name))
+            .unwrap();
+        f.write_all(contents.as_bytes())
+            .unwrap_or_else(|e| panic!("Couldn't write(truncate) {}: {}", name, e));
+    }
+
+    pub fn rename(&self, source: &str, target: &str) {
+        let source = self.plus(source);
+        let target = self.plus(target);
+        log_info("rename", format!("{:?} {:?}", source, target));
+        std::fs::rename(&source, &target)
+            .unwrap_or_else(|e| panic!("Couldn't rename {:?} -> {:?}: {}", source, target, e));
+    }
+
+    pub fn remove(&self, source: &str) {
+        let source = self.plus(source);
+        log_info("remove", format!("{:?}", source));
+        std::fs::remove_file(&source)
+            .unwrap_or_else(|e| panic!("Couldn't remove {:?}: {}", source, e));
+    }
+
+    pub fn copy(&self, source: &str, target: &str) {
+        let source = self.plus(source);
+        let target = self.plus(target);
+        log_info("copy", format!("{:?} {:?}", source, target));
+        std::fs::copy(&source, &target)
+            .unwrap_or_else(|e| panic!("Couldn't copy {:?} -> {:?}: {}", source, target, e));
+    }
+
+    pub fn rmdir(&self, dir: &str) {
+        log_info("rmdir", self.plus_as_string(dir));
+        fs::remove_dir(&self.plus(dir)).unwrap();
     }
 
     pub fn mkdir(&self, dir: &str) {
         log_info("mkdir", self.plus_as_string(dir));
         fs::create_dir(&self.plus(dir)).unwrap();
     }
+
     pub fn mkdir_all(&self, dir: &str) {
         log_info("mkdir_all", self.plus_as_string(dir));
         fs::create_dir_all(self.plus(dir)).unwrap();
@@ -591,28 +630,40 @@ impl AtPath {
         }
     }
 
-    pub fn hard_link(&self, src: &str, dst: &str) {
+    pub fn hard_link(&self, original: &str, link: &str) {
         log_info(
             "hard_link",
-            &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)),
+            &format!(
+                "{},{}",
+                self.plus_as_string(original),
+                self.plus_as_string(link)
+            ),
         );
-        hard_link(&self.plus(src), &self.plus(dst)).unwrap();
+        hard_link(&self.plus(original), &self.plus(link)).unwrap();
     }
 
-    pub fn symlink_file(&self, src: &str, dst: &str) {
+    pub fn symlink_file(&self, original: &str, link: &str) {
         log_info(
             "symlink",
-            &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)),
+            &format!(
+                "{},{}",
+                self.plus_as_string(original),
+                self.plus_as_string(link)
+            ),
         );
-        symlink_file(&self.plus(src), &self.plus(dst)).unwrap();
+        symlink_file(&self.plus(original), &self.plus(link)).unwrap();
     }
 
-    pub fn symlink_dir(&self, src: &str, dst: &str) {
+    pub fn symlink_dir(&self, original: &str, link: &str) {
         log_info(
             "symlink",
-            &format!("{},{}", self.plus_as_string(src), self.plus_as_string(dst)),
+            &format!(
+                "{},{}",
+                self.plus_as_string(original),
+                self.plus_as_string(link)
+            ),
         );
-        symlink_dir(&self.plus(src), &self.plus(dst)).unwrap();
+        symlink_dir(&self.plus(original), &self.plus(link)).unwrap();
     }
 
     pub fn is_symlink(&self, path: &str) -> bool {
@@ -677,20 +728,12 @@ impl AtPath {
         // Source:
         // http://stackoverflow.com/questions/31439011/getfinalpathnamebyhandle-without-prepended
         let prefix = "\\\\?\\";
-        // FixME: replace ...
-        #[allow(clippy::manual_strip)]
-        if s.starts_with(prefix) {
-            String::from(&s[prefix.len()..])
+
+        if let Some(stripped) = s.strip_prefix(prefix) {
+            String::from(stripped)
         } else {
             s
         }
-        // ... with ...
-        // if let Some(stripped) = s.strip_prefix(prefix) {
-        //     String::from(stripped)
-        // } else {
-        //     s
-        // }
-        // ... when using MSRV with stabilized `strip_prefix()`
     }
 }
 
@@ -701,7 +744,7 @@ impl AtPath {
 ///
 /// Fixtures can be found under `tests/fixtures/$util_name/`
 pub struct TestScenario {
-    bin_path: PathBuf,
+    pub bin_path: PathBuf,
     pub util_name: String,
     pub fixtures: AtPath,
     tmpd: Rc<TempDir>,
@@ -856,9 +899,7 @@ impl UCommand {
     /// Add a parameter to the invocation. Path arguments are treated relative
     /// to the test environment directory.
     pub fn arg<S: AsRef<OsStr>>(&mut self, arg: S) -> &mut UCommand {
-        if self.has_run {
-            panic!("{}", ALREADY_RUN);
-        }
+        assert!(!self.has_run, "{}", ALREADY_RUN);
         self.comm_string.push(' ');
         self.comm_string
             .push_str(arg.as_ref().to_str().unwrap_or_default());
@@ -869,9 +910,7 @@ impl UCommand {
     /// Add multiple parameters to the invocation. Path arguments are treated relative
     /// to the test environment directory.
     pub fn args<S: AsRef<OsStr>>(&mut self, args: &[S]) -> &mut UCommand {
-        if self.has_run {
-            panic!("{}", MULTIPLE_STDIN_MEANINGLESS);
-        }
+        assert!(!self.has_run, "{}", MULTIPLE_STDIN_MEANINGLESS);
         let strings = args
             .iter()
             .map(|s| s.as_ref().to_os_string())
@@ -889,9 +928,11 @@ impl UCommand {
 
     /// provides standard input to feed in to the command when spawned
     pub fn pipe_in<T: Into<Vec<u8>>>(&mut self, input: T) -> &mut UCommand {
-        if self.bytes_into_stdin.is_some() {
-            panic!("{}", MULTIPLE_STDIN_MEANINGLESS);
-        }
+        assert!(
+            !self.bytes_into_stdin.is_some(),
+            "{}",
+            MULTIPLE_STDIN_MEANINGLESS
+        );
         self.bytes_into_stdin = Some(input.into());
         self
     }
@@ -906,9 +947,7 @@ impl UCommand {
     /// This is typically useful to test non-standard workflows
     /// like feeding something to a command that does not read it
     pub fn ignore_stdin_write_error(&mut self) -> &mut UCommand {
-        if self.bytes_into_stdin.is_none() {
-            panic!("{}", NO_STDIN_MEANINGLESS);
-        }
+        assert!(!self.bytes_into_stdin.is_none(), "{}", NO_STDIN_MEANINGLESS);
         self.ignore_stdin_write_error = true;
         self
     }
@@ -918,9 +957,7 @@ impl UCommand {
         K: AsRef<OsStr>,
         V: AsRef<OsStr>,
     {
-        if self.has_run {
-            panic!("{}", ALREADY_RUN);
-        }
+        assert!(!self.has_run, "{}", ALREADY_RUN);
         self.raw.env(key, val);
         self
     }
@@ -939,9 +976,7 @@ impl UCommand {
     /// Spawns the command, feeds the stdin if any, and returns the
     /// child process immediately.
     pub fn run_no_wait(&mut self) -> Child {
-        if self.has_run {
-            panic!("{}", ALREADY_RUN);
-        }
+        assert!(!self.has_run, "{}", ALREADY_RUN);
         self.has_run = true;
         log_info("run", &self.comm_string);
         let mut child = self
@@ -1024,6 +1059,8 @@ impl UCommand {
     }
 }
 
+/// Wrapper for `child.stdout.read_exact()`.
+/// Careful, this blocks indefinitely if `size` bytes is never reached.
 pub fn read_size(child: &mut Child, size: usize) -> String {
     let mut output = Vec::new();
     output.resize(size, 0);
@@ -1057,10 +1094,12 @@ pub fn whoami() -> String {
 
     // Use environment variable to get current user instead of
     // invoking `whoami` and fall back to user "nobody" on error.
-    std::env::var("USER").unwrap_or_else(|e| {
-        println!("{}: {}, using \"nobody\" instead", UUTILS_WARNING, e);
-        "nobody".to_string()
-    })
+    std::env::var("USER")
+        .or_else(|_| std::env::var("USERNAME"))
+        .unwrap_or_else(|e| {
+            println!("{}: {}, using \"nobody\" instead", UUTILS_WARNING, e);
+            "nobody".to_string()
+        })
 }
 
 /// Add prefix 'g' for `util_name` if not on linux
@@ -1069,7 +1108,14 @@ pub fn host_name_for(util_name: &str) -> Cow<str> {
     // In some environments, e.g. macOS/freebsd, the GNU coreutils are prefixed with "g"
     // to not interfere with the BSD counterparts already in `$PATH`.
     #[cfg(not(target_os = "linux"))]
-    return format!("g{}", util_name).into();
+    {
+        // make call to `host_name_for` idempotent
+        if util_name.starts_with('g') && util_name != "groups" {
+            return util_name.into();
+        } else {
+            return format!("g{}", util_name).into();
+        }
+    }
     #[cfg(target_os = "linux")]
     return util_name.into();
 }
@@ -1148,7 +1194,7 @@ pub fn check_coreutil_version(
                 if s.contains(&format!("(GNU coreutils) {}", version_expected)) {
                     Ok(format!("{}: {}", UUTILS_INFO, s.to_string()))
                 } else if s.contains("(GNU coreutils)") {
-                    let version_found = s.split_whitespace().last().unwrap()[..4].parse::<f32>().unwrap_or_default();
+                    let version_found = parse_coreutil_version(s);
                     let version_expected = version_expected.parse::<f32>().unwrap_or_default();
                     if version_found > version_expected {
                     Ok(format!("{}: version for the reference coreutil '{}' is higher than expected; expected: {}, found: {}", UUTILS_INFO, util_name, version_expected, version_found))
@@ -1161,6 +1207,20 @@ pub fn check_coreutil_version(
         )
 }
 
+// simple heuristic to parse the coreutils SemVer string, e.g. "id (GNU coreutils) 8.32.263-0475"
+fn parse_coreutil_version(version_string: &str) -> f32 {
+    version_string
+        .split_whitespace()
+        .last()
+        .unwrap()
+        .split('.')
+        .take(2)
+        .collect::<Vec<_>>()
+        .join(".")
+        .parse::<f32>()
+        .unwrap_or_default()
+}
+
 /// This runs the GNU coreutils `util_name` binary in `$PATH` in order to
 /// dynamically gather reference values on the system.
 /// If the `util_name` in `$PATH` doesn't include a coreutils version string,
@@ -1183,8 +1243,8 @@ pub fn check_coreutil_version(
 ///```
 #[cfg(unix)]
 pub fn expected_result(ts: &TestScenario, args: &[&str]) -> std::result::Result<CmdResult, String> {
+    println!("{}", check_coreutil_version(&ts.util_name, VERSION_MIN)?);
     let util_name = &host_name_for(&ts.util_name);
-    println!("{}", check_coreutil_version(util_name, VERSION_MIN)?);
 
     let result = ts
         .cmd_keepenv(util_name.as_ref())
@@ -1453,6 +1513,36 @@ mod tests {
         res.normalized_newlines_stdout_is("A\r\nB\nC\n");
     }
 
+    #[test]
+    #[cfg(unix)]
+    fn test_parse_coreutil_version() {
+        use std::assert_eq;
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 9.0.123-0123").to_string(),
+            "9"
+        );
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 8.32.263-0475").to_string(),
+            "8.32"
+        );
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 8.25.123-0123").to_string(),
+            "8.25"
+        );
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 9.0").to_string(),
+            "9"
+        );
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 8.32").to_string(),
+            "8.32"
+        );
+        assert_eq!(
+            parse_coreutil_version("id (GNU coreutils) 8.25").to_string(),
+            "8.25"
+        );
+    }
+
     #[test]
     #[cfg(unix)]
     fn test_check_coreutil_version() {
@@ -1481,4 +1571,25 @@ mod tests {
         let ts = TestScenario::new("no test name");
         assert!(expected_result(&ts, &[]).is_err());
     }
+
+    #[test]
+    #[cfg(unix)]
+    fn test_host_name_for() {
+        #[cfg(target_os = "linux")]
+        {
+            std::assert_eq!(host_name_for("id"), "id");
+            std::assert_eq!(host_name_for("groups"), "groups");
+            std::assert_eq!(host_name_for("who"), "who");
+        }
+        #[cfg(not(target_os = "linux"))]
+        {
+            // spell-checker:ignore (strings) ggroups gwho
+            std::assert_eq!(host_name_for("id"), "gid");
+            std::assert_eq!(host_name_for("groups"), "ggroups");
+            std::assert_eq!(host_name_for("who"), "gwho");
+            std::assert_eq!(host_name_for("gid"), "gid");
+            std::assert_eq!(host_name_for("ggroups"), "ggroups");
+            std::assert_eq!(host_name_for("gwho"), "gwho");
+        }
+    }
 }
diff --git a/tests/fixtures/dd/ascii-10k.txt b/tests/fixtures/dd/ascii-10k.txt
new file mode 100644
index 000000000..5e72e94d4
Binary files /dev/null and b/tests/fixtures/dd/ascii-10k.txt differ
diff --git a/tests/fixtures/dd/gnudd-conv-atoe-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-atoe-seq-byte-values.spec
new file mode 100644
index 000000000..8701c67fd
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-atoe-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-atoibm-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-atoibm-seq-byte-values.spec
new file mode 100644
index 000000000..3835d57cf
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-atoibm-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-ebcdic-ltou-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-ebcdic-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..ed0686639
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-ebcdic-ltou-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-ebcdic-utol-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-ebcdic-utol-seq-byte-values.spec
new file mode 100644
index 000000000..13c82e5e3
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-ebcdic-utol-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-etoa-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-etoa-seq-byte-values.spec
new file mode 100644
index 000000000..433b1f600
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-etoa-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-ibm-ltou-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-ibm-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..d425e7d01
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-ibm-ltou-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-ibm-utol-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-ibm-utol-seq-byte-values.spec
new file mode 100644
index 000000000..1dcaccbcd
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-ibm-utol-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-ltou-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-ltou-seq-byte-values.spec
new file mode 100644
index 000000000..5aacec0cd
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-ltou-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/gnudd-conv-utol-seq-byte-values.spec b/tests/fixtures/dd/gnudd-conv-utol-seq-byte-values.spec
new file mode 100644
index 000000000..d205368d5
Binary files /dev/null and b/tests/fixtures/dd/gnudd-conv-utol-seq-byte-values.spec differ
diff --git a/tests/fixtures/dd/null.txt b/tests/fixtures/dd/null.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/dd/self-transfer-256k.txt b/tests/fixtures/dd/self-transfer-256k.txt
new file mode 100644
index 000000000..6d23118f0
Binary files /dev/null and b/tests/fixtures/dd/self-transfer-256k.txt differ
diff --git a/tests/fixtures/dd/seq-byte-values.test b/tests/fixtures/dd/seq-byte-values.test
new file mode 100644
index 000000000..c86626638
Binary files /dev/null and b/tests/fixtures/dd/seq-byte-values.test differ
diff --git a/tests/fixtures/dd/this-file-exists-excl.txt b/tests/fixtures/dd/this-file-exists-excl.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/dd/this-file-exists-no-noatime.txt b/tests/fixtures/dd/this-file-exists-no-noatime.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/dd/this-file-exists-notrunc.txt b/tests/fixtures/dd/this-file-exists-notrunc.txt
new file mode 100644
index 000000000..5223e3549
--- /dev/null
+++ b/tests/fixtures/dd/this-file-exists-notrunc.txt
@@ -0,0 +1 @@
+abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd
\ No newline at end of file
diff --git a/tests/fixtures/dd/this-file-exists-truncated.txt b/tests/fixtures/dd/this-file-exists-truncated.txt
new file mode 100644
index 000000000..5223e3549
--- /dev/null
+++ b/tests/fixtures/dd/this-file-exists-truncated.txt
@@ -0,0 +1 @@
+abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcd
\ No newline at end of file
diff --git a/tests/fixtures/dd/this-ifile-exists-noatime.txt b/tests/fixtures/dd/this-ifile-exists-noatime.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/dd/this-ofile-exists-noatime.txt b/tests/fixtures/dd/this-ofile-exists-noatime.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/dd/y-nl-1k.txt b/tests/fixtures/dd/y-nl-1k.txt
new file mode 100644
index 000000000..e75c50796
--- /dev/null
+++ b/tests/fixtures/dd/y-nl-1k.txt
@@ -0,0 +1,512 @@
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
+y
diff --git a/tests/fixtures/dd/zero-256k.txt b/tests/fixtures/dd/zero-256k.txt
new file mode 100644
index 000000000..6d23118f0
Binary files /dev/null and b/tests/fixtures/dd/zero-256k.txt differ
diff --git a/tests/fixtures/dd/😎💚🦊.txt b/tests/fixtures/dd/😎💚🦊.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/hashsum/b2sum.checkfile b/tests/fixtures/hashsum/b2sum.checkfile
new file mode 100644
index 000000000..9d6781cc8
--- /dev/null
+++ b/tests/fixtures/hashsum/b2sum.checkfile
@@ -0,0 +1 @@
+7355dd5276c21cfe0c593b5063b96af3f96a454b33216f58314f44c3ade92e9cd6cec4210a0836246780e9baf927cc50b9a3d7073e8f9bd12780fddbcb930c6d  input.txt
diff --git a/tests/fixtures/hashsum/md5.checkfile b/tests/fixtures/hashsum/md5.checkfile
new file mode 100644
index 000000000..328e1bd94
--- /dev/null
+++ b/tests/fixtures/hashsum/md5.checkfile
@@ -0,0 +1 @@
+e4d7f1b4ed2e42d15898f4b27b019da4  input.txt
diff --git a/tests/fixtures/hashsum/sha1.checkfile b/tests/fixtures/hashsum/sha1.checkfile
new file mode 100644
index 000000000..02c35969f
--- /dev/null
+++ b/tests/fixtures/hashsum/sha1.checkfile
@@ -0,0 +1 @@
+b7e23ec29af22b0b4e41da31e868d57226121c84  input.txt
diff --git a/tests/fixtures/hashsum/sha224.checkfile b/tests/fixtures/hashsum/sha224.checkfile
new file mode 100644
index 000000000..6e3402094
--- /dev/null
+++ b/tests/fixtures/hashsum/sha224.checkfile
@@ -0,0 +1 @@
+6e1a93e32fb44081a401f3db3ef2e6e108b7bbeeb5705afdaf01fb27  input.txt
diff --git a/tests/fixtures/hashsum/sha256.checkfile b/tests/fixtures/hashsum/sha256.checkfile
new file mode 100644
index 000000000..db1d2be15
--- /dev/null
+++ b/tests/fixtures/hashsum/sha256.checkfile
@@ -0,0 +1 @@
+09ca7e4eaa6e8ae9c7d261167129184883644d07dfba7cbfbc4c8a2e08360d5b  input.txt
diff --git a/tests/fixtures/hashsum/sha384.checkfile b/tests/fixtures/hashsum/sha384.checkfile
new file mode 100644
index 000000000..c53326b1d
--- /dev/null
+++ b/tests/fixtures/hashsum/sha384.checkfile
@@ -0,0 +1 @@
+1fcdb6059ce05172a26bbe2a3ccc88ed5a8cd5fc53edfd9053304d429296a6da23b1cd9e5c9ed3bb34f00418a70cdb7e  input.txt
diff --git a/tests/fixtures/hashsum/sha3_224.checkfile b/tests/fixtures/hashsum/sha3_224.checkfile
new file mode 100644
index 000000000..3a93cd056
--- /dev/null
+++ b/tests/fixtures/hashsum/sha3_224.checkfile
@@ -0,0 +1 @@
+927b362eaf84a75785bbec3370d1c9711349e93f1104eda060784221  input.txt
diff --git a/tests/fixtures/hashsum/sha3_256.checkfile b/tests/fixtures/hashsum/sha3_256.checkfile
new file mode 100644
index 000000000..b8bec0924
--- /dev/null
+++ b/tests/fixtures/hashsum/sha3_256.checkfile
@@ -0,0 +1 @@
+bfb3959527d7a3f2f09def2f6915452d55a8f122df9e164d6f31c7fcf6093e14  input.txt
diff --git a/tests/fixtures/hashsum/sha3_384.checkfile b/tests/fixtures/hashsum/sha3_384.checkfile
new file mode 100644
index 000000000..6b014fdd2
--- /dev/null
+++ b/tests/fixtures/hashsum/sha3_384.checkfile
@@ -0,0 +1 @@
+fbd0c5931195aaa9517869972b372f717bb69f7f9f72bfc0884ed0531c36a16fc2db5dd6d82131968b23ffe0e90757e5  input.txt
diff --git a/tests/fixtures/hashsum/sha3_512.checkfile b/tests/fixtures/hashsum/sha3_512.checkfile
new file mode 100644
index 000000000..125e2dfba
--- /dev/null
+++ b/tests/fixtures/hashsum/sha3_512.checkfile
@@ -0,0 +1 @@
+2ed3a863a12e2f8ff140aa86232ff3603a7f24af62f0e2ca74672494ade175a9a3de42a351b5019d931a1deae0499609038d9b47268779d76198e1d410d20974  input.txt
diff --git a/tests/fixtures/hashsum/sha512.checkfile b/tests/fixtures/hashsum/sha512.checkfile
new file mode 100644
index 000000000..41a55cabb
--- /dev/null
+++ b/tests/fixtures/hashsum/sha512.checkfile
@@ -0,0 +1 @@
+8710339dcb6814d0d9d2290ef422285c9322b7163951f9a0ca8f883d3305286f44139aa374848e4174f5aada663027e4548637b6d19894aec4fb6c46a139fbf9  input.txt
diff --git a/tests/fixtures/hashsum/shake128_256.checkfile b/tests/fixtures/hashsum/shake128_256.checkfile
new file mode 100644
index 000000000..a3769f78e
--- /dev/null
+++ b/tests/fixtures/hashsum/shake128_256.checkfile
@@ -0,0 +1 @@
+83d41db453072caa9953f2f316480fbbcb84a5f3505460a18b3a36a814ae8e9e  input.txt
diff --git a/tests/fixtures/hashsum/shake256_512.checkfile b/tests/fixtures/hashsum/shake256_512.checkfile
new file mode 100644
index 000000000..e16601f30
--- /dev/null
+++ b/tests/fixtures/hashsum/shake256_512.checkfile
@@ -0,0 +1 @@
+7c9896ea84a2a1b80b2183a3f2b4e43cd59b7d48471dc213bcedaccb699d6e6f7ad5d304928ab79329f1fc62f6db072d95b51209eb807683f5c9371872a2dd4e  input.txt
diff --git a/tests/fixtures/join/fields_3.txt b/tests/fixtures/join/fields_3.txt
index 4c5c0e779..95847c266 100644
--- a/tests/fixtures/join/fields_3.txt
+++ b/tests/fixtures/join/fields_3.txt
@@ -4,3 +4,4 @@ c 4 h
 f 5 i
 g 6 j
 h 7 k
+i 99 l
diff --git a/tests/fixtures/join/suppress_joined_outer.expected b/tests/fixtures/join/suppress_joined_outer.expected
new file mode 100644
index 000000000..9d079f8bc
--- /dev/null
+++ b/tests/fixtures/join/suppress_joined_outer.expected
@@ -0,0 +1,4 @@
+1 a
+8 h
+9 i
+99 i l
diff --git a/tests/fixtures/join/unpaired_lines_format.expected b/tests/fixtures/join/unpaired_lines_format.expected
index d1324aa66..57aca84af 100644
--- a/tests/fixtures/join/unpaired_lines_format.expected
+++ b/tests/fixtures/join/unpaired_lines_format.expected
@@ -4,3 +4,4 @@
    i 5 f
    j 6 g
    k 7 h
+   l 99 i
diff --git a/tests/fixtures/join/unpaired_lines_outer.expected b/tests/fixtures/join/unpaired_lines_outer.expected
new file mode 100644
index 000000000..0b4c9cd81
--- /dev/null
+++ b/tests/fixtures/join/unpaired_lines_outer.expected
@@ -0,0 +1,10 @@
+1 a
+2 a f b
+3 b g c
+4 c h d
+5 f i e
+6 g j f
+7 h k g
+8 h
+9 i
+99 i l
diff --git a/tests/fixtures/sort/empty.txt b/tests/fixtures/sort/empty.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/tac/delimited_primes_before.expected b/tests/fixtures/tac/delimited_primes_before.expected
index 13cb1be06..1417a0150 100644
--- a/tests/fixtures/tac/delimited_primes_before.expected
+++ b/tests/fixtures/tac/delimited_primes_before.expected
@@ -1 +1 @@
-97:89:83:79:73:71:67:61:59:53:47:43:41:37:31:29:23:19:17:13:11:7:5:3:2
\ No newline at end of file
+:97:89:83:79:73:71:67:61:59:53:47:43:41:37:31:29:23:19:17:13:11:7:5:32
\ No newline at end of file
diff --git a/tests/fixtures/wc/UTF_8_test.txt b/tests/fixtures/wc/UTF_8_test.txt
index a5b5d50e6..cd0474c82 100644
Binary files a/tests/fixtures/wc/UTF_8_test.txt and b/tests/fixtures/wc/UTF_8_test.txt differ
diff --git a/tests/fixtures/wc/UTF_8_weirdchars.txt b/tests/fixtures/wc/UTF_8_weirdchars.txt
new file mode 100644
index 000000000..0c7670f5e
--- /dev/null
+++ b/tests/fixtures/wc/UTF_8_weirdchars.txt
@@ -0,0 +1,25 @@
+zero-width space inbetween these: x​x
+and inbetween two spaces: [ ​ ]
+and at the end of the line: ​
+
+non-breaking space: x x [   ]  
+
+simple unicode: xµx [ µ ] µ
+
+wide: xｗx [ ｗ ] ｗ
+
+simple emoji: x👩x [ 👩 ] 👩
+
+complex emoji: x👩‍🔬x [ 👩‍🔬 ] 👩‍🔬
+
+Ｈｅｌｌｏ, ｗｏｒｌｄ!
+
+line feed: xx [  ] 
+
+vertical tab: xx [  ] 
+
+horizontal tab: x	x [ 	 ]
+this should be the longest line:
+1234567	12345678	123456781234567812345678
+
+Control character: xx [  ] 
diff --git a/tests/test_util_name.rs b/tests/test_util_name.rs
new file mode 100644
index 000000000..76b6f4728
--- /dev/null
+++ b/tests/test_util_name.rs
@@ -0,0 +1,89 @@
+#![allow(unused_imports)]
+mod common;
+
+use common::util::TestScenario;
+
+#[cfg(unix)]
+use std::os::unix::fs::symlink as symlink_file;
+#[cfg(windows)]
+use std::os::windows::fs::symlink_file;
+
+#[test]
+#[cfg(feature = "ls")]
+fn execution_phrase_double() {
+    use std::process::Command;
+
+    let scenario = TestScenario::new("ls");
+    let output = Command::new(&scenario.bin_path)
+        .arg("ls")
+        .arg("--some-invalid-arg")
+        .output()
+        .unwrap();
+    assert!(String::from_utf8(output.stderr)
+        .unwrap()
+        .contains(&format!("USAGE:\n    {} ls", scenario.bin_path.display(),)));
+}
+
+#[test]
+#[cfg(feature = "ls")]
+#[cfg(any(unix, windows))]
+fn execution_phrase_single() {
+    use std::process::Command;
+
+    let scenario = TestScenario::new("ls");
+    symlink_file(scenario.bin_path, scenario.fixtures.plus("uu-ls")).unwrap();
+    let output = Command::new(scenario.fixtures.plus("uu-ls"))
+        .arg("--some-invalid-arg")
+        .output()
+        .unwrap();
+    assert!(String::from_utf8(output.stderr).unwrap().contains(&format!(
+        "USAGE:\n    {}",
+        scenario.fixtures.plus("uu-ls").display()
+    )));
+}
+
+#[test]
+#[cfg(feature = "sort")]
+fn util_name_double() {
+    use std::{
+        io::Write,
+        process::{Command, Stdio},
+    };
+
+    let scenario = TestScenario::new("sort");
+    let mut child = Command::new(&scenario.bin_path)
+        .arg("sort")
+        .stdin(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+    // input invalid utf8 to cause an error
+    child.stdin.take().unwrap().write_all(&[255]).unwrap();
+    let output = child.wait_with_output().unwrap();
+    assert!(String::from_utf8(output.stderr).unwrap().contains("sort: "));
+}
+
+#[test]
+#[cfg(feature = "sort")]
+#[cfg(any(unix, windows))]
+fn util_name_single() {
+    use std::{
+        io::Write,
+        process::{Command, Stdio},
+    };
+
+    let scenario = TestScenario::new("sort");
+    symlink_file(scenario.bin_path, scenario.fixtures.plus("uu-sort")).unwrap();
+    let mut child = Command::new(scenario.fixtures.plus("uu-sort"))
+        .stdin(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+    // input invalid utf8 to cause an error
+    child.stdin.take().unwrap().write_all(&[255]).unwrap();
+    let output = child.wait_with_output().unwrap();
+    assert!(String::from_utf8(output.stderr).unwrap().contains(&format!(
+        "{}: ",
+        scenario.fixtures.plus("uu-sort").display()
+    )));
+}
diff --git a/util/GHA-delete-GNU-workflow-logs.sh b/util/GHA-delete-GNU-workflow-logs.sh
old mode 100644
new mode 100755
diff --git a/util/build-code_coverage.sh b/util/build-code_coverage.sh
old mode 100644
new mode 100755
diff --git a/util/build-gnu.sh b/util/build-gnu.sh
old mode 100644
new mode 100755
index 798a33456..eb8293fbe
--- a/util/build-gnu.sh
+++ b/util/build-gnu.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall gnulib inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW ; (vars/env) BUILDDIR SRCDIR
+# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall gnulib inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode ; (vars/env) BUILDDIR SRCDIR
 
 set -e
 if test ! -d ../gnu; then
     echo "Could not find ../gnu"
-    echo "git clone git@github.com:coreutils/coreutils.git gnu"
+    echo "git clone https://github.com:coreutils/coreutils.git gnu"
     exit 1
 fi
 if test ! -d ../gnulib; then
     echo "Could not find ../gnulib"
-    echo "git clone git@github.com:coreutils/gnulib.git gnulib"
+    echo "git clone https://github.com/coreutils/gnulib.git gnulib"
     exit 1
 fi
 
@@ -96,7 +96,6 @@ sed -i 's|seq |/usr/bin/seq |' tests/misc/sort-discrim.sh
 
 # Add specific timeout to tests that currently hang to limit time spent waiting
 sed -i 's|seq \$|/usr/bin/timeout 0.1 seq \$|' tests/misc/seq-precision.sh tests/misc/seq-long-double.sh
-sed -i 's|cat |/usr/bin/timeout 0.1 cat |' tests/misc/cat-self.sh
 
 
 # Remove dup of /usr/bin/ when executed several times
@@ -119,3 +118,18 @@ sed -i -e "s|rm: cannot remove 'a/1'|rm: cannot remove 'a'|g" tests/rm/rm2.sh
 sed -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh
 
 test -f "${BUILDDIR}/getlimits" || cp src/getlimits "${BUILDDIR}"
+
+# When decoding an invalid base32/64 string, gnu writes everything it was able to decode until
+# it hit the decode error, while we don't write anything if the input is invalid.
+sed -i "s/\(baddecode.*OUT=>\"\).*\"/\1\"/g" tests/misc/base64.pl
+sed -i "s/\(\(b2[ml]_[69]\|b32h_[56]\|z85_8\|z85_35\).*OUT=>\)[^}]*\(.*\)/\1\"\"\3/g" tests/misc/basenc.pl
+
+# add "error: " to the expected error message
+sed -i "s/\$prog: invalid input/\$prog: error: invalid input/g" tests/misc/basenc.pl
+
+# basenc: swap out error message for unexpected arg
+sed -i "s/  {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/  {ERR=>\"error: Found argument '--foobar' which wasn't expected, or isn't valid in this context\n\nUSAGE:\n    basenc [OPTION]... [FILE]\n\nFor more information try --help\n\"}]/" tests/misc/basenc.pl
+sed -i "s/  {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/misc/basenc.pl
+
+# Remove the check whether a util was built. Otherwise tests against utils like "arch" are not run.
+sed -i "s|require_built_ |# require_built_ |g" init.cfg
diff --git a/util/compare_gnu_result.py b/util/compare_gnu_result.py
new file mode 100755
index 000000000..52aa96abe
--- /dev/null
+++ b/util/compare_gnu_result.py
@@ -0,0 +1,32 @@
+#! /usr/bin/python
+
+"""
+Compare the current results to the last results gathered from the master branch to highlight
+if a PR is making the results better/worse
+"""
+
+import json
+import sys
+from os import environ
+
+NEW = json.load(open("gnu-result.json"))
+OLD = json.load(open("master-gnu-result.json"))
+
+# Extract the specific results from the dicts
+last = OLD[list(OLD.keys())[0]]
+current = NEW[list(NEW.keys())[0]]
+
+
+pass_d = int(current["pass"]) - int(last["pass"])
+fail_d = int(current["fail"]) - int(last["fail"])
+error_d = int(current["error"]) - int(last["error"])
+skip_d = int(current["skip"]) - int(last["skip"])
+
+# Get an annotation to highlight changes
+print(
+    f"::warning ::Changes from master: PASS {pass_d:+d} / FAIL {fail_d:+d} / ERROR {error_d:+d} / SKIP {skip_d:+d} "
+)
+
+# If results are worse fail the job to draw attention
+if pass_d < 0:
+    sys.exit(1)
diff --git a/util/publish.sh b/util/publish.sh
old mode 100644
new mode 100755
index 0936238a8..ae171e39c
--- a/util/publish.sh
+++ b/util/publish.sh
@@ -9,10 +9,17 @@ fi
 cd src/uucore/
 cargo publish $ARG
 cd -
+sleep 2s
+
+cd src/uucore_procs/
+cargo publish $ARG
+cd -
+sleep 2s
 
 cd src/uu/stdbuf/src/libstdbuf/
 cargo publish $ARG
 cd -
+sleep 2s
 
 PROGS=$(ls -1d src/uu/*/)
 for p in $PROGS; do
diff --git a/util/run-gnu-test.sh b/util/run-gnu-test.sh
old mode 100644
new mode 100755
index 9d51a983e..483fc1be9
--- a/util/run-gnu-test.sh
+++ b/util/run-gnu-test.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # spell-checker:ignore (env/vars) BUILDDIR GNULIB SUBDIRS
+cd "$(dirname "${BASH_SOURCE[0]}")/../.."
 set -e
 BUILDDIR="${PWD}/uutils/target/release"
 GNULIB_DIR="${PWD}/gnulib"
diff --git a/util/show-code_coverage.sh b/util/show-code_coverage.sh
old mode 100644
new mode 100755
diff --git a/util/update-version.sh b/util/update-version.sh
old mode 100644
new mode 100755
index eeacd500f..cbb811300
--- a/util/update-version.sh
+++ b/util/update-version.sh
@@ -3,14 +3,14 @@
 # So, it should be triple-checked
 
 
-FROM="0.0.6"
-TO="0.0.7"
+FROM="0.0.7"
+TO="0.0.8"
 
-UUCORE_PROCS_FROM="0.0.5"
-UUCORE_PROCS_TO="0.0.6"
+UUCORE_PROCS_FROM="0.0.6"
+UUCORE_PROCS_TO="0.0.7"
 
-UUCORE_FROM="0.0.8"
-UUCORE_TO="0.0.9"
+UUCORE_FROM="0.0.9"
+UUCORE_TO="0.0.10"
 
 PROGS=$(ls -1d src/uu/*/Cargo.toml src/uu/stdbuf/src/libstdbuf/Cargo.toml Cargo.toml src/uu/base64/Cargo.toml)