forked from extern/nushell
Do not attempt to take control of terminal in non-interactive mode (#9693)
# Description
Fixes a regression from #9681 where nushell will attempt to place itself
into the background or take control of the terminal even in
non-interactive mode.
Using the same
[reference](https://www.gnu.org/software/libc/manual/html_node/Initializing-the-Shell.html)
from #6584:
>A subshell that runs *interactively* has to ensure that it has been
placed in the foreground...
>A subshell that runs *non-interactively* cannot and should not support
job control.
`fish`
[code](54fa1ad6ec/src/reader.cpp (L4862)
)
also seems to follow this.
This *partially* fixes
[9026](https://github.com/nushell/nushell/issues/9026). That is, nushell
will no longer set the foreground process group in non-interactive mode.
This commit is contained in:
parent
656f707a0b
commit
a5a79a7d95
@ -213,7 +213,7 @@ impl ExternalCommand {
|
|||||||
// fails to be run as a normal executable:
|
// fails to be run as a normal executable:
|
||||||
// 1. "shell out" to cmd.exe if the command is a known cmd.exe internal command
|
// 1. "shell out" to cmd.exe if the command is a known cmd.exe internal command
|
||||||
// 2. Otherwise, use `which-rs` to look for batch files etc. then run those in cmd.exe
|
// 2. Otherwise, use `which-rs` to look for batch files etc. then run those in cmd.exe
|
||||||
match fg_process.spawn() {
|
match fg_process.spawn(engine_state.is_interactive) {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
// set the default value, maybe we'll override it later
|
// set the default value, maybe we'll override it later
|
||||||
child = Err(err);
|
child = Err(err);
|
||||||
@ -235,7 +235,7 @@ impl ExternalCommand {
|
|||||||
cmd,
|
cmd,
|
||||||
engine_state.pipeline_externals_state.clone(),
|
engine_state.pipeline_externals_state.clone(),
|
||||||
);
|
);
|
||||||
child = cmd_process.spawn();
|
child = cmd_process.spawn(engine_state.is_interactive);
|
||||||
} else {
|
} else {
|
||||||
#[cfg(feature = "which-support")]
|
#[cfg(feature = "which-support")]
|
||||||
{
|
{
|
||||||
@ -269,7 +269,8 @@ impl ExternalCommand {
|
|||||||
cmd,
|
cmd,
|
||||||
engine_state.pipeline_externals_state.clone(),
|
engine_state.pipeline_externals_state.clone(),
|
||||||
);
|
);
|
||||||
child = cmd_process.spawn();
|
child =
|
||||||
|
cmd_process.spawn(engine_state.is_interactive);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -286,7 +287,7 @@ impl ExternalCommand {
|
|||||||
|
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
{
|
{
|
||||||
child = fg_process.spawn()
|
child = fg_process.spawn(engine_state.is_interactive)
|
||||||
}
|
}
|
||||||
|
|
||||||
match child {
|
match child {
|
||||||
|
@ -28,6 +28,7 @@ pub struct ForegroundProcess {
|
|||||||
pub struct ForegroundChild {
|
pub struct ForegroundChild {
|
||||||
inner: Child,
|
inner: Child,
|
||||||
pipeline_state: Arc<(AtomicU32, AtomicU32)>,
|
pipeline_state: Arc<(AtomicU32, AtomicU32)>,
|
||||||
|
interactive: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ForegroundProcess {
|
impl ForegroundProcess {
|
||||||
@ -38,14 +39,14 @@ impl ForegroundProcess {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn spawn(&mut self) -> std::io::Result<ForegroundChild> {
|
pub fn spawn(&mut self, interactive: bool) -> std::io::Result<ForegroundChild> {
|
||||||
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
||||||
let existing_pgrp = pgrp.load(Ordering::SeqCst);
|
let existing_pgrp = pgrp.load(Ordering::SeqCst);
|
||||||
fg_process_setup::prepare_to_foreground(&mut self.inner, existing_pgrp);
|
fg_process_setup::prepare_to_foreground(&mut self.inner, existing_pgrp, interactive);
|
||||||
self.inner
|
self.inner
|
||||||
.spawn()
|
.spawn()
|
||||||
.map(|child| {
|
.map(|child| {
|
||||||
fg_process_setup::set_foreground(&child, existing_pgrp);
|
fg_process_setup::set_foreground(&child, existing_pgrp, interactive);
|
||||||
let _ = pcnt.fetch_add(1, Ordering::SeqCst);
|
let _ = pcnt.fetch_add(1, Ordering::SeqCst);
|
||||||
if existing_pgrp == 0 {
|
if existing_pgrp == 0 {
|
||||||
pgrp.store(child.id(), Ordering::SeqCst);
|
pgrp.store(child.id(), Ordering::SeqCst);
|
||||||
@ -53,10 +54,11 @@ impl ForegroundProcess {
|
|||||||
ForegroundChild {
|
ForegroundChild {
|
||||||
inner: child,
|
inner: child,
|
||||||
pipeline_state: self.pipeline_state.clone(),
|
pipeline_state: self.pipeline_state.clone(),
|
||||||
|
interactive,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
fg_process_setup::reset_foreground_id();
|
fg_process_setup::reset_foreground_id(interactive);
|
||||||
e
|
e
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -73,7 +75,7 @@ impl Drop for ForegroundChild {
|
|||||||
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
||||||
if pcnt.fetch_sub(1, Ordering::SeqCst) == 1 {
|
if pcnt.fetch_sub(1, Ordering::SeqCst) == 1 {
|
||||||
pgrp.store(0, Ordering::SeqCst);
|
pgrp.store(0, Ordering::SeqCst);
|
||||||
fg_process_setup::reset_foreground_id()
|
fg_process_setup::reset_foreground_id(self.interactive)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -101,8 +103,10 @@ mod fg_process_setup {
|
|||||||
pub(super) fn prepare_to_foreground(
|
pub(super) fn prepare_to_foreground(
|
||||||
external_command: &mut std::process::Command,
|
external_command: &mut std::process::Command,
|
||||||
existing_pgrp: u32,
|
existing_pgrp: u32,
|
||||||
|
interactive: bool,
|
||||||
) {
|
) {
|
||||||
let tty = TtyHandle(unistd::dup(nix::libc::STDIN_FILENO).expect("dup"));
|
let tty = TtyHandle(unistd::dup(nix::libc::STDIN_FILENO).expect("dup"));
|
||||||
|
let interactive = interactive && std::io::stdin().is_terminal();
|
||||||
unsafe {
|
unsafe {
|
||||||
// Safety:
|
// Safety:
|
||||||
// POSIX only allows async-signal-safe functions to be called.
|
// POSIX only allows async-signal-safe functions to be called.
|
||||||
@ -124,7 +128,9 @@ mod fg_process_setup {
|
|||||||
// According to glibc's job control manual:
|
// According to glibc's job control manual:
|
||||||
// https://www.gnu.org/software/libc/manual/html_node/Launching-Jobs.html
|
// https://www.gnu.org/software/libc/manual/html_node/Launching-Jobs.html
|
||||||
// This has to be done *both* in the parent and here in the child due to race conditions.
|
// This has to be done *both* in the parent and here in the child due to race conditions.
|
||||||
set_foreground_pid(unistd::getpid(), existing_pgrp, tty.0);
|
if interactive {
|
||||||
|
set_foreground_pid(unistd::getpid(), existing_pgrp, tty.0);
|
||||||
|
}
|
||||||
|
|
||||||
// Now let the child process have all the signals by resetting with SIG_SETMASK.
|
// Now let the child process have all the signals by resetting with SIG_SETMASK.
|
||||||
let mut sigset = signal::SigSet::empty();
|
let mut sigset = signal::SigSet::empty();
|
||||||
@ -137,9 +143,13 @@ mod fg_process_setup {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) fn set_foreground(process: &std::process::Child, existing_pgrp: u32) {
|
pub(super) fn set_foreground(
|
||||||
|
process: &std::process::Child,
|
||||||
|
existing_pgrp: u32,
|
||||||
|
interactive: bool,
|
||||||
|
) {
|
||||||
// called from the parent shell process - do the stdin tty check here
|
// called from the parent shell process - do the stdin tty check here
|
||||||
if std::io::stdin().is_terminal() {
|
if interactive && std::io::stdin().is_terminal() {
|
||||||
set_foreground_pid(
|
set_foreground_pid(
|
||||||
Pid::from_raw(process.id() as i32),
|
Pid::from_raw(process.id() as i32),
|
||||||
existing_pgrp,
|
existing_pgrp,
|
||||||
@ -163,8 +173,8 @@ mod fg_process_setup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Reset the foreground process group to the shell
|
/// Reset the foreground process group to the shell
|
||||||
pub(super) fn reset_foreground_id() {
|
pub(super) fn reset_foreground_id(interactive: bool) {
|
||||||
if std::io::stdin().is_terminal() {
|
if interactive && std::io::stdin().is_terminal() {
|
||||||
if let Err(e) = nix::unistd::tcsetpgrp(nix::libc::STDIN_FILENO, unistd::getpgrp()) {
|
if let Err(e) = nix::unistd::tcsetpgrp(nix::libc::STDIN_FILENO, unistd::getpgrp()) {
|
||||||
println!("ERROR: reset foreground id failed, tcsetpgrp result: {e:?}");
|
println!("ERROR: reset foreground id failed, tcsetpgrp result: {e:?}");
|
||||||
}
|
}
|
||||||
@ -174,9 +184,9 @@ mod fg_process_setup {
|
|||||||
|
|
||||||
#[cfg(any(not(target_family = "unix"), target_os = "macos"))]
|
#[cfg(any(not(target_family = "unix"), target_os = "macos"))]
|
||||||
mod fg_process_setup {
|
mod fg_process_setup {
|
||||||
pub(super) fn prepare_to_foreground(_: &mut std::process::Command, _: u32) {}
|
pub(super) fn prepare_to_foreground(_: &mut std::process::Command, _: u32, _: bool) {}
|
||||||
|
|
||||||
pub(super) fn set_foreground(_: &std::process::Child, _: u32) {}
|
pub(super) fn set_foreground(_: &std::process::Child, _: u32, _: bool) {}
|
||||||
|
|
||||||
pub(super) fn reset_foreground_id() {}
|
pub(super) fn reset_foreground_id(_: bool) {}
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,10 @@ fn main() -> Result<()> {
|
|||||||
let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
|
let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
|
||||||
.unwrap_or_else(|_| std::process::exit(1));
|
.unwrap_or_else(|_| std::process::exit(1));
|
||||||
|
|
||||||
engine_state.is_interactive = parsed_nu_cli_args.interactive_shell.is_some();
|
// keep this condition in sync with the branches at the end
|
||||||
|
engine_state.is_interactive = parsed_nu_cli_args.interactive_shell.is_some()
|
||||||
|
|| (parsed_nu_cli_args.commands.is_none() && script_name.is_empty());
|
||||||
|
|
||||||
engine_state.is_login = parsed_nu_cli_args.login_shell.is_some();
|
engine_state.is_login = parsed_nu_cli_args.login_shell.is_some();
|
||||||
|
|
||||||
let use_color = engine_state.get_config().use_ansi_coloring;
|
let use_color = engine_state.get_config().use_ansi_coloring;
|
||||||
@ -142,8 +145,7 @@ fn main() -> Result<()> {
|
|||||||
);
|
);
|
||||||
|
|
||||||
start_time = std::time::Instant::now();
|
start_time = std::time::Instant::now();
|
||||||
// keep this condition in sync with the branches below
|
acquire_terminal(engine_state.is_interactive);
|
||||||
acquire_terminal(parsed_nu_cli_args.commands.is_none() && script_name.is_empty());
|
|
||||||
perf(
|
perf(
|
||||||
"acquire_terminal",
|
"acquire_terminal",
|
||||||
start_time,
|
start_time,
|
||||||
@ -289,7 +291,6 @@ fn main() -> Result<()> {
|
|||||||
input,
|
input,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
engine_state.is_interactive = true;
|
|
||||||
run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)
|
run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,38 @@
|
|||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
pub(crate) fn acquire_terminal(interactive: bool) {
|
pub(crate) fn acquire_terminal(interactive: bool) {
|
||||||
use is_terminal::IsTerminal;
|
use is_terminal::IsTerminal;
|
||||||
use nix::sys::signal::{signal, SigHandler, Signal};
|
use nix::{
|
||||||
|
errno::Errno,
|
||||||
|
sys::signal::{signal, SigHandler, Signal},
|
||||||
|
unistd,
|
||||||
|
};
|
||||||
|
|
||||||
if !std::io::stdin().is_terminal() {
|
if interactive && std::io::stdin().is_terminal() {
|
||||||
return;
|
// see also: https://www.gnu.org/software/libc/manual/html_node/Initializing-the-Shell.html
|
||||||
}
|
|
||||||
|
|
||||||
take_control(interactive);
|
take_control();
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
// SIGINT and SIGQUIT have special handling above
|
// SIGINT and SIGQUIT have special handling above
|
||||||
signal(Signal::SIGTSTP, SigHandler::SigIgn).expect("signal ignore");
|
signal(Signal::SIGTSTP, SigHandler::SigIgn).expect("signal ignore");
|
||||||
signal(Signal::SIGTTIN, SigHandler::SigIgn).expect("signal ignore");
|
signal(Signal::SIGTTIN, SigHandler::SigIgn).expect("signal ignore");
|
||||||
signal(Signal::SIGTTOU, SigHandler::SigIgn).expect("signal ignore");
|
signal(Signal::SIGTTOU, SigHandler::SigIgn).expect("signal ignore");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Put ourselves in our own process group and take control of terminal, if not already
|
||||||
|
let shell_pgid = unistd::getpid();
|
||||||
|
match unistd::setpgid(shell_pgid, shell_pgid) {
|
||||||
|
// setpgid returns EPERM if we are the session leader (e.g., as a login shell).
|
||||||
|
// The other cases that return EPERM cannot happen, since we gave our own pid.
|
||||||
|
// See: setpgid(2)
|
||||||
|
// Therefore, it is safe to ignore EPERM.
|
||||||
|
Ok(()) | Err(Errno::EPERM) => (),
|
||||||
|
Err(_) => {
|
||||||
|
eprintln!("ERROR: failed to put nushell in its own process group");
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let _ = unistd::tcsetpgrp(nix::libc::STDIN_FILENO, shell_pgid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -22,7 +41,7 @@ pub(crate) fn acquire_terminal(_: bool) {}
|
|||||||
|
|
||||||
// Inspired by fish's acquire_tty_or_exit
|
// Inspired by fish's acquire_tty_or_exit
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
fn take_control(interactive: bool) {
|
fn take_control() {
|
||||||
use nix::{
|
use nix::{
|
||||||
errno::Errno,
|
errno::Errno,
|
||||||
sys::signal::{self, SaFlags, SigAction, SigHandler, SigSet, Signal},
|
sys::signal::{self, SaFlags, SigAction, SigHandler, SigSet, Signal},
|
||||||
@ -59,40 +78,30 @@ fn take_control(interactive: bool) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut success = false;
|
|
||||||
for _ in 0..4096 {
|
for _ in 0..4096 {
|
||||||
match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) {
|
match unistd::tcgetpgrp(nix::libc::STDIN_FILENO) {
|
||||||
Ok(owner_pgid) if owner_pgid == shell_pgid => {
|
Ok(owner_pgid) if owner_pgid == shell_pgid => {
|
||||||
success = true;
|
// success
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => {
|
Ok(owner_pgid) if owner_pgid == Pid::from_raw(0) => {
|
||||||
// Zero basically means something like "not owned" and we can just take it
|
// Zero basically means something like "not owned" and we can just take it
|
||||||
let _ = unistd::tcsetpgrp(nix::libc::STDIN_FILENO, shell_pgid);
|
let _ = unistd::tcsetpgrp(nix::libc::STDIN_FILENO, shell_pgid);
|
||||||
}
|
}
|
||||||
Err(Errno::ENOTTY) => {
|
Err(Errno::ENOTTY) => {
|
||||||
if !interactive {
|
|
||||||
// that's fine
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
eprintln!("ERROR: no TTY for interactive shell");
|
eprintln!("ERROR: no TTY for interactive shell");
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
// fish also has other heuristics than "too many attempts" for the orphan check, but they're optional
|
// fish also has other heuristics than "too many attempts" for the orphan check, but they're optional
|
||||||
if signal::killpg(Pid::from_raw(-shell_pgid.as_raw()), Signal::SIGTTIN).is_err() {
|
if signal::killpg(shell_pgid, Signal::SIGTTIN).is_err() {
|
||||||
if !interactive {
|
|
||||||
// that's fine
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
eprintln!("ERROR: failed to SIGTTIN ourselves");
|
eprintln!("ERROR: failed to SIGTTIN ourselves");
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !success && interactive {
|
|
||||||
eprintln!("ERROR: failed take control of the terminal, we might be orphaned");
|
eprintln!("ERROR: failed take control of the terminal, we might be orphaned");
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user