/* The thing that makes children, remembers them, and contains wait loops. */
-/* This file works under BSD, System V, minix, and Posix systems. */
+/* This file works under BSD, System V, minix, and Posix systems. It does
+ not implement job control. */
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
Bash is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 1, or (at your option) any later
+ Software Foundation; either version 2, or (at your option) any later
version.
Bash is distributed in the hope that it will be useful, but WITHOUT ANY
You should have received a copy of the GNU General Public License along
with Bash; see the file COPYING. If not, write to the Free Software
- Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+
+#include "config.h"
-#include <stdio.h>
#include "bashtypes.h"
+#include "filecntl.h"
+
+#if defined (HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+#include <stdio.h>
#include <signal.h>
-#include <setjmp.h>
#include <errno.h>
-#include "config.h"
-#include "command.h"
-#include "general.h"
-#include "filecntl.h"
-#include "jobs.h"
-#include "externs.h"
-#include "error.h"
-
#if defined (BUFFERED_INPUT)
# include "input.h"
#endif
-#if !defined (USG) && !defined (_POSIX_VERSION)
-# include <sgtty.h>
-#else
-# if defined (_POSIX_VERSION)
-# include <termios.h>
-# else
-# include <termio.h>
-# if !defined (AIXRT)
-# include <sys/ttold.h>
-# endif /* !AIXRT */
-# endif /* !POSIX_VERSION */
-#endif /* USG && _POSIX_VERSION */
-
-#if !defined (SIGABRT)
-# define SIGABRT SIGIOT
-#endif /* !SIGABRT */
-
-#if defined (USG) || defined (_POSIX_VERSION)
+/* Need to include this up here for *_TTY_DRIVER definitions. */
+#include "shtty.h"
+
+#if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL)
+/* For struct winsize on SCO */
+/* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */
+# if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH)
+# if defined (HAVE_SYS_STREAM_H)
+# include <sys/stream.h>
+# endif
+# include <sys/ptem.h>
+# endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */
+#endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */
+
+#include "shell.h"
+#include "jobs.h"
+
+#include "builtins/builtext.h" /* for wait_builtin */
+
+#if !defined (CHILD_MAX)
+# define CHILD_MAX 32
+#endif
+
+#if defined (_POSIX_VERSION) || !defined (HAVE_KILLPG)
# define killpg(pg, sig) kill(-(pg),(sig))
#endif /* USG || _POSIX_VERSION */
-#if defined (USG)
+#if !defined (HAVE_SIGINTERRUPT)
# define siginterrupt(sig, code)
-#endif /* USG */
+#endif /* !HAVE_SIGINTERRUPT */
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
# define WAITPID(pid, statusp, options) waitpid (pid, statusp, options)
#else
# define WAITPID(pid, statusp, options) wait (statusp)
-#endif /* !_POSIX_VERSION */
+#endif /* !HAVE_WAITPID */
+
+/* Return the fd from which we are actually getting input. */
+#define input_tty() (shell_tty != -1) ? shell_tty : fileno (stderr)
#if !defined (errno)
extern int errno;
#endif /* !errno */
+#if defined (READLINE)
+extern void rl_set_screen_size __P((int, int));
+#endif
+
extern int interactive, interactive_shell, login_shell;
extern int subshell_environment;
extern int last_command_exit_value;
-#if defined (_POSIX_VERSION)
+extern int interrupt_immediately;
+extern sh_builtin_func_t *this_shell_builtin;
+#if defined (HAVE_POSIX_SIGNALS)
extern sigset_t top_level_mask;
#endif
+extern procenv_t wait_intr_buf;
pid_t last_made_pid = NO_PID;
pid_t last_asynchronous_pid = NO_PID;
/* Call this when you start making children. */
int already_making_children = 0;
-#if defined (_POSIX_VERSION)
-static void reap_zombie_children ();
-#endif
+/* The controlling tty for this shell. */
+int shell_tty = -1;
+
+/* If this is non-zero, $LINES and $COLUMNS are reset after every process
+ exits from get_tty_state(). */
+int check_window_size;
+/* STATUS and FLAGS are only valid if pid != NO_PID
+ STATUS is only valid if (flags & PROC_RUNNING) == 0 */
struct proc_status {
pid_t pid;
int status; /* Exit status of PID or 128 + fatal signal number */
+ int flags;
};
-static struct proc_status *pid_list = (struct proc_status *)NULL;
-static int pid_list_size = 0;
+/* Values for proc_status.flags */
+#define PROC_RUNNING 0x01
+#define PROC_NOTIFIED 0x02
+#define PROC_ASYNC 0x04
-#define PROC_BAD -1
+/* Return values from find_status_by_pid */
+#define PROC_BAD -1
#define PROC_STILL_ALIVE -2
+static struct proc_status *pid_list = (struct proc_status *)NULL;
+static int pid_list_size;
+static int wait_sigint_received;
+
+static void alloc_pid_list __P((void));
+static int find_proc_slot __P((void));
+static int find_index_by_pid __P((pid_t));
+static int find_status_by_pid __P((pid_t));
+static int process_exit_status __P((WAIT));
+static void set_pid_status __P((pid_t, WAIT));
+static void set_pid_flags __P((pid_t, int));
+static void unset_pid_flags __P((pid_t, int));
+static void add_pid __P((pid_t, int));
+static void mark_dead_jobs_as_notified __P((int));
+
+static void get_new_window_size __P((int));
+static sighandler sigwinch_sighandler __P((int));
+static sighandler wait_signal_handler __P((int));
+
+#if defined (HAVE_WAITPID)
+static void reap_zombie_children __P((void));
+#endif
+
+static void restore_sigint_handler __P((void));
+
/* Allocate new, or grow existing PID_LIST. */
static void
alloc_pid_list ()
int old = pid_list_size;
pid_list_size += 10;
- pid_list = (struct proc_status *)
- xrealloc (pid_list, pid_list_size * sizeof (struct proc_status));
+ pid_list = (struct proc_status *)xrealloc (pid_list, pid_list_size * sizeof (struct proc_status));
/* None of the newly allocated slots have process id's yet. */
for (i = old; i < pid_list_size; i++)
- pid_list[i].pid = NO_PID;
+ pid_list[i].pid = NO_PID;
}
/* Return the offset within the PID_LIST array of an empty slot. This can
i = find_index_by_pid (pid);
if (i == NO_PID)
return (PROC_BAD);
+ if (pid_list[i].flags & PROC_RUNNING)
+ return (PROC_STILL_ALIVE);
return (pid_list[i].status);
}
+static int
+process_exit_status (status)
+ WAIT status;
+{
+ if (WIFSIGNALED (status))
+ return (128 + WTERMSIG (status));
+ else
+ return (WEXITSTATUS (status));
+}
+
/* Give PID the status value STATUS in the PID_LIST array. */
static void
set_pid_status (pid, status)
if (slot == NO_PID)
return;
- if (WIFSIGNALED (status))
- pid_list[slot].status = 128 + WTERMSIG (status);
- else
- pid_list[slot].status = WEXITSTATUS (status);
+ pid_list[slot].status = process_exit_status (status);
+ pid_list[slot].flags &= ~PROC_RUNNING;
+ /* If it's not a background process, mark it as notified so it gets
+ cleaned up. */
+ if ((pid_list[slot].flags & PROC_ASYNC) == 0)
+ pid_list[slot].flags |= PROC_NOTIFIED;
+}
+
+/* Give PID the flags FLAGS in the PID_LIST array. */
+static void
+set_pid_flags (pid, flags)
+ pid_t pid;
+ int flags;
+{
+ int slot;
+
+ slot = find_index_by_pid (pid);
+ if (slot == NO_PID)
+ return;
+
+ pid_list[slot].flags |= flags;
+}
+
+/* Unset FLAGS for PID in the pid list */
+static void
+unset_pid_flags (pid, flags)
+ pid_t pid;
+ int flags;
+{
+ int slot;
+
+ slot = find_index_by_pid (pid);
+ if (slot == NO_PID)
+ return;
+
+ pid_list[slot].flags &= ~flags;
}
static void
-add_pid (pid)
+add_pid (pid, async)
pid_t pid;
+ int async;
{
int slot;
slot = find_proc_slot ();
+
pid_list[slot].pid = pid;
- pid_list[slot].status = PROC_STILL_ALIVE;
+ pid_list[slot].status = -1;
+ pid_list[slot].flags = PROC_RUNNING;
+ if (async)
+ pid_list[slot].flags |= PROC_ASYNC;
+}
+
+static void
+mark_dead_jobs_as_notified (force)
+ int force;
+{
+ register int i, ndead;
+
+ /* first, count the number of non-running async jobs if FORCE == 0 */
+ for (i = ndead = 0; force == 0 && i < pid_list_size; i++)
+ {
+ if (pid_list[i].pid == NO_PID)
+ continue;
+ if (((pid_list[i].flags & PROC_RUNNING) == 0) &&
+ (pid_list[i].flags & PROC_ASYNC))
+ ndead++;
+ }
+
+ if (force == 0 && ndead <= CHILD_MAX)
+ return;
+
+ /* If FORCE == 0, we just mark as many non-running async jobs as notified
+ to bring us under the CHILD_MAX limit. */
+ for (i = 0; i < pid_list_size; i++)
+ {
+ if (pid_list[i].pid == NO_PID)
+ continue;
+ if (((pid_list[i].flags & PROC_RUNNING) == 0) &&
+ pid_list[i].pid != last_asynchronous_pid)
+ {
+ pid_list[i].flags |= PROC_NOTIFIED;
+ if (force == 0 && (pid_list[i].flags & PROC_ASYNC) && --ndead <= CHILD_MAX)
+ break;
+ }
+ }
}
+/* Remove all dead, notified jobs from the pid_list. */
int
cleanup_dead_jobs ()
{
register int i;
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
reap_zombie_children ();
#endif
for (i = 0; i < pid_list_size; i++)
- if (pid_list[i].status != PROC_STILL_ALIVE)
- pid_list[i].pid = NO_PID;
+ {
+ if ((pid_list[i].flags & PROC_RUNNING) == 0 &&
+ (pid_list[i].flags & PROC_NOTIFIED))
+ pid_list[i].pid = NO_PID;
+ }
+
+ return 0;
+}
+
+void
+reap_dead_jobs ()
+{
+ mark_dead_jobs_as_notified (0);
+ cleanup_dead_jobs ();
}
/* Initialize the job control mechanism, and set up the tty stuff. */
-initialize_jobs ()
+initialize_job_control (force)
+ int force;
{
- get_tty_state ();
+ shell_tty = fileno (stderr);
+
+ if (interactive)
+ get_tty_state ();
}
-#if !defined (READLINE) && defined (TIOCGWINSZ) && defined (SIGWINCH)
-static SigHandler *old_winch;
+#if defined (TIOCGWINSZ) && defined (SIGWINCH)
+static SigHandler *old_winch = (SigHandler *)SIG_DFL;
+
+static void
+get_new_window_size (from_sig)
+ int from_sig;
+{
+ struct winsize win;
+ int tty;
+
+ tty = input_tty ();
+ if (tty >= 0 && (ioctl (tty, TIOCGWINSZ, &win) == 0) &&
+ win.ws_row > 0 && win.ws_col > 0)
+ {
+#if defined (aixpc)
+ shell_tty_info.c_winsize = win; /* structure copying */
+#endif
+ sh_set_lines_and_columns (win.ws_row, win.ws_col);
+#if defined (READLINE)
+ rl_set_screen_size (win.ws_row, win.ws_col);
+#endif
+ }
+}
static sighandler
sigwinch_sighandler (sig)
int sig;
{
- struct winsize win;
-
-#if defined (USG) && !defined (_POSIX_VERSION)
+#if defined (MUST_REINSTALL_SIGHANDLERS)
set_signal_handler (SIGWINCH, sigwinch_sighandler);
-#endif /* USG && !_POSIX_VERSION */
- if ((ioctl (0, TIOCGWINSZ, &win) == 0) &&
- win.ws_row > 0 && win.ws_col > 0)
- set_lines_and_columns (win.ws_row, win.ws_col);
+#endif /* MUST_REINSTALL_SIGHANDLERS */
+ get_new_window_size (1);
+}
+#else
+static void
+get_new_window_size (from_sig)
+ int from_sig;
+{
+}
+#endif /* TIOCGWINSZ && SIGWINCH */
+
+void
+set_sigwinch_handler ()
+{
+#if defined (TIOCGWINSZ) && defined (SIGWINCH)
+ old_winch = set_signal_handler (SIGWINCH, sigwinch_sighandler);
+#endif
+}
+
+void
+unset_sigwinch_handler ()
+{
+#if defined (TIOCGWINSZ) && defined (SIGWINCH)
+ set_signal_handler (SIGWINCH, old_winch);
+#endif
}
-#endif /* !READLINE && TIOCGWINSZ && SIGWINCH */
/* Setup this shell to handle C-C, etc. */
void
initialize_job_signals ()
{
set_signal_handler (SIGINT, sigint_sighandler);
-#if !defined (READLINE) && defined (TIOCGWINSZ) && defined (SIGWINCH)
- set_signal_handler (SIGWINCH, sigwinch_sighandler);
-#endif /* !READLINE && TIOCGWINSZ && SIGWINCH */
+ set_sigwinch_handler ();
/* If this is a login shell we don't wish to be disturbed by
stop signals. */
if (login_shell)
- {
-#if defined (SIGTSTP)
- set_signal_handler (SIGTSTP, SIG_IGN);
- set_signal_handler (SIGTTOU, SIG_IGN);
- set_signal_handler (SIGTTIN, SIG_IGN);
-#endif
- }
+ ignore_tty_job_signals ();
}
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
/* Collect the status of all zombie children so that their system
resources can be deallocated. */
static void
while ((pid = waitpid (-1, (int *)&status, WNOHANG)) > 0)
set_pid_status (pid, status);
-#endif /* WNOHANG */
+#endif
}
-#endif /* _POSIX_VERSION */
+#endif /* WAITPID && WNOHANG */
/* Fork, handling errors. Returns the pid of the newly made child, or 0.
COMMAND is just for remembering the name of the command; we don't do
int async_p;
{
pid_t pid;
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
int retry = 1;
-#endif /* _POSIX_VERSION */
+#endif /* HAVE_WAITPID */
/* Discard saved memory. */
- if (command)
+ if (command)
free (command);
start_pipeline ();
the command is asynchronous, we have already duplicated /dev/null
as fd 0, but have not changed the buffered stream corresponding to
the old fd 0. We don't want to sync the stream in this case. */
- if (default_buffered_input != -1 &&
- (!async_p || default_buffered_input > 0))
+ if (default_buffered_input != -1 && (!async_p || default_buffered_input > 0))
sync_buffered_stream (default_buffered_input);
#endif /* BUFFERED_INPUT */
/* Create the child, handle severe errors. */
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
retry_fork:
-#endif /* _POSIX_VERSION */
+#endif /* HAVE_WAITPID */
if ((pid = fork ()) < 0)
{
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
/* Posix systems with a non-blocking waitpid () system call available
get another chance after zombies are reaped. */
if (errno == EAGAIN && retry)
retry = 0;
goto retry_fork;
}
-#endif /* _POSIX_VERSION */
+#endif /* HAVE_WAITPID */
- internal_error ("fork: %s", strerror (errno));
+ sys_error ("fork");
throw_to_top_level ();
}
-
+
if (pid == 0)
{
#if defined (BUFFERED_INPUT)
- if (default_buffered_input > 0)
- {
- close_buffered_fd (default_buffered_input);
- default_buffered_input = bash_input.location.buffered_fd = -1;
- }
+ unset_bash_input (0);
#endif /* BUFFERED_INPUT */
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_POSIX_SIGNALS)
/* Restore top-level signal mask. */
sigprocmask (SIG_SETMASK, &top_level_mask, (sigset_t *)NULL);
#endif
/* Ignore INT and QUIT in asynchronous children. */
if (async_p)
- {
-#if 0
- /* This now done by setup_async_signals (). */
- set_signal_handler (SIGINT, SIG_IGN);
- set_signal_handler (SIGQUIT, SIG_IGN);
-#endif
- last_asynchronous_pid = getpid ();
- }
+ last_asynchronous_pid = getpid ();
-#if defined (SIGTSTP)
- set_signal_handler (SIGTSTP, SIG_DFL);
- set_signal_handler (SIGTTIN, SIG_DFL);
- set_signal_handler (SIGTTOU, SIG_DFL);
-#endif
+ default_tty_job_signals ();
}
else
{
if (async_p)
last_asynchronous_pid = pid;
- add_pid (pid);
+ add_pid (pid, async_p);
}
return (pid);
}
-/* Wait for a single pid (PID) and return its exit status. */
+void
+ignore_tty_job_signals ()
+{
+#if defined (SIGTSTP)
+ set_signal_handler (SIGTSTP, SIG_IGN);
+ set_signal_handler (SIGTTIN, SIG_IGN);
+ set_signal_handler (SIGTTOU, SIG_IGN);
+#endif
+}
+
+void
+default_tty_job_signals ()
+{
+#if defined (SIGTSTP)
+ set_signal_handler (SIGTSTP, SIG_DFL);
+ set_signal_handler (SIGTTIN, SIG_DFL);
+ set_signal_handler (SIGTTOU, SIG_DFL);
+#endif
+}
+
+/* Wait for a single pid (PID) and return its exit status. Called by
+ the wait builtin. */
+int
wait_for_single_pid (pid)
pid_t pid;
{
pstatus = find_status_by_pid (pid);
if (pstatus == PROC_BAD)
- return (127);
+ {
+ internal_error ("wait: pid %ld is not a child of this shell", (long)pid);
+ return (127);
+ }
if (pstatus != PROC_STILL_ALIVE)
return (pstatus);
if (errno != EINTR && errno != ECHILD)
{
siginterrupt (SIGINT, 0);
- file_error ("wait");
+ sys_error ("wait");
}
break;
}
else if (got_pid > 0)
- set_pid_status (got_pid, status);
+ set_pid_status (got_pid, status);
}
set_pid_status (got_pid, status);
+ set_pid_flags (got_pid, PROC_NOTIFIED);
+
siginterrupt (SIGINT, 0);
QUIT;
- if (WIFSIGNALED (status))
- return (128 + WTERMSIG (status));
- else
- return (WEXITSTATUS (status));
+ return (process_exit_status (status));
}
-/* Wait for all of the shell's children to exit. */
+/* Wait for all of the shell's children to exit. Called by the `wait'
+ builtin. */
void
wait_for_background_pids ()
{
WAIT status;
/* If we aren't using job control, we let the kernel take care of the
- bookkeeping for us. wait () will return -1 and set errno to ECHILD
+ bookkeeping for us. wait () will return -1 and set errno to ECHILD
when there are no more unwaited-for child processes on both
4.2 BSD-based and System V-based systems. */
if (errno != EINTR && errno != ECHILD)
{
siginterrupt (SIGINT, 0);
- file_error("wait");
+ sys_error("wait");
}
siginterrupt (SIGINT, 0);
QUIT;
+
+ mark_dead_jobs_as_notified (1);
+ cleanup_dead_jobs ();
+}
+
+/* Make OLD_SIGINT_HANDLER the SIGINT signal handler. */
+#define INVALID_SIGNAL_HANDLER (SigHandler *)wait_for_background_pids
+static SigHandler *old_sigint_handler = INVALID_SIGNAL_HANDLER;
+
+static void
+restore_sigint_handler ()
+{
+ if (old_sigint_handler != INVALID_SIGNAL_HANDLER)
+ {
+ set_signal_handler (SIGINT, old_sigint_handler);
+ old_sigint_handler = INVALID_SIGNAL_HANDLER;
+ }
}
/* Handle SIGINT while we are waiting for children in a script to exit.
wait_sigint_handler (sig)
int sig;
{
-#if 0
- /* Run a trap handler if one has been defined. */
- maybe_call_trap_handler (sig);
-#endif
+ SigHandler *sigint_handler;
-#if !defined (VOID_SIGHANDLER)
- return (0);
-#endif /* !VOID_SIGHANDLER */
+ /* If we got a SIGINT while in `wait', and SIGINT is trapped, do
+ what POSIX.2 says (see builtins/wait.def for more info). */
+ if (this_shell_builtin && this_shell_builtin == wait_builtin &&
+ signal_is_trapped (SIGINT) &&
+ ((sigint_handler = trap_to_sighandler (SIGINT)) == trap_handler))
+ {
+ last_command_exit_value = EXECUTION_FAILURE;
+ restore_sigint_handler ();
+ interrupt_immediately = 0;
+ trap_handler (SIGINT); /* set pending_traps[SIGINT] */
+ longjmp (wait_intr_buf, 1);
+ }
+
+ if (interrupt_immediately)
+ {
+ last_command_exit_value = EXECUTION_FAILURE;
+ restore_sigint_handler ();
+ ADDINTERRUPT;
+ QUIT;
+ }
+
+ wait_sigint_received = 1;
+
+ SIGRETURN (0);
}
/* Wait for pid (one of our children) to terminate. This is called only
int return_val, pstatus;
pid_t got_pid;
WAIT status;
- SigHandler *old_sigint_handler;
pstatus = find_status_by_pid (pid);
/* If we are running a script, ignore SIGINT while we're waiting for
a child to exit. The loop below does some of this, but not all. */
- if (!interactive_shell)
+ wait_sigint_received = 0;
+ if (interactive_shell == 0)
old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
while ((got_pid = WAITPID (-1, &status, 0)) != pid) /* XXX was pid now -1 */
break;
}
else if (got_pid < 0 && errno != EINTR)
- programming_error ("got errno %d while waiting for %d", errno, pid);
+ programming_error ("wait_for(%ld): %s", (long)pid, strerror(errno));
else if (got_pid > 0)
set_pid_status (got_pid, status);
}
set_pid_status (got_pid, status);
-#if defined (_POSIX_VERSION)
+#if defined (HAVE_WAITPID)
if (got_pid >= 0)
reap_zombie_children ();
-#endif /* _POSIX_VERSION */
+#endif /* HAVE_WAITPID */
- if (!interactive_shell)
+ if (interactive_shell == 0)
{
- set_signal_handler (SIGINT, old_sigint_handler);
+ SigHandler *temp_handler;
+
+ temp_handler = old_sigint_handler;
+ restore_sigint_handler ();
+
/* If the job exited because of SIGINT, make sure the shell acts as if
it had received one also. */
if (WIFSIGNALED (status) && (WTERMSIG (status) == SIGINT))
{
+
if (maybe_call_trap_handler (SIGINT) == 0)
- (*old_sigint_handler) (SIGINT);
+ {
+ if (temp_handler == SIG_DFL)
+ termination_unwind_protect (SIGINT);
+ else if (temp_handler != INVALID_SIGNAL_HANDLER && temp_handler != SIG_IGN)
+ (*temp_handler) (SIGINT);
+ }
}
}
-
+
/* Default return value. */
/* ``a full 8 bits of status is returned'' */
- if (WIFSIGNALED (status))
- return_val = 128 + WTERMSIG (status);
- else
- return_val = WEXITSTATUS (status);
-
- if (!WIFSTOPPED (status) && WIFSIGNALED (status) &&
- (WTERMSIG (status) != SIGINT))
+ return_val = process_exit_status (status);
+
+#if !defined (DONT_REPORT_SIGPIPE)
+ if ((WIFSTOPPED (status) == 0) && WIFSIGNALED (status) &&
+ (WTERMSIG (status) != SIGINT))
+#else
+ if ((WIFSTOPPED (status) == 0) && WIFSIGNALED (status) &&
+ (WTERMSIG (status) != SIGINT) && (WTERMSIG (status) != SIGPIPE))
+#endif
{
fprintf (stderr, "%s", strsignal (WTERMSIG (status)));
if (WIFCORED (status))
fprintf (stderr, "\n");
}
- if (interactive_shell && !subshell_environment)
+ if (interactive_shell && subshell_environment == 0)
{
if (WIFSIGNALED (status) || WIFSTOPPED (status))
set_tty_state ();
{
int result;
- if (group)
- result = killpg (pid, signal);
- else
- result = kill (pid, signal);
-
+ result = group ? killpg (pid, signal) : kill (pid, signal);
return (result);
}
-#if defined (_POSIX_VERSION)
-static struct termios shell_tty_info;
-#else
-# if defined (USG)
-static struct termio shell_tty_info;
-# else
-static struct sgttyb shell_tty_info;
-# endif /* USG */
-#endif /* _POSIX_VERSION */
-
-static int got_tty_state = 0;
+static TTYSTRUCT shell_tty_info;
+static int got_tty_state;
/* Fill the contents of shell_tty_info with the current tty info. */
get_tty_state ()
{
- int tty = open ("/dev/tty", O_RDONLY);
+ int tty;
+
+ tty = input_tty ();
if (tty != -1)
{
-#if defined (_POSIX_VERSION)
- tcgetattr (tty, &shell_tty_info);
-#else
-# if defined (USG)
- ioctl (tty, TCGETA, &shell_tty_info);
-# else
- ioctl (tty, TIOCGETP, &shell_tty_info);
-# endif
-#endif
- close (tty);
+ ttgetattr (tty, &shell_tty_info);
got_tty_state = 1;
+ if (check_window_size)
+ get_new_window_size (0);
}
}
/* Make the current tty use the state in shell_tty_info. */
+int
set_tty_state ()
{
- int tty = open ("/dev/tty", O_RDONLY);
+ int tty;
+
+ tty = input_tty ();
if (tty != -1)
{
- if (!got_tty_state)
- {
- close (tty);
- return;
- }
-#if defined (_POSIX_VERSION)
- tcsetattr (tty, TCSADRAIN, &shell_tty_info);
-#else
-# if defined (USG)
- ioctl (tty, TCSETAW, &shell_tty_info); /* Wait for output, no flush */
-# else
- ioctl (tty, TIOCSETN, &shell_tty_info);
-# endif
-#endif
- close (tty);
+ if (got_tty_state == 0)
+ return 0;
+ ttsetattr (tty, &shell_tty_info);
}
+ return 0;
}
/* Give the terminal to PGRP. */
-give_terminal_to (pgrp)
+give_terminal_to (pgrp, force)
pid_t pgrp;
+ int force;
{
}
/* Stop a pipeline. */
+int
stop_pipeline (async, ignore)
int async;
COMMAND *ignore;
{
already_making_children = 0;
+ return 0;
}
void
already_making_children = 1;
}
+void
+stop_making_children ()
+{
+ already_making_children = 0;
+}
+
+int
+get_job_by_pid (pid, block)
+ pid_t pid;
+ int block;
+{
+ int i;
+
+ i = find_index_by_pid (pid);
+ return ((i == NO_PID) ? PROC_BAD : i);
+}
+
/* Print descriptive information about the job with leader pid PID. */
void
describe_pid (pid)
pid_t pid;
{
- fprintf (stderr, "%d\n", (int) pid);
+ fprintf (stderr, "%ld\n", (long) pid);
+}
+
+void
+unfreeze_jobs_list ()
+{
+}
+
+int
+count_all_jobs ()
+{
+ return 0;
}
projects / platform / upstream / bash.git / blobdiff