Skip to content

install: gate by target support #14586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xtqqczze wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −27
Open

install: gate by target support #14586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/uu/install/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ readme.workspace = true
[lib]
path = "src/install.rs"

[dependencies]
[target.'cfg(unix)'.dependencies]
clap = { workspace = true }
rustix = { workspace = true, features = ["process"] }
thiserror = { workspace = true }
uucore = { workspace = true, default-features = true, features = [
"backup-control",
Expand All @@ -35,9 +36,6 @@ uucore = { workspace = true, features = ["safe-traversal"] }
rustix = { workspace = true, features = ["fs"] }
selinux = { workspace = true, optional = true }

[target.'cfg(unix)'.dependencies]
rustix = { workspace = true, features = ["process"] }

[features]
diagnostics = ["uucore/diagnostics"]
selinux = ["dep:selinux", "uucore/selinux"]
Expand All @@ -48,3 +46,4 @@ workspace = true
[[bin]]
name = "install"
path = "src/main.rs"
required-features = ["uucore/default"]
37 changes: 14 additions & 23 deletions src/uu/install/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

// spell-checker:ignore (ToDO) rwxr sourcepath targetpath Isnt uioerror matchpathcon

#![cfg(unix)]

mod mode;

use clap::{Arg, ArgAction, ArgMatches, Command};
Expand All @@ -16,6 +18,8 @@ use std::fmt::Debug;
use std::fs::{self, metadata};
use std::fs::{File, OpenOptions};
use std::io::{Write, stdout};
use std::os::unix::fs::MetadataExt;
use std::os::unix::prelude::OsStrExt;
use std::path::{MAIN_SEPARATOR, Path, PathBuf};
use std::process;
use thiserror::Error;
Expand All @@ -26,7 +30,7 @@ use uucore::entries::{grp2gid, usr2uid};
use uucore::error::{FromIo, UError, UResult, UUsageError, strip_errno};
use uucore::fs::{are_files_identical, dir_strip_dot_for_creation};
use uucore::perms::{Verbosity, VerbosityLevel, wrap_chown};
#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
use uucore::safe_traversal::{DirFd, SymlinkBehavior, create_dir_all_safe};
#[cfg(all(feature = "selinux", any(target_os = "linux", target_os = "android")))]
use uucore::selinux::{
Expand All @@ -36,11 +40,6 @@ use uucore::selinux::{
use uucore::translate;
use uucore::{format_usage, show, show_error, show_if_err};

#[cfg(unix)]
use std::os::unix::fs::MetadataExt;
#[cfg(unix)]
use std::os::unix::prelude::OsStrExt;

const DEFAULT_MODE: u32 = 0o755;
const DEFAULT_STRIP_PROGRAM: &str = "strip";

Expand Down Expand Up @@ -581,20 +580,11 @@ fn is_valid_target(path: &Path) -> bool {
///
/// Returns true, if one of the conditions above is met; else false.
///
#[cfg(unix)]
fn is_potential_directory_path(path: &Path) -> bool {
let separator = MAIN_SEPARATOR as u8;
path.as_os_str().as_bytes().last() == Some(&separator) || path.is_dir()
}

#[cfg(not(unix))]
fn is_potential_directory_path(path: &Path) -> bool {
matches!(
path.as_os_str().as_encoded_bytes().last(),
Some(b'/') | Some(b'\\')
) || path.is_dir()
}

/// Perform an install, given a list of paths and behavior.
///
/// Returns a Result type with the Err variant containing the error message.
Expand Down Expand Up @@ -637,9 +627,9 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {

let sources = &paths.iter().map(PathBuf::from).collect::<Vec<_>>();

#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
let mut target_parent_fd: Option<DirFd> = None;
#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
let mut target_filename: Option<OsString> = None;

if b.create_leading {
Expand All @@ -659,6 +649,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
}

if let Some(to_create) = to_create {
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
let to_create_original = to_create;
let to_create_owned;
let to_create = match uucore::os_str_as_bytes(to_create.as_os_str()) {
Expand All @@ -677,7 +668,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
let dir_exists = to_create.exists() && metadata(to_create).is_ok_and(|m| m.is_dir());

if dir_exists {
#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
if b.target_dir.is_none()
&& sources.len() == 1
&& !is_potential_directory_path(&target)
Expand All @@ -704,7 +695,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
}
}

#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
{
// Use DEFAULT_MODE (0o755) for created directories - this matches GNU install
// behavior. The actual mode will be modified by umask at the kernel level.
Expand Down Expand Up @@ -747,7 +738,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
}
}
}
#[cfg(not(unix))]
#[cfg(any(target_os = "aix", target_os = "hurd", target_os = "redox"))]
fs::create_dir_all(to_create)
.map_err(|e| InstallError::CreateDirFailed(to_create.to_path_buf(), e))?;
}
Expand Down Expand Up @@ -780,7 +771,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
}

if is_valid_target(&target) {
#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
if let (Some(ref parent_fd), Some(ref filename)) = (target_parent_fd, target_filename) {
if b.compare && !need_copy(source, &target, b) {
return Ok(());
Expand All @@ -803,7 +794,7 @@ fn standard(mut paths: Vec<OsString>, b: &Behavior) -> UResult<()> {
} else {
copy(source, &target, b)
}
#[cfg(not(unix))]
#[cfg(any(target_os = "aix", target_os = "hurd", target_os = "redox"))]
{
copy(source, &target, b)
}
Expand Down Expand Up @@ -948,7 +939,7 @@ fn perform_backup(from: &Path, to: &Path, b: &Behavior) -> UResult<Option<PathBu
/// be consolidated because they use fundamentally different APIs:
/// - `copy_file_safe` uses fd-based `DirFd::open_file_at()` (openat syscall)
/// - `copy_file` uses path-based `OpenOptions::new().create_new().open()`
#[cfg(unix)]
#[cfg(not(any(target_os = "aix", target_os = "hurd", target_os = "redox")))]
fn copy_file_safe(from: &Path, to_parent_fd: &DirFd, to_filename: &std::ffi::OsStr) -> UResult<()> {
let from_meta = metadata(from)?;

Expand Down
Loading