mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #6787 from tea/unredox
Get rid of redox-specific code
This commit is contained in:
Daniel Hofstetter
GitHub
commit
e3b8191926
4 changed files with 40 additions and 48 deletions
55
Cargo.lock
generated
55
Cargo.lock
generated
|
|
@ -1007,9 +1007,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-channel"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
|
||||
checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
|
|
@ -1017,9 +1017,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
|
||||
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
|
||||
|
||||
[[package]]
|
||||
name = "futures-executor"
|
||||
|
|
@ -1034,15 +1034,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
||||
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1051,15 +1051,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
|
||||
checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
|
||||
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
|
||||
|
||||
[[package]]
|
||||
name = "futures-timer"
|
||||
|
|
@ -1069,9 +1069,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
|
|||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
|
||||
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
|
@ -1556,6 +1556,27 @@ dependencies = [
|
|||
"libm",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_enum"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
|
||||
dependencies = [
|
||||
"num_enum_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_enum_derive"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_threads"
|
||||
version = "0.1.6"
|
||||
|
|
@ -3336,7 +3357,6 @@ version = "0.0.27"
|
|||
dependencies = [
|
||||
"clap",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"uucore",
|
||||
]
|
||||
|
||||
|
|
@ -3997,9 +4017,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zip"
|
||||
version = "1.3.0"
|
||||
version = "1.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7"
|
||||
checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"crc32fast",
|
||||
|
|
@ -4007,5 +4027,6 @@ dependencies = [
|
|||
"displaydoc",
|
||||
"flate2",
|
||||
"indexmap",
|
||||
"num_enum",
|
||||
"thiserror",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -320,7 +320,6 @@ quick-error = "2.0.1"
|
|||
rand = { version = "0.8.5", features = ["small_rng"] }
|
||||
rand_core = "0.6.4"
|
||||
rayon = "1.10"
|
||||
redox_syscall = "0.5.1"
|
||||
regex = "1.10.4"
|
||||
rstest = "0.23.0"
|
||||
rust-ini = "0.21.0"
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@ clap = { workspace = true }
|
|||
libc = { workspace = true }
|
||||
uucore = { workspace = true, features = ["process"] }
|
||||
|
||||
[target.'cfg(target_os = "redox")'.dependencies]
|
||||
redox_syscall = { workspace = true }
|
||||
|
||||
[[bin]]
|
||||
name = "test"
|
||||
path = "src/main.rs"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ use std::fs;
|
|||
use std::os::unix::fs::MetadataExt;
|
||||
use uucore::display::Quotable;
|
||||
use uucore::error::{UResult, USimpleError};
|
||||
#[cfg(not(any(windows, target_os = "redox")))]
|
||||
#[cfg(not(windows))]
|
||||
use uucore::process::{getegid, geteuid};
|
||||
use uucore::{format_usage, help_about, help_section};
|
||||
|
||||
|
|
@ -234,14 +234,7 @@ fn isatty(fd: &OsStr) -> ParseResult<bool> {
|
|||
fd.to_str()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.ok_or_else(|| ParseError::InvalidInteger(fd.quote().to_string()))
|
||||
.map(|i| {
|
||||
#[cfg(not(target_os = "redox"))]
|
||||
unsafe {
|
||||
libc::isatty(i) == 1
|
||||
}
|
||||
#[cfg(target_os = "redox")]
|
||||
syscall::dup(i, b"termios").map(syscall::close).is_ok()
|
||||
})
|
||||
.map(|i| unsafe { libc::isatty(i) == 1 })
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq)]
|
||||
|
|
@ -281,24 +274,6 @@ fn path(path: &OsStr, condition: &PathCondition) -> bool {
|
|||
Execute = 0o1,
|
||||
}
|
||||
|
||||
let geteuid = || {
|
||||
#[cfg(not(target_os = "redox"))]
|
||||
let euid = geteuid();
|
||||
#[cfg(target_os = "redox")]
|
||||
let euid = syscall::geteuid().unwrap() as u32;
|
||||
|
||||
euid
|
||||
};
|
||||
|
||||
let getegid = || {
|
||||
#[cfg(not(target_os = "redox"))]
|
||||
let egid = getegid();
|
||||
#[cfg(target_os = "redox")]
|
||||
let egid = syscall::getegid().unwrap() as u32;
|
||||
|
||||
egid
|
||||
};
|
||||
|
||||
let perm = |metadata: Metadata, p: Permission| {
|
||||
if geteuid() == metadata.uid() {
|
||||
metadata.mode() & ((p as u32) << 6) != 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue