RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-05 15:37:47 +00:00
Code Issues Activity

Merge branch 'main' into rm-correct-prompts

Browse source
This commit is contained in:
Sylvestre Ledru 2022-10-22 10:22:29 +02:00 • committed by GitHub
commit fd13ceddcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 171 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

214
Cargo.lock generated
View file

@ -270,9 +270,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.0.17" version = "4.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06badb543e734a2d6568e19a40af66ed5364360b9226184926f89d229b4b4267" checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -289,7 +289,7 @@ version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11cba7abac9b56dfe2f035098cdb3a43946f276e6db83b72c4e692343f9aab9a" checksum = "11cba7abac9b56dfe2f035098cdb3a43946f276e6db83b72c4e692343f9aab9a"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
] ]
[[package]] [[package]]
@ -353,7 +353,7 @@ version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"chrono", "chrono",
"clap 4.0.17", "clap 4.0.18",
"clap_complete", "clap_complete",
"conv", "conv",
"filetime", "filetime",
@ -2154,7 +2154,7 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
name = "uu_arch" name = "uu_arch"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"platform-info", "platform-info",
"uucore", "uucore",
] ]
@ -2163,7 +2163,7 @@ dependencies = [
name = "uu_base32" name = "uu_base32"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2179,7 +2179,7 @@ dependencies = [
name = "uu_basename" name = "uu_basename"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2187,7 +2187,7 @@ dependencies = [
name = "uu_basenc" name = "uu_basenc"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uu_base32", "uu_base32",
"uucore", "uucore",
] ]
@ -2197,7 +2197,7 @@ name = "uu_cat"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"clap 4.0.17", "clap 4.0.18",
"nix", "nix",
"thiserror", "thiserror",
"uucore", "uucore",
@ -2207,7 +2207,7 @@ dependencies = [
name = "uu_chcon" name = "uu_chcon"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"fts-sys", "fts-sys",
"libc", "libc",
"selinux", "selinux",
@ -2219,7 +2219,7 @@ dependencies = [
name = "uu_chgrp" name = "uu_chgrp"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2227,7 +2227,7 @@ dependencies = [
name = "uu_chmod" name = "uu_chmod"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2236,7 +2236,7 @@ dependencies = [
name = "uu_chown" name = "uu_chown"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2244,7 +2244,7 @@ dependencies = [
name = "uu_chroot" name = "uu_chroot"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2252,7 +2252,7 @@ dependencies = [
name = "uu_cksum" name = "uu_cksum"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2260,7 +2260,7 @@ dependencies = [
name = "uu_comm" name = "uu_comm"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2268,7 +2268,7 @@ dependencies = [
name = "uu_cp" name = "uu_cp"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"exacl", "exacl",
"filetime", "filetime",
"libc", "libc",
@ -2283,7 +2283,7 @@ dependencies = [
name = "uu_csplit" name = "uu_csplit"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"regex", "regex",
"thiserror", "thiserror",
"uucore", "uucore",
@ -2295,7 +2295,7 @@ version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"bstr", "bstr",
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"uucore", "uucore",
] ]
@ -2305,7 +2305,7 @@ name = "uu_date"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
"windows-sys 0.42.0", "windows-sys 0.42.0",
@ -2316,7 +2316,7 @@ name = "uu_dd"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"byte-unit", "byte-unit",
"clap 4.0.17", "clap 4.0.18",
"gcd", "gcd",
"libc", "libc",
"signal-hook", "signal-hook",
@ -2327,7 +2327,7 @@ dependencies = [
name = "uu_df" name = "uu_df"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"unicode-width", "unicode-width",
"uucore", "uucore",
] ]
@ -2336,7 +2336,7 @@ dependencies = [
name = "uu_dir" name = "uu_dir"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"selinux", "selinux",
"uu_ls", "uu_ls",
"uucore", "uucore",
@ -2346,7 +2346,7 @@ dependencies = [
name = "uu_dircolors" name = "uu_dircolors"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"glob", "glob",
"uucore", "uucore",
] ]
@ -2355,7 +2355,7 @@ dependencies = [
name = "uu_dirname" name = "uu_dirname"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2364,7 +2364,7 @@ name = "uu_du"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap 4.0.17", "clap 4.0.18",
"glob", "glob",
"uucore", "uucore",
"windows-sys 0.42.0", "windows-sys 0.42.0",
@ -2374,7 +2374,7 @@ dependencies = [
name = "uu_echo" name = "uu_echo"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2382,7 +2382,7 @@ dependencies = [
name = "uu_env" name = "uu_env"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"nix", "nix",
"rust-ini", "rust-ini",
"uucore", "uucore",
@ -2392,7 +2392,7 @@ dependencies = [
name = "uu_expand" name = "uu_expand"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"unicode-width", "unicode-width",
"uucore", "uucore",
] ]
@ -2401,7 +2401,7 @@ dependencies = [
name = "uu_expr" name = "uu_expr"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"num-bigint", "num-bigint",
"num-traits", "num-traits",
"onig", "onig",
@ -2412,7 +2412,7 @@ dependencies = [
name = "uu_factor" name = "uu_factor"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"coz", "coz",
"num-traits", "num-traits",
"paste", "paste",
@ -2426,7 +2426,7 @@ dependencies = [
name = "uu_false" name = "uu_false"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2434,7 +2434,7 @@ dependencies = [
name = "uu_fmt" name = "uu_fmt"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"unicode-width", "unicode-width",
"uucore", "uucore",
] ]
@ -2443,7 +2443,7 @@ dependencies = [
name = "uu_fold" name = "uu_fold"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2451,7 +2451,7 @@ dependencies = [
name = "uu_groups" name = "uu_groups"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2461,7 +2461,7 @@ version = "0.0.16"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"blake3", "blake3",
"clap 4.0.17", "clap 4.0.18",
"digest", "digest",
"hex", "hex",
"md-5", "md-5",
@ -2477,7 +2477,7 @@ dependencies = [
name = "uu_head" name = "uu_head"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"uucore", "uucore",
] ]
@ -2486,7 +2486,7 @@ dependencies = [
name = "uu_hostid" name = "uu_hostid"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2495,7 +2495,7 @@ dependencies = [
name = "uu_hostname" name = "uu_hostname"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"hostname", "hostname",
"uucore", "uucore",
"windows-sys 0.42.0", "windows-sys 0.42.0",
@ -2505,7 +2505,7 @@ dependencies = [
name = "uu_id" name = "uu_id"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"selinux", "selinux",
"uucore", "uucore",
] ]
@ -2514,7 +2514,7 @@ dependencies = [
name = "uu_install" name = "uu_install"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"file_diff", "file_diff",
"filetime", "filetime",
"libc", "libc",
@ -2526,7 +2526,7 @@ dependencies = [
name = "uu_join" name = "uu_join"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"uucore", "uucore",
] ]
@ -2535,7 +2535,7 @@ dependencies = [
name = "uu_kill" name = "uu_kill"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"nix", "nix",
"uucore", "uucore",
] ]
@ -2544,7 +2544,7 @@ dependencies = [
name = "uu_link" name = "uu_link"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2552,7 +2552,7 @@ dependencies = [
name = "uu_ln" name = "uu_ln"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2560,7 +2560,7 @@ dependencies = [
name = "uu_logname" name = "uu_logname"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2571,7 +2571,7 @@ version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"chrono", "chrono",
"clap 4.0.17", "clap 4.0.18",
"glob", "glob",
"lscolors", "lscolors",
"number_prefix", "number_prefix",
@ -2587,7 +2587,7 @@ dependencies = [
name = "uu_mkdir" name = "uu_mkdir"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2595,7 +2595,7 @@ dependencies = [
name = "uu_mkfifo" name = "uu_mkfifo"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2604,7 +2604,7 @@ dependencies = [
name = "uu_mknod" name = "uu_mknod"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2613,7 +2613,7 @@ dependencies = [
name = "uu_mktemp" name = "uu_mktemp"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"rand", "rand",
"tempfile", "tempfile",
"uucore", "uucore",
@ -2624,7 +2624,7 @@ name = "uu_more"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"clap 4.0.17", "clap 4.0.18",
"crossterm", "crossterm",
"nix", "nix",
"unicode-segmentation", "unicode-segmentation",
@ -2636,7 +2636,7 @@ dependencies = [
name = "uu_mv" name = "uu_mv"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"fs_extra", "fs_extra",
"uucore", "uucore",
] ]
@ -2645,7 +2645,7 @@ dependencies = [
name = "uu_nice" name = "uu_nice"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"nix", "nix",
"uucore", "uucore",
@ -2655,7 +2655,7 @@ dependencies = [
name = "uu_nl" name = "uu_nl"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"regex", "regex",
"uucore", "uucore",
] ]
@ -2665,7 +2665,7 @@ name = "uu_nohup"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2674,7 +2674,7 @@ dependencies = [
name = "uu_nproc" name = "uu_nproc"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"num_cpus", "num_cpus",
"uucore", "uucore",
@ -2684,7 +2684,7 @@ dependencies = [
name = "uu_numfmt" name = "uu_numfmt"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2693,7 +2693,7 @@ name = "uu_od"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"clap 4.0.17", "clap 4.0.18",
"half", "half",
"uucore", "uucore",
] ]
@ -2702,7 +2702,7 @@ dependencies = [
name = "uu_paste" name = "uu_paste"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2710,7 +2710,7 @@ dependencies = [
name = "uu_pathchk" name = "uu_pathchk"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2719,7 +2719,7 @@ dependencies = [
name = "uu_pinky" name = "uu_pinky"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2727,7 +2727,7 @@ dependencies = [
name = "uu_pr" name = "uu_pr"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"itertools", "itertools",
"quick-error", "quick-error",
"regex", "regex",
@ -2739,7 +2739,7 @@ dependencies = [
name = "uu_printenv" name = "uu_printenv"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2747,7 +2747,7 @@ dependencies = [
name = "uu_printf" name = "uu_printf"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2755,7 +2755,7 @@ dependencies = [
name = "uu_ptx" name = "uu_ptx"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"regex", "regex",
"uucore", "uucore",
] ]
@ -2764,7 +2764,7 @@ dependencies = [
name = "uu_pwd" name = "uu_pwd"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2772,7 +2772,7 @@ dependencies = [
name = "uu_readlink" name = "uu_readlink"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2780,7 +2780,7 @@ dependencies = [
name = "uu_realpath" name = "uu_realpath"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2788,7 +2788,7 @@ dependencies = [
name = "uu_relpath" name = "uu_relpath"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2796,7 +2796,7 @@ dependencies = [
name = "uu_rm" name = "uu_rm"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"remove_dir_all 0.7.0", "remove_dir_all 0.7.0",
"uucore", "uucore",
@ -2808,7 +2808,7 @@ dependencies = [
name = "uu_rmdir" name = "uu_rmdir"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
] ]
@ -2817,7 +2817,7 @@ dependencies = [
name = "uu_runcon" name = "uu_runcon"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"selinux", "selinux",
"thiserror", "thiserror",
@ -2829,7 +2829,7 @@ name = "uu_seq"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"bigdecimal", "bigdecimal",
"clap 4.0.17", "clap 4.0.18",
"num-bigint", "num-bigint",
"num-traits", "num-traits",
"uucore", "uucore",
@ -2839,7 +2839,7 @@ dependencies = [
name = "uu_shred" name = "uu_shred"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"rand", "rand",
"uucore", "uucore",
] ]
@ -2848,7 +2848,7 @@ dependencies = [
name = "uu_shuf" name = "uu_shuf"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"rand", "rand",
"rand_core", "rand_core",
@ -2859,7 +2859,7 @@ dependencies = [
name = "uu_sleep" name = "uu_sleep"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2868,7 +2868,7 @@ name = "uu_sort"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"binary-heap-plus", "binary-heap-plus",
"clap 4.0.17", "clap 4.0.18",
"compare", "compare",
"ctrlc", "ctrlc",
"fnv", "fnv",
@ -2886,7 +2886,7 @@ dependencies = [
name = "uu_split" name = "uu_split"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"uucore", "uucore",
] ]
@ -2895,7 +2895,7 @@ dependencies = [
name = "uu_stat" name = "uu_stat"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2903,7 +2903,7 @@ dependencies = [
name = "uu_stdbuf" name = "uu_stdbuf"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"tempfile", "tempfile",
"uu_stdbuf_libstdbuf", "uu_stdbuf_libstdbuf",
"uucore", "uucore",
@ -2923,7 +2923,7 @@ dependencies = [
name = "uu_stty" name = "uu_stty"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"nix", "nix",
"uucore", "uucore",
] ]
@ -2932,7 +2932,7 @@ dependencies = [
name = "uu_sum" name = "uu_sum"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -2940,7 +2940,7 @@ dependencies = [
name = "uu_sync" name = "uu_sync"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"nix", "nix",
"uucore", "uucore",
@ -2951,7 +2951,7 @@ dependencies = [
name = "uu_tac" name = "uu_tac"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"memchr", "memchr",
"memmap2", "memmap2",
"regex", "regex",
@ -2962,7 +2962,7 @@ dependencies = [
name = "uu_tail" name = "uu_tail"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"memchr", "memchr",
"nix", "nix",
@ -2977,7 +2977,7 @@ dependencies = [
name = "uu_tee" name = "uu_tee"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"retain_mut", "retain_mut",
"uucore", "uucore",
@ -2987,7 +2987,7 @@ dependencies = [
name = "uu_test" name = "uu_test"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"redox_syscall", "redox_syscall",
"uucore", "uucore",
@ -2997,7 +2997,7 @@ dependencies = [
name = "uu_timeout" name = "uu_timeout"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"nix", "nix",
"uucore", "uucore",
@ -3007,7 +3007,7 @@ dependencies = [
name = "uu_touch" name = "uu_touch"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"filetime", "filetime",
"time", "time",
"uucore", "uucore",
@ -3018,7 +3018,7 @@ dependencies = [
name = "uu_tr" name = "uu_tr"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"nom", "nom",
"uucore", "uucore",
] ]
@ -3027,7 +3027,7 @@ dependencies = [
name = "uu_true" name = "uu_true"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3035,7 +3035,7 @@ dependencies = [
name = "uu_truncate" name = "uu_truncate"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3043,7 +3043,7 @@ dependencies = [
name = "uu_tsort" name = "uu_tsort"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3052,7 +3052,7 @@ name = "uu_tty"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"atty", "atty",
"clap 4.0.17", "clap 4.0.18",
"nix", "nix",
"uucore", "uucore",
] ]
@ -3061,7 +3061,7 @@ dependencies = [
name = "uu_uname" name = "uu_uname"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"platform-info", "platform-info",
"uucore", "uucore",
] ]
@ -3070,7 +3070,7 @@ dependencies = [
name = "uu_unexpand" name = "uu_unexpand"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"unicode-width", "unicode-width",
"uucore", "uucore",
] ]
@ -3079,7 +3079,7 @@ dependencies = [
name = "uu_uniq" name = "uu_uniq"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"strum", "strum",
"strum_macros", "strum_macros",
"uucore", "uucore",
@ -3089,7 +3089,7 @@ dependencies = [
name = "uu_unlink" name = "uu_unlink"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3098,7 +3098,7 @@ name = "uu_uptime"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3106,7 +3106,7 @@ dependencies = [
name = "uu_users" name = "uu_users"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3114,7 +3114,7 @@ dependencies = [
name = "uu_vdir" name = "uu_vdir"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"selinux", "selinux",
"uu_ls", "uu_ls",
"uucore", "uucore",
@ -3125,7 +3125,7 @@ name = "uu_wc"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"bytecount", "bytecount",
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"nix", "nix",
"unicode-width", "unicode-width",
@ -3137,7 +3137,7 @@ dependencies = [
name = "uu_who" name = "uu_who"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"uucore", "uucore",
] ]
@ -3145,7 +3145,7 @@ dependencies = [
name = "uu_whoami" name = "uu_whoami"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"uucore", "uucore",
"windows-sys 0.42.0", "windows-sys 0.42.0",
@ -3155,7 +3155,7 @@ dependencies = [
name = "uu_yes" name = "uu_yes"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"libc", "libc",
"nix", "nix",
"uucore", "uucore",
@ -3165,7 +3165,7 @@ dependencies = [
name = "uucore" name = "uucore"
version = "0.0.16" version = "0.0.16"
dependencies = [ dependencies = [
"clap 4.0.17", "clap 4.0.18",
"data-encoding", "data-encoding",
"data-encoding-macro", "data-encoding-macro",
"dns-lookup", "dns-lookup",

31
src/uu/hashsum/src/hashsum.rs
View file

@ -498,7 +498,8 @@ where
I: Iterator<Item = &'a OsStr>, I: Iterator<Item = &'a OsStr>,
{ {
let mut bad_format = 0; let mut bad_format = 0;
let mut failed = 0; let mut failed_cksum = 0;
let mut failed_open_file = 0;
let binary_marker = if options.binary { "*" } else { " " }; let binary_marker = if options.binary { "*" } else { " " };
for filename in files { for filename in files {
let filename = Path::new(filename); let filename = Path::new(filename);
@ -574,8 +575,19 @@ where
} }
}, },
}; };
let f = File::open(ck_filename) let f = match File::open(ck_filename) {
.map_err_context(|| "failed to open file".to_string())?; Err(_) => {
failed_open_file += 1;
println!(
"{}: {}: No such file or directory",
uucore::util_name(),
ck_filename
);
println!("{}: FAILED open or read", ck_filename);
continue;
}
Ok(file) => file,
};
let mut ckf = BufReader::new(Box::new(f) as Box<dyn Read>); let mut ckf = BufReader::new(Box::new(f) as Box<dyn Read>);
let real_sum = digest_reader( let real_sum = digest_reader(
&mut options.digest, &mut options.digest,
@ -602,7 +614,7 @@ where
if !options.status { if !options.status {
println!("{}: FAILED", ck_filename); println!("{}: FAILED", ck_filename);
} }
failed += 1; failed_cksum += 1;
} }
} }
} else { } else {
@ -628,8 +640,15 @@ where
Ordering::Greater => show_warning!("{} lines are improperly formatted", bad_format), Ordering::Greater => show_warning!("{} lines are improperly formatted", bad_format),
_ => {} _ => {}
}; };
if failed > 0 { if failed_cksum > 0 {
show_warning!("{} computed checksum did NOT match", failed); show_warning!("{} computed checksum did NOT match", failed_cksum);
}
match failed_open_file.cmp(&1) {
Ordering::Equal => show_warning!("{} listed file could not be read", failed_open_file),
Ordering::Greater => {
show_warning!("{} listed files could not be read", failed_open_file);
}
_ => {}
} }
} }

20
src/uucore/src/lib/features/fs.rs
View file

@ -402,12 +402,26 @@ pub fn canonicalize<P: AsRef<Path>>(
} }
#[cfg(not(unix))] #[cfg(not(unix))]
#[allow(unused_variables)]
pub fn display_permissions(metadata: &fs::Metadata, display_file_type: bool) -> String { pub fn display_permissions(metadata: &fs::Metadata, display_file_type: bool) -> String {
let write = if metadata.permissions().readonly() {
'-'
} else {
'w'
};
if display_file_type { if display_file_type {
return String::from("----------"); let file_type = if metadata.is_symlink() {
'l'
} else if metadata.is_dir() {
'd'
} else {
'-'
};
format!("{0}r{1}xr{1}xr{1}x", file_type, write)
} else {
format!("r{0}xr{0}xr{0}x", write)
} }
String::from("---------")
} }
#[cfg(unix)] #[cfg(unix)]

22
tests/by-util/test_hashsum.rs
View file

@ -1,5 +1,5 @@
use crate::common::util::*; use crate::common::util::*;
// spell-checker:ignore checkfile, nonames, testf // spell-checker:ignore checkfile, nonames, testf, ntestf
macro_rules! get_hash( macro_rules! get_hash(
($str:expr) => ( ($str:expr) => (
$str.split(' ').collect::<Vec<&str>>()[0] $str.split(' ').collect::<Vec<&str>>()[0]
@ -117,6 +117,26 @@ fn test_check_sha1() {
.stderr_is(""); .stderr_is("");
} }
#[test]
fn test_check_file_not_found_warning() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.write("testf", "foobar\n");
at.write(
"testf.sha1",
"988881adc9fc3655077dc2d4d757d480b5ea0e11 testf\n",
);
at.remove("testf");
scene
.ccmd("sha1sum")
.arg("-c")
.arg(at.subdir.join("testf.sha1"))
.succeeds()
.stdout_is("sha1sum: testf: No such file or directory\ntestf: FAILED open or read\n")
.stderr_is("sha1sum: warning: 1 listed file could not be read");
}
#[test] #[test]
fn test_invalid_arg() { fn test_invalid_arg() {
new_ucmd!().arg("--definitely-invalid").fails().code_is(1); new_ucmd!().arg("--definitely-invalid").fails().code_is(1);

2
tests/by-util/test_ls.rs
View file

@ -966,7 +966,7 @@ fn test_ls_long() {
result.stdout_matches(&Regex::new(r"[-bcCdDlMnpPsStTx?]([r-][w-][xt-]){3}.*").unwrap()); result.stdout_matches(&Regex::new(r"[-bcCdDlMnpPsStTx?]([r-][w-][xt-]){3}.*").unwrap());
#[cfg(windows)] #[cfg(windows)]
result.stdout_contains("---------- 1 somebody somegroup"); result.stdout_matches(&Regex::new(r"[-dl](r[w-]x){3}.*").unwrap());
} }
} }