mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-06 17:31:14 -03:00
Reduce warnings when posix_spawn disabled.
This commit is contained in:
committed by
Johannes Altmanninger
parent
e21eea6ac6
commit
bbf678e718
@@ -12,6 +12,7 @@
|
|||||||
ScopeGuard,
|
ScopeGuard,
|
||||||
};
|
};
|
||||||
use crate::env::{EnvMode, EnvStack, Environment, Statuses, READ_BYTE_LIMIT};
|
use crate::env::{EnvMode, EnvStack, Environment, Statuses, READ_BYTE_LIMIT};
|
||||||
|
#[cfg(FISH_USE_POSIX_SPAWN)]
|
||||||
use crate::env_dispatch::use_posix_spawn;
|
use crate::env_dispatch::use_posix_spawn;
|
||||||
use crate::fds::make_fd_blocking;
|
use crate::fds::make_fd_blocking;
|
||||||
use crate::fds::{make_autoclose_pipes, open_cloexec, PIPE_ERROR};
|
use crate::fds::{make_autoclose_pipes, open_cloexec, PIPE_ERROR};
|
||||||
@@ -34,10 +35,12 @@
|
|||||||
null_terminated_array_length, AsNullTerminatedArray, OwningNullTerminatedArray,
|
null_terminated_array_length, AsNullTerminatedArray, OwningNullTerminatedArray,
|
||||||
};
|
};
|
||||||
use crate::parser::{Block, BlockId, BlockType, EvalRes, Parser};
|
use crate::parser::{Block, BlockId, BlockType, EvalRes, Parser};
|
||||||
|
#[cfg(FISH_USE_POSIX_SPAWN)]
|
||||||
|
use crate::proc::Pid;
|
||||||
use crate::proc::{
|
use crate::proc::{
|
||||||
hup_jobs, is_interactive_session, jobs_requiring_warning_on_exit, no_exec,
|
hup_jobs, is_interactive_session, jobs_requiring_warning_on_exit, no_exec,
|
||||||
print_exit_warning_for_jobs, InternalProc, Job, JobGroupRef, Pid, ProcStatus, Process,
|
print_exit_warning_for_jobs, InternalProc, Job, JobGroupRef, ProcStatus, Process, ProcessType,
|
||||||
ProcessType, TtyTransfer,
|
TtyTransfer,
|
||||||
};
|
};
|
||||||
use crate::reader::{reader_run_count, restore_term_mode};
|
use crate::reader::{reader_run_count, restore_term_mode};
|
||||||
use crate::redirection::{dup2_list_resolve_chain, Dup2List};
|
use crate::redirection::{dup2_list_resolve_chain, Dup2List};
|
||||||
@@ -447,6 +450,7 @@ fn launch_process_nofork(vars: &EnvStack, p: &Process) -> ! {
|
|||||||
// To avoid the race between the caller calling tcsetpgrp() and the client checking the
|
// To avoid the race between the caller calling tcsetpgrp() and the client checking the
|
||||||
// foreground process group, we don't use posix_spawn if we're going to foreground the process. (If
|
// foreground process group, we don't use posix_spawn if we're going to foreground the process. (If
|
||||||
// we use fork(), we can call tcsetpgrp after the fork, before the exec, and avoid the race).
|
// we use fork(), we can call tcsetpgrp after the fork, before the exec, and avoid the race).
|
||||||
|
#[cfg(FISH_USE_POSIX_SPAWN)]
|
||||||
fn can_use_posix_spawn_for_job(job: &Job, dup2s: &Dup2List) -> bool {
|
fn can_use_posix_spawn_for_job(job: &Job, dup2s: &Dup2List) -> bool {
|
||||||
// Is it globally disabled?
|
// Is it globally disabled?
|
||||||
if !use_posix_spawn() {
|
if !use_posix_spawn() {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
pub mod flog_safe;
|
pub mod flog_safe;
|
||||||
pub mod postfork;
|
pub mod postfork;
|
||||||
|
#[cfg(FISH_USE_POSIX_SPAWN)]
|
||||||
pub mod spawn;
|
pub mod spawn;
|
||||||
use crate::proc::Job;
|
use crate::proc::Job;
|
||||||
use libc::{SIGINT, SIGQUIT};
|
use libc::{SIGINT, SIGQUIT};
|
||||||
|
|||||||
Reference in New Issue
Block a user