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 <signal.h>
#include <errno.h>
-#include "bashjmp.h"
-
-#include "command.h"
-#include "general.h"
-#include "jobs.h"
-#include "externs.h"
-#include "sig.h"
-#include "error.h"
-#include "bashtty.h"
-
#if defined (BUFFERED_INPUT)
# include "input.h"
#endif
-#if defined (TERMIOS_TTY_DRIVER)
-# include <termios.h>
-#else
-# if defined (TERMIO_TTY_DRIVER)
-# include <termio.h>
-# else
-# include <sgtty.h>
-# endif /* !TERMIO_TTY_DRIVER */
-#endif /* TERMIOS_TTY_DRIVER */
+/* 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 */
# 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 */
+
+#define DEFAULT_CHILD_MAX 32
+
#if defined (_POSIX_VERSION) || !defined (HAVE_KILLPG)
# define killpg(pg, sig) kill(-(pg),(sig))
#endif /* USG || _POSIX_VERSION */
#if !defined (HAVE_SIGINTERRUPT)
# define siginterrupt(sig, code)
-#endif /* USG */
+#endif /* !HAVE_SIGINTERRUPT */
#if defined (HAVE_WAITPID)
# define WAITPID(pid, statusp, options) waitpid (pid, statusp, options)
#endif /* !errno */
#if defined (READLINE)
-extern void _rl_set_screen_size ();
-#endif
+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;
+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;
+extern int wait_signal_received;
pid_t last_made_pid = NO_PID;
pid_t last_asynchronous_pid = NO_PID;
exits from get_tty_state(). */
int check_window_size;
-#if defined (HAVE_WAITPID)
-static void reap_zombie_children ();
-#endif
-
+/* 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;
};
+/* Values for proc_status.flags */
+#define PROC_RUNNING 0x01
+#define PROC_NOTIFIED 0x02
+#define PROC_ASYNC 0x04
+
+/* 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;
-#define PROC_BAD -1
-#define PROC_STILL_ALIVE -2
+static long child_max = -1L;
+
+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_sigint_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
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++)
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
-add_pid (pid)
+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, 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 (child_max < 0)
+ child_max = getmaxchild ();
+ if (child_max < 0)
+ child_max = DEFAULT_CHILD_MAX;
+
+ 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 ()
{
#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. */
#if defined (aixpc)
shell_tty_info.c_winsize = win; /* structure copying */
#endif
- set_lines_and_columns (win.ws_row, win.ws_col);
+ sh_set_lines_and_columns (win.ws_row, win.ws_col);
#if defined (READLINE)
- _rl_set_screen_size (win.ws_row, win.ws_col);
+ rl_set_screen_size (win.ws_row, win.ws_col);
#endif
}
}
if (async_p)
last_asynchronous_pid = pid;
- add_pid (pid);
+ add_pid (pid, async_p);
}
return (pid);
}
#endif
}
-/* Wait for a single pid (PID) and return its exit status. */
+/* 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;
{
if (pstatus == PROC_BAD)
{
- internal_error ("wait: pid %d is not a child of this shell", pid);
+ internal_error ("wait: pid %ld is not a child of this shell", (long)pid);
return (127);
}
break;
}
else if (got_pid > 0)
- set_pid_status (got_pid, status);
+ set_pid_status (got_pid, status);
+ }
+
+ if (got_pid > 0)
+ {
+ set_pid_status (got_pid, status);
+ set_pid_flags (got_pid, PROC_NOTIFIED);
}
- set_pid_status (got_pid, status);
siginterrupt (SIGINT, 0);
QUIT;
- if (WIFSIGNALED (status))
- return (128 + WTERMSIG (status));
- else
- return (WEXITSTATUS (status));
+ return (got_pid > 0 ? process_exit_status (status) : -1);
}
-/* 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 ()
{
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 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] */
+ wait_signal_received = 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);
}
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 ("wait_for(%d): %s", pid, strerror(errno));
+ 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 (got_pid > 0)
+ set_pid_status (got_pid, status);
#if defined (HAVE_WAITPID)
if (got_pid >= 0)
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);
+ return_val = process_exit_status (status);
#if !defined (DONT_REPORT_SIGPIPE)
if ((WIFSTOPPED (status) == 0) && WIFSIGNALED (status) &&
{
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 (TERMIOS_TTY_DRIVER)
-static struct termios shell_tty_info;
-#else /* !TERMIOS_TTY_DRIVER */
-# if defined (TERMIO_TTY_DRIVER)
-static struct termio shell_tty_info;
-# else
-static struct sgttyb shell_tty_info;
-# endif /* !TERMIO_TTY_DRIVER */
-#endif /* !TERMIOS_TTY_DRIVER */
-
+static TTYSTRUCT shell_tty_info;
static int got_tty_state;
/* Fill the contents of shell_tty_info with the current tty info. */
tty = input_tty ();
if (tty != -1)
{
-#if defined (TERMIOS_TTY_DRIVER)
- tcgetattr (tty, &shell_tty_info);
-#else
-# if defined (TERMIO_TTY_DRIVER)
- ioctl (tty, TCGETA, &shell_tty_info);
-# else
- ioctl (tty, TIOCGETP, &shell_tty_info);
-# endif
-#endif
+ ttgetattr (tty, &shell_tty_info);
got_tty_state = 1;
if (check_window_size)
get_new_window_size (0);
{
if (got_tty_state == 0)
return 0;
-
-#if defined (TERMIOS_TTY_DRIVER)
- tcsetattr (tty, TCSADRAIN, &shell_tty_info);
-#else
-# if defined (TERMIO_TTY_DRIVER)
- ioctl (tty, TCSETAW, &shell_tty_info); /* Wait for output, no flush */
-# else
- ioctl (tty, TIOCSETN, &shell_tty_info);
-# endif
-#endif
+ 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;
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