mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-04 19:37:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

age: Replace atty with is-terminal

Browse source 
Closes str4d/rage#359.
This commit is contained in:
Jack Grigg 2023-08-06 17:48:13 +00:00
parent 3b29ef6b00
commit 4d81bb0e57
5 changed files with 7 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Cargo.lock generated
View file

@ -59,7 +59,6 @@ dependencies = [
"aes",
"aes-gcm",
"age-core",
"atty",
"base64",
"bcrypt-pbkdf",
"bech32",
@ -78,6 +77,7 @@ dependencies = [
"hmac",
"i18n-embed",
"i18n-embed-fl",
"is-terminal",
"lazy_static",
"memchr",
"nom",
@ -191,17 +191,6 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@ -1112,15 +1101,6 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.3.2"
@ -1329,7 +1309,7 @@ version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi 0.3.2",
"hermit-abi",
"rustix",
"windows-sys 0.48.0",
]
@ -1566,7 +1546,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi 0.3.2",
"hermit-abi",
"libc",
]

4
age/Cargo.toml
View file

@ -73,8 +73,8 @@ web-sys = { version = "0.3", optional = true, features = ["Window", "Performance
memchr = { version = "2.5", optional = true }
# Common CLI dependencies
atty = { version = "0.2", optional = true }
console = { version = "0.15", optional = true, default-features = false }
is-terminal = { version = "0.4", optional = true }
rpassword = { version = "7", optional = true }
[target.'cfg(any(unix, windows))'.dependencies]
@ -102,7 +102,7 @@ criterion-cycles-per-byte = "0.5"
default = []
armor = []
async = ["futures", "memchr"]
cli-common = ["atty", "console", "pinentry", "rpassword"]
cli-common = ["console", "is-terminal", "pinentry", "rpassword"]
plugin = ["age-core/plugin", "which", "wsl"]
ssh = [
"aes",

3
age/src/cli_common/file_io.rs
View file

@ -7,6 +7,7 @@ use std::io::{self, Read, Write};
#[cfg(unix)]
use std::os::unix::fs::OpenOptionsExt;
use is_terminal::IsTerminal;
use zeroize::Zeroize;
use crate::{fl, util::LINE_ENDING, wfl, wlnfl};
@ -61,7 +62,7 @@ impl InputReader {
/// Returns true if this input is from a terminal, and a user is likely typing it.
pub fn is_terminal(&self) -> bool {
matches!(self, Self::Stdin(_)) && atty::is(atty::Stream::Stdin)
matches!(self, Self::Stdin(_)) && io::stdin().is_terminal()
}
}

4
supply-chain/config.toml
View file

@ -322,10 +322,6 @@ criteria = "safe-to-deploy"
version = "0.8.1"
criteria = "safe-to-deploy"
[[exemptions.hermit-abi]]
version = "0.1.19"
criteria = "safe-to-deploy"
[[exemptions.hermit-abi]]
version = "0.3.2"
criteria = "safe-to-deploy"

10
supply-chain/imports.lock
View file

@ -166,16 +166,6 @@ criteria = "safe-to-deploy"
version = "0.1.6"
notes = "Contains no unsafe code, no IO, no build.rs."
[[audits.bytecode-alliance.audits.atty]]
who = "Alex Crichton <alex@alexcrichton.com>"
criteria = "safe-to-deploy"
version = "0.2.14"
notes = """
Contains only unsafe code for what this crate's purpose is and only accesses
the environment's terminal information when asked. Does its stated purpose and
no more.
"""
[[audits.bytecode-alliance.audits.base64]]
who = "Pat Hickey <phickey@fastly.com>"
criteria = "safe-to-deploy"